diff -Nru hugin-2018.0.0+dfsg/Changes.txt hugin-2019.0.0+dfsg/Changes.txt --- hugin-2018.0.0+dfsg/Changes.txt 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/Changes.txt 2019-03-10 07:31:13.000000000 +0000 @@ -1,3 +1,22 @@ +Hugin 2019.0 +* Added raw import: It converts the RAW images to TIFF using a raw converter. + This can be done by dcraw (requires additional exiftool), RawTherapee or + darktable. These programs needs to be installed externally. +* Fixes for align_image_stack with EXR images. +* Added option for range compression. Can be helpful for LDR panoramas to + brighten the shadows before merging, because at this stage the blender has + some more information which can be helpful. +* New hotkeys for mask editor (change zoom level with 0, 1 and 2). +* Expression parser (pto_var and "manipulate image variables" in GUI) can now read also + all image variables. +* line_find: Ignore lines with low distance to each other to get better coverage. + Also use only central part of the panorama for searching for line control points + (ignoring zenit/nadir near areas). +* pano_modify: Added new switch --projection-parameter to set projection parameters. +* Store program settings according to XDG base dir specification (Linux only, needs to + compile with wxWidgets 3.1.1 or later). + +============================================================================================ Hugin 2018.0 * Several improvements for optimizer tabs (mark deselected images, allow changing optimizer variables for all selected images at once, option to ignore line cp) diff -Nru hugin-2018.0.0+dfsg/CMakeLists.txt hugin-2019.0.0+dfsg/CMakeLists.txt --- hugin-2018.0.0+dfsg/CMakeLists.txt 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeLists.txt 2019-03-23 07:16:59.000000000 +0000 @@ -54,7 +54,7 @@ project(hugin) # version -set(V_MAJOR 2018) +set(V_MAJOR 2019) set(V_MINOR 0) set(V_PATCH 0) @@ -126,11 +126,7 @@ FIND_PACKAGE(PkgConfig) ENDIF (UNIX) -IF(WIN32) - set(HUGIN_SHARED "0" CACHE STRING "Build shared internal libraries" ) -ELSE(WIN32) - set(HUGIN_SHARED "1" CACHE STRING "Build shared internal libraries" ) -ENDIF(WIN32) +set(HUGIN_SHARED "1" CACHE STRING "Build shared internal libraries" ) # # Setup windows search paths for dependencies @@ -162,8 +158,12 @@ ## # This must come before FINDs for tiff, jpeg, png, zlib to enable # finding the wxWidgets distributions of those packages (Win32 only). -SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa) -FIND_PACKAGE(wxWidgets REQUIRED) +IF(WIN32) + FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl qa) +ELSE() +# Unix needs also wxWidgets net library + FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa) +ENDIF() # hugin requires wxwidgets 3.0 or above IF (UNIX) @@ -172,6 +172,11 @@ IF(wxWidgets_VERSION VERSION_LESS "3.0") MESSAGE(FATAL_ERROR "At least wxWidgets 3.0 is required") ENDIF() + IF(wxWidgets_VERSION VERSION_GREATER "3.1.0") + SET(USE_XDG_DIRS 1) + ELSE() + UNSET(USE_XDG_DIRS) + ENDIF() # Ubuntu has 2 different devel packages, we need the GUI version EXEC_PROGRAM(sh ARGS "${wxWidgets_CONFIG_EXECUTABLE} --query-toolkit" OUTPUT_VARIABLE wxWidgets_TOOLKIT) IF(wxWidgets_TOOLKIT STREQUAL "base") @@ -197,10 +202,10 @@ MESSAGE(FATAL_ERROR "Using different libjpeg and wxjpeg. This does not work with static libs. Use wxjpeg for libjpeg") ENDIF() IF(NOT ${WX_zlib} MATCHES ${ZLIB_LIBRARIES_RELEASE}) -MESSAGE(FATAL_ERROR "Using different libzlib and wxzlib. This does not work with static libs. Use wxjpeg for libzlib") +MESSAGE(FATAL_ERROR "Using different libzlib and wxzlib. This does not work with static libs. Use wxzlib for libzlib") ENDIF() IF(NOT ${WX_png} MATCHES ${PNG_LIBRARIES_RELEASE}) -MESSAGE(FATAL_ERROR "Using different libpng and wxpng. This does not work with static libs. Use wxjpeg for libpng") +MESSAGE(FATAL_ERROR "Using different libpng and wxpng. This does not work with static libs. Use wxpng for libpng") ENDIF() IF(NOT ${WX_tiff} MATCHES ${TIFF_LIBRARIES_RELEASE}) MESSAGE(FATAL_ERROR "Using different libtiff and wxtiff. This does not work with static libs. Use wxtiff for libtiff") @@ -222,6 +227,22 @@ FIND_PACKAGE(OpenGL REQUIRED) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) SET(OPENGL_GLEW_LIBRARIES ${OPENGL_LIBRARIES}) + +IF(NOT APPLE AND NOT WIN32) + OPTION(BUILD_WITH_EGL "Initialize OpenGL context with OpenGL ES (requires libglew with egl support)" OFF) + IF(BUILD_WITH_EGL) + IF(NOT OpenGL_EGL_FOUND) + MESSAGE(FATAL_ERROR "OpenGL ES not found: Install OpenGL ES header or deactivate option BUILD_WITH_EGL") + ENDIF() + MESSAGE(STATUS "Use OpenGL ES") + SET(HAVE_EGL 1) + INCLUDE_DIRECTORIES(${OPENGL_EGL_INCLUDE_DIRS}) + SET(OPENGL_GLEW_LIBRARIES ${OPENGL_LIBRARIES} ${OPENGL_egl_LIBRARY}) + ELSE() + UNSET(HAVE_EGL) + ENDIF() +ENDIF() + IF (APPLE) FIND_PACKAGE(GLUT REQUIRED) INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR}) @@ -234,7 +255,8 @@ ADD_DEFINITIONS(-DGLEW_STATIC) ENDIF() -IF(NOT APPLE AND NOT WIN32) +IF(NOT APPLE AND NOT WIN32 AND NOT HAVE_EGL) +MESSAGE(STATUS "Searching X11 header") FIND_PACKAGE(X11 REQUIRED) ENDIF() ## @@ -270,10 +292,16 @@ #include #include + #if defined _MSC_VER && _MSC_VER <= 1900 + namespace fs = std::tr2::sys; + #else + namespace fs = std::experimental::filesystem; + #endif + int main() { - std::tr2::sys::path filepath; - filepath=std::tr2::sys::absolute(filepath); + fs::path filepath; + filepath=fs::absolute(filepath); std::string s=filepath.filename().string(); return 0; }; @@ -295,16 +323,16 @@ ENDIF( NOT Boost_root_suffix ) IF(WIN32) - IF(${HUGIN_SHARED}) + IF(HUGIN_SHARED) SET(Boost_USE_STATIC_LIBS OFF) SET(Boost_USE_STATIC_RUNTIME OFF) # ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) # ADD_DEFINITIONS(-D_DLL) ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB) - ELSE(${HUGIN_SHARED}) + ELSE() SET(Boost_USE_STATIC_LIBS ON) SET(Boost_USE_STATIC_RUNTIME ON) - ENDIF(${HUGIN_SHARED}) + ENDIF() # If BOOST_ROOT was defined in the environment, use it. IF(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") SET(BOOST_ROOT $ENV{BOOST_ROOT}) @@ -363,7 +391,7 @@ FIND_PACKAGE(LCMS2 REQUIRED) INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR}) IF(WIN32) - IF(${HUGIN_SHARED}) + IF(HUGIN_SHARED AND NOT VCPKG_TOOLCHAIN) ADD_DEFINITIONS(-DCMS_DLL) ENDIF() ENDIF() @@ -414,6 +442,9 @@ FIND_PACKAGE(SQLite3 REQUIRED) INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR}) +IF(UNIX) +OPTION(UNIX_SELF_CONTAINED_BUNDLE "Build a self-contained bundle under Unix systems" OFF) +ENDIF() OPTION(BUILD_HSI "Python Scripting Interface" OFF) IF(BUILD_HSI) @@ -564,34 +595,34 @@ ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) ENDIF (APPLE) -IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) +IF (HUGIN_SHARED AND UNIX AND NOT APPLE) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin") SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal libraries in private subdirectory" ) -ELSE (${HUGIN_SHARED} AND UNIX AND NOT APPLE) +ELSE () # On OS X files are moved around after make install, do not try to use # rpath or CMAKE_INSTALL_NAME_DIR SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal libraries in private subdirectory" ) -ENDIF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) +ENDIF() IF (UNIX) - IF (${HUGIN_SHARED}) + IF (HUGIN_SHARED) # use shared internal libraries SET(HUGIN_SHARED_LIBS 1) - ENDIF (${HUGIN_SHARED}) + ENDIF (HUGIN_SHARED) MESSAGE("-- Using shared internal libraries") -ELSE (UNIX) +ELSE() - IF (${HUGIN_SHARED}) + IF (HUGIN_SHARED) ADD_DEFINITIONS(-DOPENEXR_DLL) ADD_DEFINITIONS(-DEXV_HAVE_DLL) ADD_DEFINITIONS(-DHugin_shared) ADD_DEFINITIONS(-DPANO13_DLL) SET(HUGIN_SHARED_LIBS 1) - ELSE(${HUGIN_SHARED}) + ELSE() ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) - ENDIF(${HUGIN_SHARED}) + ENDIF() # Windows installer packaging related stuff # unfortunately, CMake/CPack does not support Warsetup directly. @@ -625,42 +656,41 @@ # "Linking to lib file: libboost_thread-vc90-mt-s-1_37.lib" # This can be used to determine on which boost libraries Hugin depend on #ADD_DEFINITIONS(/DBOOST_LIB_DIAGNOSTIC) - IF(NOT ${HUGIN_SHARED}) - # compile everything for the static C runtime - FOREACH(TYPE C CXX) - # makefiles use blank configuration - FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") - #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") - SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") - # fix up static libc flags - STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") - # *FORCE* to override whats already placed into the cache - SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING - "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) - #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") - ENDFOREACH(CFG) - ENDFOREACH(TYPE) - # link only with the static C runtime !! THIS IS A MUST !! - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - # ensure that the flags are not duplicaated on subsequent runs - STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") - # note that flag names (NODEFAULTLIB) etc.) are case sensitive - SET( CMAKE_EXE_LINKER_FLAGS + IF(NOT HUGIN_SHARED) + # compile everything for the static C runtime + FOREACH(TYPE C CXX) + # makefiles use blank configuration + FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") + #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") + # fix up static libc flags + STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") + # *FORCE* to override whats already placed into the cache + SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) + #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + ENDFOREACH(CFG) + ENDFOREACH(TYPE) + # link only with the static C runtime !! THIS IS A MUST !! + SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") + # ensure that the flags are not duplicaated on subsequent runs + STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") + # note that flag names (NODEFAULTLIB) etc.) are case sensitive + SET( CMAKE_EXE_LINKER_FLAGS "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" - CACHE STRING "for MSVC" FORCE - ) - FOREACH(CFG "MINSIZEREL" "RELEASE" "RELWITHDEBINFO") - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS_${CFG}}") - STRING(REPLACE " /LTCG" "" NEW_FLAGS "${NEW_FLAGS}") - SET(CMAKE_EXE_LINKER_FLAGS_${CFG} "${NEW_FLAGS} /LTCG" CACHE STRING "overwritten" FORCE) - ENDFOREACH() - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") - STRING(REPLACE " /INCREMENTAL:NO" "" NEW_FLAGS "${NEW_FLAGS}") - STRING(REPLACE " /INCREMENTAL" "" NEW_FLAGS "${NEW_FLAGS}") - SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${NEW_FLAGS} /INCREMENTAL:NO" CACHE STRING "overwritten" FORCE) - ENDIF(NOT ${HUGIN_SHARED}) - ENDIF(MSVC) -ENDIF (UNIX) + CACHE STRING "for MSVC" FORCE + ) + FOREACH(CFG "MINSIZEREL" "RELEASE" "RELWITHDEBINFO") + SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS_${CFG}}") + STRING(REPLACE " /LTCG" "" NEW_FLAGS "${NEW_FLAGS}") + SET(CMAKE_EXE_LINKER_FLAGS_${CFG} "${NEW_FLAGS} /LTCG" CACHE STRING "overwritten" FORCE) + ENDFOREACH() + SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") + STRING(REPLACE " /INCREMENTAL:NO" "" NEW_FLAGS "${NEW_FLAGS}") + STRING(REPLACE " /INCREMENTAL" "" NEW_FLAGS "${NEW_FLAGS}") + SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${NEW_FLAGS} /INCREMENTAL:NO" CACHE STRING "overwritten" FORCE) + ENDIF() + ENDIF() +ENDIF () IF(APPLE) @@ -690,8 +720,11 @@ POST_BUILD 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 hugin_stacker :enblend :enfuse) + align_image_stack autooptimiser celeste_standalone checkpto cpclean cpfind + deghosting_mask fulla geocpset hugin_executor hugin_lensdb hugin_stacker + icpfind linefind pano_modify pano_trafo pto_gen pto_lensstack pto_mask pto_merge + pto_move pto_template pto_var tca_correct vig_optimize + :enblend :enfuse :hugin_hdrmerge :nona :verdandi) INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tools_mac DESTINATION Hugin @@ -906,7 +939,7 @@ SET(CPACK_PACKAGE_NAME "Hugin") SET(CPACK_PACKAGE_VENDOR "Hugin developer team") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hugin - Panorama photo stitcher") -IF(MSVC14) +IF(MSVC_VERSION EQUAL 1900) IF(CMAKE_CL_64) SET(CPACK_WIX_EXTRA_SOURCES "${CMAKE_SOURCE_DIR}/platforms/windows/wix/redist_vc14_x64.wxs" @@ -918,6 +951,19 @@ "${CMAKE_SOURCE_DIR}/platforms/windows/wix/filetype.wxs" ) ENDIF() + SET(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/platforms/windows/wix/redist.xml") +ELSEIF(MSVC_VERSION GREATER_EQUAL 1910) + IF(CMAKE_CL_64) + SET(CPACK_WIX_EXTRA_SOURCES + "${CMAKE_SOURCE_DIR}/platforms/windows/wix/redist_vc15_x64.wxs" + "${CMAKE_SOURCE_DIR}/platforms/windows/wix/filetype.wxs" + ) + ELSE() + SET(CPACK_WIX_EXTRA_SOURCES + "${CMAKE_SOURCE_DIR}/platforms/windows/wix/redist_vc15_x86.wxs" + "${CMAKE_SOURCE_DIR}/platforms/windows/wix/filetype.wxs" + ) + ENDIF() SET(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/platforms/windows/wix/redist.xml") ELSE() SET(CPACK_WIX_EXTRA_SOURCES "${CMAKE_SOURCE_DIR}/platforms/windows/wix/filetype.wxs") diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindEXIV2.cmake hugin-2019.0.0+dfsg/CMakeModules/FindEXIV2.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindEXIV2.cmake 2016-03-28 11:13:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindEXIV2.cmake 2018-11-12 18:27:39.000000000 +0000 @@ -126,6 +126,11 @@ ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release ${wxWidgets_LIB_DIR} ) + IF(VCPKG_TOOLCHAIN AND NOT EXIV2EXPAT_LIBRARIES_DEBUG) + find_library_with_debug(EXIV2EXPAT_LIBRARIES_DEBUG + NAMES libexpat expat wxexpat + ) + ENDIF() ELSE(${HUGIN_SHARED}) find_library_with_debug(EXIV2_LIBRARIES WIN32_DEBUG_POSTFIX d diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindFFTW.cmake hugin-2019.0.0+dfsg/CMakeModules/FindFFTW.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindFFTW.cmake 2015-05-24 11:25:14.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindFFTW.cmake 2018-07-23 17:20:39.000000000 +0000 @@ -31,7 +31,11 @@ ${SOURCE_BASE_DIR}/fftw-3.3.3/fftw-3.3-libs/x64 ${SOURCE_BASE_DIR}/fftw-3.3.3/fftw-3.3-libs/ ) - +IF(VCPKG_TOOLCHAIN AND NOT FFTW_LIBRARIES_DEBUG) +find_library_with_debug(FFTW_LIBRARIES_DEBUG + NAMES libfftw-3.3 fftw3 +) +ENDIF() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FFTW DEFAULT_MSG diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindFLANN.cmake hugin-2019.0.0+dfsg/CMakeModules/FindFLANN.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindFLANN.cmake 2016-01-21 19:05:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindFLANN.cmake 2018-11-01 17:26:55.000000000 +0000 @@ -8,18 +8,27 @@ # FLANN_LIBRARIES # FLANN_FOUND +if(UNIX) + find_package(PkgConfig QUIET) + pkg_check_modules(FLANN flann) +else() + find_path(FLANN_INCLUDE_DIRS flann/flann.hpp) -find_path(FLANN_INCLUDE_DIRS flann/flann.hpp) + if(FLANN_INCLUDE_DIRS) + find_library(FLANN_LIBRARIES flann_cpp) + if(FLANN_LIBRARIES) + set(FLANN_FOUND "YES") + endif() + else() + set(FLANN_FOUND "NO") + endif() +endif() -if(FLANN_INCLUDE_DIRS) - find_library(FLANN_LIBRARIES flann_cpp) - if(FLANN_LIBRARIES) +if(FLANN_FOUND) MESSAGE(STATUS "flann library found") - set(FLANN_FOUND "YES") - endif(FLANN_LIBRARIES) -else(FLANN_INCLUDE_DIRS) +else() message(STATUS "flann library not found. falling back to included copy") set(FLANN_LIBRARIES "flann_cpp") set(FLANN_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src/foreign") -endif(FLANN_INCLUDE_DIRS) +endif() diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindJPEG.cmake hugin-2019.0.0+dfsg/CMakeModules/FindJPEG.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindJPEG.cmake 2014-02-06 18:26:46.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindJPEG.cmake 2018-12-20 09:57:55.000000000 +0000 @@ -47,7 +47,6 @@ ${wxWidgets_LIB_DIR} ) - include(FindPackageHandleStandardArgs) find_package_handle_standard_args(JPEG DEFAULT_MSG JPEG_INCLUDE_DIR JPEG_LIBRARIES) diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindLibraryWithDebug.cmake hugin-2019.0.0+dfsg/CMakeModules/FindLibraryWithDebug.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindLibraryWithDebug.cmake 2011-07-17 08:39:19.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindLibraryWithDebug.cmake 2018-12-09 07:29:26.000000000 +0000 @@ -11,7 +11,7 @@ MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname) - IF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + IF((NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") AND (NOT VCPKG_TOOLCHAIN)) # no WIN32_DEBUG_POSTFIX -> simply pass all arguments to FIND_LIBRARY FIND_LIBRARY(${var_name} @@ -21,7 +21,7 @@ ${ARGN} ) - ELSE(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + ELSE() IF(NOT WIN32) # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX @@ -31,14 +31,34 @@ ELSE(NOT WIN32) # 1. get all possible libnames - SET(args ${ARGN}) + IF(VCPKG_TOOLCHAIN AND (NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX")) + SET(DBG_POSTFIX "d") + IF("${win32_dbg_postfix_name}" STREQUAL "NAMES") + UNSET(SINGLE_LIBNAME) + SET(args ${dgb_postfix}) + LIST(APPEND args ${libname}) + LIST(APPEND args ${ARGN}) + ELSE() + SET(SINGLE_LIBNAME "${win32_dbg_postfix_name}") + SET(args ${libname}) + LIST(APPEND args ${ARGN}) + ENDIF() + ELSE() + SET(DBG_POSTFIX ${dgb_postfix}) + IF("${libname}" STREQUAL "NAMES") + UNSET(SINGLE_LIBNAME) + ELSE() + SET(SINGLE_LIBNAME "${libname}") + ENDIF() + SET(args ${ARGN}) + ENDIF() SET(newargs "") SET(libnames_release "") SET(libnames_debug "") LIST(LENGTH args listCount) - IF("${libname}" STREQUAL "NAMES") + IF(NOT SINGLE_LIBNAME) SET(append_rest 0) LIST(APPEND args " ") @@ -53,21 +73,31 @@ SET(append_rest 1) ELSE("${val}" STREQUAL "PATHS") LIST(APPEND libnames_release "${val}") - LIST(APPEND libnames_debug "${val}${dgb_postfix}") + LIST(APPEND libnames_debug "${val}${DBG_POSTFIX}") + IF(VCPKG_TOOLCHAIN) + # in VCPKG the debug library does often not contain a postfix, + # so search also for this variant + LIST(APPEND libnames_debug "${val}") + ENDIF() ENDIF("${val}" STREQUAL "PATHS") ENDIF(append_rest) ENDFOREACH(i) - ELSE("${libname}" STREQUAL "NAMES") + ELSE() # just one name - LIST(APPEND libnames_release "${libname}") - LIST(APPEND libnames_debug "${libname}${dgb_postfix}") + LIST(APPEND libnames_release "${SINGLE_LIBNAME}") + LIST(APPEND libnames_debug "${SINGLE_LIBNAME}${DBG_POSTFIX}") + IF(VCPKG_TOOLCHAIN) + # in VCPKG the debug library does often not contain a postfix, + # so search also for this variant + LIST(APPEND libnames_debug "${SINGLE_LIBNAME}") + ENDIF() SET(newargs ${args}) - ENDIF("${libname}" STREQUAL "NAMES") + ENDIF() # search the release lib FIND_LIBRARY(${var_name}_RELEASE @@ -76,10 +106,19 @@ ) # search the debug lib - FIND_LIBRARY(${var_name}_DEBUG - NAMES ${libnames_debug} - ${newargs} - ) + IF(VCPKG_TOOLCHAIN) + FIND_LIBRARY(${var_name}_DEBUG + NAMES ${libnames_debug} + PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib + ${newargs} + NO_DEFAULT_PATH + ) + ELSE() + FIND_LIBRARY(${var_name}_DEBUG + NAMES ${libnames_debug} + ${newargs} + ) + ENDIF() IF(${var_name}_RELEASE AND ${var_name}_DEBUG) @@ -108,6 +147,6 @@ ENDIF(NOT WIN32) - ENDIF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + ENDIF() ENDMACRO(FIND_LIBRARY_WITH_DEBUG) diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindSQLite3.cmake hugin-2019.0.0+dfsg/CMakeModules/FindSQLite3.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindSQLite3.cmake 2014-04-30 16:15:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindSQLite3.cmake 2018-07-23 17:20:45.000000000 +0000 @@ -9,7 +9,6 @@ INCLUDE(FindLibraryWithDebug) FIND_LIBRARY_WITH_DEBUG(SQLITE3_LIBRARIES - WIN32_DEBUG_POSTFIX d NAMES sqlite3 PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/sqlite3 diff -Nru hugin-2018.0.0+dfsg/CMakeModules/FindVIGRA.cmake hugin-2019.0.0+dfsg/CMakeModules/FindVIGRA.cmake --- hugin-2018.0.0+dfsg/CMakeModules/FindVIGRA.cmake 2015-05-19 18:03:45.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/FindVIGRA.cmake 2018-07-23 17:20:45.000000000 +0000 @@ -18,7 +18,6 @@ ) FIND_LIBRARY_WITH_DEBUG(VIGRA_LIBRARIES - WIN32_DEBUG_POSTFIX d NAMES vigraimpex libvigraimpex PATHS ${VIGRA_ROOT_PATH} diff -Nru hugin-2018.0.0+dfsg/CMakeModules/fix_osx_xrc.cmake hugin-2019.0.0+dfsg/CMakeModules/fix_osx_xrc.cmake --- hugin-2018.0.0+dfsg/CMakeModules/fix_osx_xrc.cmake 2011-07-17 08:39:19.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/fix_osx_xrc.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# Replace the wxNotebook and associated XRC wx elements from the passed file -MESSAGE("Patching XRC elements for OSX") -FILE(READ ${file} _contents) -STRING(REPLACE wxNotebook wxChoice _contents "${_contents}") -STRING(REPLACE cp_editor_left_tab cp_editor_left_choice _contents "${_contents}") -STRING(REPLACE cp_editor_right_tab cp_editor_right_choice _contents "${_contents}") -FILE(WRITE ${file} "${_contents}") diff -Nru hugin-2018.0.0+dfsg/CMakeModules/HuginBundleInfo.plist.in hugin-2019.0.0+dfsg/CMakeModules/HuginBundleInfo.plist.in --- hugin-2018.0.0+dfsg/CMakeModules/HuginBundleInfo.plist.in 2016-06-08 15:55:13.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/HuginBundleInfo.plist.in 2018-03-24 09:30:54.000000000 +0000 @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -34,5 +34,7 @@ NSHumanReadableCopyright ${MACOSX_BUNDLE_COPYRIGHT} + NSHighResolutionCapable + diff -Nru hugin-2018.0.0+dfsg/CMakeModules/HuginBundleInfoPTO.plist.in hugin-2019.0.0+dfsg/CMakeModules/HuginBundleInfoPTO.plist.in --- hugin-2018.0.0+dfsg/CMakeModules/HuginBundleInfoPTO.plist.in 2016-06-08 15:55:13.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/HuginBundleInfoPTO.plist.in 2018-03-24 09:30:54.000000000 +0000 @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -34,25 +34,26 @@ NSHumanReadableCopyright ${MACOSX_BUNDLE_COPYRIGHT} + NSHighResolutionCapable + CFBundleDocumentTypes - CFBundleTypeName - Hugin Project - CFBundleTypeIconFile - HuginFiles.icns - CFBundleTypeRole - ${MACOSX_BUNDLE_TYPE_ROLE} - CFBundleTypeExtensions - - pto - - CFBundleTypeMIMETypes - - application/x-ptoptimizer-script - + CFBundleTypeName + Hugin Project + CFBundleTypeIconFile + HuginFiles.icns + CFBundleTypeRole + ${MACOSX_BUNDLE_TYPE_ROLE} + CFBundleTypeExtensions + + pto + + CFBundleTypeMIMETypes + + application/x-ptoptimizer-script + - diff -Nru hugin-2018.0.0+dfsg/CMakeModules/win_bundle.cmake hugin-2019.0.0+dfsg/CMakeModules/win_bundle.cmake --- hugin-2018.0.0+dfsg/CMakeModules/win_bundle.cmake 2017-04-22 17:02:42.000000000 +0000 +++ hugin-2019.0.0+dfsg/CMakeModules/win_bundle.cmake 2019-01-16 21:58:40.000000000 +0000 @@ -26,14 +26,14 @@ NO_DEFAULT_PATH) FILE(GLOB PANO13_EXECUTABLES ${PANO13_EXE_DIR}/PT*.exe ${PANO13_EXE_DIR}/panoinfo.exe) INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR}) - IF(${HUGIN_SHARED}) + IF(HUGIN_SHARED) FIND_FILE(PANO13_DLL NAMES pano13.dll libpano13.dll PATHS ${SOURCE_BASE_DIR}/libpano13/bin ${SOURCE_BASE_DIR}/Deploy/bin NO_SYSTEM_ENVIRONMENT_PATH ) INSTALL(FILES ${PANO13_DLL} DESTINATION ${BINDIR}) - ENDIF(${HUGIN_SHARED}) + ENDIF() # TODO: install documentation for panotools? FIND_PATH(PANO13_DOC_DIR Optimize.txt @@ -65,56 +65,62 @@ INSTALL(FILES ${EXIFTOOL_EXE_DIR}/exiftool.exe DESTINATION ${BINDIR}) # now install all necessary DLL - IF(${HUGIN_SHARED}) + IF(HUGIN_SHARED) + SET(DLL_SEARCH_PATH ${SOURCE_BASE_DIR}/Deploy/bin) + IF(VCPKG_TOOLCHAIN) + LIST(APPEND DLL_SEARCH_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin) + ENDIF() FIND_FILE(TIFF_DLL NAMES libtiff.dll tiff.dll - PATHS + PATHS ${DLL_SEARCH_PATH} ${SOURCE_BASE_DIR}/libtiff/bin - ${SOURCE_BASE_DIR}/tiff-4.0.6/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.5/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.4/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.3/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.1/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff - ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff - ${SOURCE_BASE_DIR}/Deploy/bin + NO_SYSTEM_ENVIRONMENT_PATH + ) + FIND_FILE(LZMA_DLL + NAMES lzma.dll + PATHS ${DLL_SEARCH_PATH} NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(JPEG_DLL NAMES jpeg.dll libjpeg.dll jpeg62.dll - PATHS + PATHS ${DLL_SEARCH_PATH} ${SOURCE_BASE_DIR}/jpeg-9a/lib ${SOURCE_BASE_DIR}/jpeg-9a/x64/Release - ${SOURCE_BASE_DIR}/jpeg-9/lib - ${SOURCE_BASE_DIR}/jpeg-8d/lib - ${SOURCE_BASE_DIR}/jpeg-8c/lib - ${SOURCE_BASE_DIR}/jpeg-8b/Release - ${SOURCE_BASE_DIR}/jpeg-8a/Release - ${SOURCE_BASE_DIR}/jpeg-8/Release - ${SOURCE_BASE_DIR}/Deploy/bin NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(PNG_DLL NAMES libpng16.dll libpng15.dll libpng14.dll - PATHS ${SOURCE_BASE_DIR}/libpng/bin ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${SOURCE_BASE_DIR}/Deploy/bin + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/libpng/bin NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(ZLIB_DLL NAMES zlib1.dll zlib.dll libz.dll libzlib.dll - PATHS ${SOURCE_BASE_DIR}/zlib ${SOURCE_BASE_DIR}/zlib/bin ${SOURCE_BASE_DIR}/Deploy/bin + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/zlib + ${SOURCE_BASE_DIR}/zlib/bin NO_SYSTEM_ENVIRONMENT_PATH ) FIND_PATH(OPENEXR_BIN_DIR NAMES Half.dll libHalf.dll - PATHS ${SOURCE_BASE_DIR}/Deploy/lib ${SOURCE_BASE_DIR}/Deploy/bin ${SOURCE_BASE_DIR}/Deploy/lib/Release ${SOURCE_BASE_DIR}/Deploy/bin/Release + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/Deploy/lib + ${SOURCE_BASE_DIR}/Deploy/lib/Release + ${SOURCE_BASE_DIR}/Deploy/bin/Release DOC "Location of OpenEXR libraries" NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH ) - FILE(GLOB OPENEXR_DLL ${OPENEXR_BIN_DIR}/*.dll) + IF(NOT OPENEXR_BIN_DIR) + MESSAGE(FATAL_ERROR "OpenEXR dlls not found in search path") + ENDIF() + FILE(GLOB OPENEXR_DLL + ${OPENEXR_BIN_DIR}/Half*.dll ${OPENEXR_BIN_DIR}/IlmImf*.dll ${OPENEXR_BIN_DIR}/IEx*.dll + ${OPENEXR_BIN_DIR}/IMath*.dll ${OPENEXR_BIN_DIR}/IlmThread*.dll) FIND_FILE(VIGRA_DLL NAMES vigraimpex.dll - PATHS ${SOURCE_BASE_DIR}/vigra/bin ${SOURCE_BASE_DIR}/Deploy/bin + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/vigra/bin NO_SYSTEM_ENVIRONMENT_PATH ) IF(NOT HAVE_STD_FILESYSTEM) @@ -124,22 +130,39 @@ ENDIF() FIND_FILE(EXIV2_DLL NAMES exiv2.dll libexiv2.dll - PATHS ${SOURCE_BASE_DIR}/Deploy/bin ${SOURCE_BASE_DIR}/Deploy/bin ${SOURCE_BASE_DIR}/exiv2/bin ${SOURCE_BASE_DIR}/exiv2/msvc2012/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.25/msvc2012/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.24/msvc2012/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/Win32/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/exiv2/bin NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(LIBEXPAT_DLL NAMES libexpat.dll expat.dll - PATHS ${SOURCE_BASE_DIR}/Deploy/bin ${SOURCE_BASE_DIR}/expat/bin ${SOURCE_BASE_DIR}/exiv2/msvc2012/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.25/msvc2012/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.24/msvc2012/exiv2lib/x64/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.23/msvc64/bin/Win32/ReleaseDLL ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release ${SOURCE_BASE_DIR}/exiv2-0.22/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.21.1/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/bin/ReleaseDLL ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/expat/bin NO_SYSTEM_ENVIRONMENT_PATH ) + FIND_FILE(LIBICONV_DLL + NAMES libiconv.dll + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/expat/bin + NO_SYSTEM_ENVIRONMENT_PATH + ) + IF(LIBICONV_DLL) + FIND_FILE(LIBCHARSET_DLL + NAMES libcharset.dll + PATHS ${DLL_SEARCH_PATH} + NO_SYSTEM_ENVIRONMENT_PATH + ) + ENDIF() FIND_FILE(GLEW_DLL NAMES glew32.dll - PATHS ${SOURCE_BASE_DIR}/glew/bin ${SOURCE_BASE_DIR}/Deploy/bin + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/glew/bin NO_SYSTEM_ENVIRONMENT_PATH ) FIND_FILE(LCMS2_DLL NAMES lcms2.dll liblcms2.dll liblcms2-2.dll - PATHS ${LCMS2_ROOT_DIR}/bin ${SOURCE_BASE_DIR}/Deploy/bin + PATHS ${DLL_SEARCH_PATH} + ${LCMS2_ROOT_DIR}/bin NO_SYSTEM_ENVIRONMENT_PATH ) # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space @@ -152,17 +175,52 @@ MESSAGE(FATAL_ERROR "Unknown target for Win32 wxWidgets DLLs") ENDIF() ENDIF() + FIND_PATH( + WXWIDGETS_DLL_PATH + NAME + wxbase313u_${WXSUFFIX}_custom.dll + wxbase300u_${WXSUFFIX}_custom.dll + wxbase301u_${WXSUFFIX}_custom.dll + wxbase302u_${WXSUFFIX}_custom.dll + wxbase310u_${WXSUFFIX}_custom.dll + wxbase311u_${WXSUFFIX}_custom.dll + wxbase312u_${WXSUFFIX}_custom.dll + PATHS + ${wxWidgets_LIB_DIR} + ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin + NO_SYSTEM_ENVIRONMENT_PATH + ) + IF(NOT WXWIDGETS_DLL_PATH AND CMAKE_SIZEOF_VOID_P EQUAL 8) + # for 64 bit build check also variant with x64 + SET(WXSUFFIX "${WXSUFFIX}_x64") + FIND_PATH( + WXWIDGETS_DLL_PATH + NAME + wxbase313u_${WXSUFFIX}_custom.dll + wxbase300u_${WXSUFFIX}_custom.dll + wxbase301u_${WXSUFFIX}_custom.dll + wxbase302u_${WXSUFFIX}_custom.dll + wxbase310u_${WXSUFFIX}_custom.dll + wxbase311u_${WXSUFFIX}_custom.dll + wxbase312u_${WXSUFFIX}_custom.dll + PATHS + ${wxWidgets_LIB_DIR} + ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin + NO_SYSTEM_ENVIRONMENT_PATH + ) + ENDIF() + MESSAGE(STATUS "wxWidgets DLL path: ${WXWIDGETS_DLL_PATH}") # first variant is for development versions with 3 numbers, second variant for stable versions with 2 numbers FILE(GLOB WXWIDGETS_DLL - ${wxWidgets_LIB_DIR}/wxbase[2-3][0-9][0-9]u_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxbase[2-3][0-9]u_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_core_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_core_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_xrc_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_xrc_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_adv_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_adv_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_gl_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_gl_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_html_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_html_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxbase[2-3][0-9][0-9]u_xml_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxbase[2-3][0-9]u_xml_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_aui_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_aui_${WXSUFFIX}*.dll - ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9][0-9]u_qa_${WXSUFFIX}*.dll ${wxWidgets_LIB_DIR}/wxmsw[2-3][0-9]u_qa_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxbase[2-3][0-9][0-9]u_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxbase[2-3][0-9]u_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_core_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_core_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_xrc_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_xrc_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_adv_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_adv_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_gl_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_gl_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_html_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_html_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxbase[2-3][0-9][0-9]u_xml_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxbase[2-3][0-9]u_xml_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_aui_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_aui_${WXSUFFIX}*.dll + ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9][0-9]u_qa_${WXSUFFIX}*.dll ${WXWIDGETS_DLL_PATH}/wxmsw[2-3][0-9]u_qa_${WXSUFFIX}*.dll ) # some checking in ensure all is found okay list(LENGTH WXWIDGETS_DLL COUNT_WXWIDGETS_DLL) @@ -178,27 +236,42 @@ IF(LIBEXPAT_DLL) INSTALL(FILES ${LIBEXPAT_DLL} DESTINATION ${BINDIR}) ENDIF() + IF(LZMA_DLL) + INSTALL(FILES ${LZMA_DLL} DESTINATION ${BINDIR}) + ENDIF() + IF(LIBICONV_DLL) + INSTALL(FILES ${LIBICONV_DLL} ${LIBCHARSET_DLL} DESTINATION ${BINDIR}) + ENDIF() FIND_FILE(SQLITE3_DLL NAMES sqlite3.dll libsqlite3.dll - PATHS ${SOURCE_BASE_DIR}/sqlite3 ${SOURCE_BASE_DIR}/Deploy/bin + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/sqlite3 NO_SYSTEM_ENVIRONMENT_PATH ) INSTALL(FILES ${SQLITE3_DLL} DESTINATION ${BINDIR}) IF(HAVE_FFTW) FIND_FILE(FFTW3_DLL - NAMES libfftw-3.3.dll - PATHS ${SOURCE_BASE_DIR}/fftw-3.3.4/fftw-3.3-libs/x64/Release + NAMES libfftw-3.3.dll fftw3.dll + PATHS ${DLL_SEARCH_PATH} + ${SOURCE_BASE_DIR}/fftw-3.3.4/fftw-3.3-libs/x64/Release ${SOURCE_BASE_DIR}/fftw-3.3.4/fftw-3.3-libs/x64 ${SOURCE_BASE_DIR}/fftw-3.3.4/fftw-3.3-libs/ ${SOURCE_BASE_DIR}/fftw-3.3.3/fftw-3.3-libs/x64 ${SOURCE_BASE_DIR}/fftw-3.3.3/fftw-3.3-libs/ - ${SOURCE_BASE_DIR}/Deploy/bin NO_SYSTEM_ENVIRONMENT_PATH) INSTALL(FILES ${FFTW3_DLL} DESTINATION ${BINDIR}) ENDIF() - ENDIF(${HUGIN_SHARED}) + IF(FLANN_FOUND) + FIND_FILE(FLANN_DLL + NAMES flann_cpp.dll + PATHS ${DLL_SEARCH_PATH} + NO_SYSTEM_ENVIRONMENT_PATH) + INSTALL(FILES ${FLANN_DLL} DESTINATION ${BINDIR}) + ENDIF() + + ENDIF() ENDIF(WIN32) diff -Nru hugin-2018.0.0+dfsg/debian/changelog hugin-2019.0.0+dfsg/debian/changelog --- hugin-2018.0.0+dfsg/debian/changelog 2018-02-03 13:27:24.000000000 +0000 +++ hugin-2019.0.0+dfsg/debian/changelog 2018-02-03 13:27:24.000000000 +0000 @@ -1,9 +1,9 @@ -hugin (2018.0.0+dfsg-1) unstable; urgency=low +hugin (2019.0.0+dfsg-0build1~ubuntu18.04) bionic; urgency=low * New upstream version, identical to rc2. * Upload to unstable. - -- Andreas Metzler Sat, 03 Feb 2018 14:27:24 +0100 + -- pandajim (key for lives deb) Sat, 03 Feb 2018 14:27:24 +0100 hugin (2018.0.0~rc2+dfsg-1) experimental; urgency=medium diff -Nru hugin-2018.0.0+dfsg/debian/control hugin-2019.0.0+dfsg/debian/control --- hugin-2018.0.0+dfsg/debian/control 2018-02-03 13:23:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/debian/control 2018-02-03 13:27:24.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Andreas Metzler # hugin can use Boost::Signal or in Boost >= 1.54 Boost::Signal2 which is # shipped in libboost-dev. -Build-Depends: debhelper (>= 10), dh-python, cmake (>= 3.1), +Build-Depends: debhelper, dh-python, cmake (>= 3.1), libboost-graph-dev (>= 1.47), libboost-thread-dev (>= 1.47), libboost-regex-dev (>= 1.47), libboost-filesystem-dev (>= 1.47), libboost-iostreams-dev (>= 1.47), libboost-system-dev (>= 1.47), diff -Nru hugin-2018.0.0+dfsg/debian/hugin-data.install hugin-2019.0.0+dfsg/debian/hugin-data.install --- hugin-2018.0.0+dfsg/debian/hugin-data.install 2014-01-01 14:47:38.000000000 +0000 +++ hugin-2019.0.0+dfsg/debian/hugin-data.install 2018-02-03 13:27:24.000000000 +0000 @@ -1,4 +1,3 @@ usr/share/icons usr/share/hugin usr/share/locale -usr/share/pixmaps diff -Nru hugin-2018.0.0+dfsg/doc/assistant_file_format.txt hugin-2019.0.0+dfsg/doc/assistant_file_format.txt --- hugin-2018.0.0+dfsg/doc/assistant_file_format.txt 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/doc/assistant_file_format.txt 2019-02-04 16:57:17.000000000 +0000 @@ -27,7 +27,8 @@ # arguments for the command, use placeholder %project% # for project filename and %image0% for first image -# file +# file, %imagelist% return a temporary file with +# all images (one filename per line) Arguments=--multirow --output=%project% %project% # Condition, if the step should be executed diff -Nru hugin-2018.0.0+dfsg/doc/cpfind.pod hugin-2019.0.0+dfsg/doc/cpfind.pod --- hugin-2018.0.0+dfsg/doc/cpfind.pod 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/doc/cpfind.pod 2019-01-26 14:47:09.000000000 +0000 @@ -29,7 +29,7 @@ =head2 Rectilinear and fisheye images -Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefor remapped into a conformal space (cpfind is using the stereographic projection) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens. +Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefore remapped into a conformal space (cpfind is using the stereographic projection) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens. =head2 Using celeste diff -Nru hugin-2018.0.0+dfsg/doc/deghosting_mask.pod hugin-2019.0.0+dfsg/doc/deghosting_mask.pod --- hugin-2018.0.0+dfsg/doc/deghosting_mask.pod 2013-06-10 18:13:11.000000000 +0000 +++ hugin-2019.0.0+dfsg/doc/deghosting_mask.pod 2018-11-01 17:09:59.000000000 +0000 @@ -35,7 +35,7 @@ =item B<-c|--contrast> -Change constrast before applying threshold; default: 1.3 +Change contrast before applying threshold; default: 1.3 =item B<-a|--advanced> diff -Nru hugin-2018.0.0+dfsg/doc/executor_file_format.txt hugin-2019.0.0+dfsg/doc/executor_file_format.txt --- hugin-2018.0.0+dfsg/doc/executor_file_format.txt 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/doc/executor_file_format.txt 2018-09-17 18:19:22.000000000 +0000 @@ -65,7 +65,7 @@ # %output% - output filename (required) # %input% - all input images (required) # %size% - widthxheight+left+top -Arguments=--output=%result% %input% +Arguments=--output=%output% %input% # additional argument which is added for 360 deg output WrapArgument=-w diff -Nru hugin-2018.0.0+dfsg/doc/nona.txt hugin-2019.0.0+dfsg/doc/nona.txt --- hugin-2018.0.0+dfsg/doc/nona.txt 2014-10-12 12:12:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/doc/nona.txt 2018-12-25 13:10:41.000000000 +0000 @@ -98,7 +98,7 @@ # 1 - Panoramic (Scanning cameras like Noblex) # 2 - Circular fisheye # 3 - full-frame fisheye -# 4 - PSphere, equirectangular +# 4 - Equirectangular (spherical panos) # 8 - orthographic fisheye # 10 - stereographic fisheye # 21 - Equisolid fisheye @@ -122,32 +122,29 @@ # Er white balance factor for red channel # Eb white balance factor for blue channel # -# Vm vignetting correction mode (default 0): +# Vm vignetting correction mode (default 5): # 0: no vignetting correction -# 1: radial vignetting correction (see j,k,l,o options) -# 2: flatfield vignetting correction (see p option) +# 1: radial vignetting correction (see Va, Vb, Vc, Vd options) +# 2: flatfield vignetting correction (see Vf option) # 4: proportional correction: i_new = i / corr. -# This mode is recommended for use with linear data. -# If the input data is gamma corrected, try adding g2.2 -# to the m line. # # default is additive correction: i_new = i + corr # Both radial and flatfield correction can be combined with the # proportional correction by adding 4. -# Examples: i1 - radial polynomial correction by addition. -# The coefficients j,k,l,o must be specified. -# i5 - radial polynomial correction by division. -# The coefficients j,k,l,o must be specified. -# i6 - flatfield correction by division. -# The flatfield image should be specified with the p option +# Examples: Vm1 - radial polynomial correction by addition. +# The coefficients Va, Vb, Vc, Vd must be specified. +# Vm5 - radial polynomial correction by division. +# The coefficients Va, Vb, Vc, Vd must be specified. +# Vm6 - flatfield correction by division. +# The flatfield image should be specified with the Vf option # # Va,Vb,Vc,Vd vignetting correction coefficients. (defaults: 1,0,0,0) # ( 0, 2, 4, 6 order polynomial coefficients): # corr = ( i + j*r^2 + k*r^4 + l*r^6), where r is the distance from the image center # The corrected pixel value is calculated with: i_new = i_old + corr -# if additive correction is used (default) -# for proportional correction (h5): i_new = i_old / corr; +# if additive correction is used. +# for proportional correction (Vm5): i_new = i_old / corr; # # Vx,Vy radial vignetting correction offset in pixels (defaults Vx0 Vy0, optional). # Used to correct for offset from center of image @@ -176,6 +173,12 @@ # j0 stack number # # nName file name of the input image. +# +# Parameters in different images can be linked using '=' +# followed by the image number starting with 0. +# Example 'v=0' sets horizontal field of view as in +# image number 0. You can only refer to images before the +# current image. i f2 r0 p0 y0 v183 a0 b-0.1 c0 S100,600,100,800 n"photo1.jpg" i f2 r0 p0 y180 v183 a0 b-0.1 c0 S100,600,100,800 n"photo1.jpg" @@ -185,12 +188,6 @@ # ---------------- # Set mode for stitcher, not required # -# -# g2.5 Set gamma value for internal computations (default 1.0) -# See -# This is especially useful in conjunction with the vignetting correction -# by division -# # i2 Set interpolator, See # one of: # 0 - poly3 (default) @@ -212,8 +209,18 @@ # (a,b,c,d,e,v,r,p,y geometric parameters) and vig_optimize # (Eev,Er,Eb,Va,Vb,Vc,Vd,Vx,Vy,Ra,Rb,Rc,Rd,Re photometric parameters) # -# The format is described in libpano13 Optimize.txt - +# Optimization variables are listed together with the image number +# starting at 0. There can be several v-lines. +# +# y0 Optimize yaw in image 0 +# p1 Optimize pitch in image 1 +# r2 Optimize roll in image 2 +# v0 Optimize field of view in image 0 +# +# If a image has a parameter linked to another image only +# need to optimize the master. +# +v v0 r0 p0 r1 p1 y1 # 'k'-line options # ---------------- @@ -239,4 +246,20 @@ # Control point lines # nona ignores all 'c' lines, these lines are used by autooptimiser # -# The format is described in libpano13 Optimize.txt +# One line per point pair +# about one pair of points per image per variable being optimized. +# The more variables being optimized the more control points needed. +# +# n0 first image +# N1 second image +# x1066.5 first image x point position +# y844.333 first image y point position +# X239.52 second image x point position +# Y804.64 second image y point position +# t0 type of control point (optional) +# 0 - normal (default) +# 1 - optimize horizontally only +# 2 - optimize vertically only +# 3+ (all other numbers) - straight line + +c n0 N1 x1066.5 y844.333 X239.52 Y804.64 t0 diff -Nru hugin-2018.0.0+dfsg/INSTALL_cmake hugin-2019.0.0+dfsg/INSTALL_cmake --- hugin-2018.0.0+dfsg/INSTALL_cmake 2016-03-25 08:24:14.000000000 +0000 +++ hugin-2019.0.0+dfsg/INSTALL_cmake 2018-11-02 15:24:01.000000000 +0000 @@ -1,62 +1,85 @@ - -============================ -New CMake based build system +CMake based build system ============================ +The file contains the instruction to build Hugin with CMake. -Using the CMake build system under Unix -======================================= +1. DEPENDENCIES -briefly, do the following: +Hugin depends on the following packages. -$ cd hugin +1.1. Build-Time Dependencies + +Users compiling Hugin from source will need: + + A C++compiler which supports OpenMP and C++11. + * OpenMP support is not required. But when compiling + without OpenMP nona and cpfind (and some other + algorithm) are running only with one thread, + which is slower. + + The wxWidgets GUI toolkit version >=3.0.0. + C++17 TS or boost::filesystem (boost >=1.47) + libtiff the TIFF library with LZW support. + libpano13 version >=2.9.19 + libjpg the JPEG library + libpng the PNG library + libopenexr the OpenEXR library + libvigra the VIGRA libray, header files and impex library (>=1.9) + Exiv2 Image metadata library + GLEW the OpenGL Extension Wrangler Library + gettext + sqlite3, the SQL database backend for the lens database + littlecms2, little cms color engine + optionally, lapack + optionally, libfftw3 + on Unix you need also + libGLU the OpenGL utility library + libxi + libxmu + on Windows you need + HTML Help Workshop for generating compiled HTML help file + on Mac OS you need + freeglut or glut, the OpenGL utility toolkit + for the optional Python Scripting Interface (currently functional and tested only on Linux and Windows) + Python version >=2.6 + SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4 + Hugin can be compiled with gcc, as well as with MSVC. + The build process requires CMake version >=3.1 + +If cmake fails to pick up some dependencies, make sure you have +the corresponding development packages installed (often named: +libjpeg-dev and so on). + +1.2. At runtime + +During runtime of Hugin the following programs are needed: + + enblend >= 3.2 is required. + Exiftool, version >=9.09 is required to support GPano tags. Otherwise they are ignored. + + Optionally Python argparse command-line parsing library for the Python scripts. + +2. COMPILING +======================================= + +First, create a build directory and change into it: $ mkdir mybuild $ cd mybuild -for a Debian package use -$ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCPACK_BINARY_DEB:BOOL=ON ../ +Then call CMake from this build directory. +CMake can also create install package. Depending on the format of your packages +call for a Debian package +$ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCPACK_BINARY_DEB:BOOL=ON /PATH/TO/HUGIN/SOURCES or for a rpm package -$ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCPACK_BINARY_RPM:BOOL=ON ../ +$ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCPACK_BINARY_RPM:BOOL=ON /PATH/TO/HUGIN/SOURCES +(for other formats see CMake documentation) Build the package $ make package and install the package with your package manager -If using Fedora's rpmbuild to build an rpm package, the recommended procedure -is similar to the above. -$ cd hugin -$ mkdir mybuild -$ cd mybuild -$ cmake .. -$ make package_source -copy, or move the selected source archive (.bz2 or .gz) from your mybuild dir to your rpmbuild -SOURCE dir, generate or edit your .spec file, and build your package. - -Please report any problems to the hugin-ptx group at google: -http://groups.google.com/group/hugin-ptx - -Missing dependencies -======================= -If cmake fails to pick up some dependencies, make sure you have -the corresponding development packages installed (often named: -libjpeg-dev and so on). If cmake still fails to find the libraries, -for example if you have installed them into a non-standard directory, -you can specify the path to libraries and include files using the -ccmake program: -$ cmake . -[some failure] -$ ccmake . - -If CMake fails to recognize the boost thread library, the boost library suffix -might need to be given in the Boost_LIB_SUFFIX CMake variable. For example: -$ cmake -DBoost_LIB_SUFFIX=gcc41-mt-1_34_1 -if the boost thread suffix is gcc41-mt-1_34_1 - -Configuring the build -===================== - -Upon cmake invocation, several variables can be set with the -D command line -parameter. Important variables include: +The build process can be configured with different switches. These variables +can be set with the -D command line parameter. Important variables include: CMAKE_INSTALL_PREFIX Destination directory of make install (default: /usr/local) @@ -65,8 +88,13 @@ usually 64 is used as prefix. Default: empty. Setting to 64 results in: $CMAKE_INSTALL_PREFIX/lib64 HUGIN_SHARED set to 0 to disable build shared libraries for internal - functions. (Unix and OSX, Windows is always statically linked) -BUILD_HSI Set to on to build with Python scripting support + functions. +BUILD_HSI=on Set to on to build with Python scripting support +USE_GDKBACKEND_X11=on Set to on to enforce using X11 as GDKBACKEND. + This is needed for Wayland, because wxWidgets wxGLCanvas + does not support Wayland at the moment. +BUILD_WITH_EGL=on When set to on it uses EGL to initialize OpenGL context + in nona instead of X windows functions. MAC_SELF_CONTAINED_BUNDLE=1 Configures hugin for a fully bundled version, where all required programs (nona, enblend, HuginStitchProject, @@ -74,12 +102,38 @@ Without this switch, hugin will behave just like on any other unix platform and depend on resources outside the bundle (translations, data files etc.). +UNIX_SELF_CONTAINED_BUNDLE=on Configure hugin for building a fully bundled + AppImage version, where all dependencies are embedded in + the bundle. + +CMake offers also a GUI which makes setting these variables and checking the paths +to the dependencies easier. -For distributors: -================= + +3. FURTHER REMARKS +======================================= + +3.1 Fedora's rpmbuild +===================== +If using Fedora's rpmbuild to build an rpm package, the recommended procedure +is similar to the above. +$ cd hugin +$ mkdir mybuild +$ cd mybuild +$ cmake .. +$ make package_source +copy, or move the selected source archive (.bz2 or .gz) from your mybuild dir to your rpmbuild +SOURCE dir, generate or edit your .spec file, and build your package. + +3.2 For distributors +==================== CMake supports the DESTDIR variable during make install, this might be helpful to install into a temporary directory during package creation $ make install DESTDIR=mytmp_package_dir + + +Please report any problems to the hugin-ptx group at google: +http://groups.google.com/group/hugin-ptx diff -Nru hugin-2018.0.0+dfsg/mac/configure-bundle.sh hugin-2019.0.0+dfsg/mac/configure-bundle.sh --- hugin-2018.0.0+dfsg/mac/configure-bundle.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/configure-bundle.sh 2019-01-27 06:59:55.000000000 +0000 @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +# INSTRUCTIONS FOR BUILDING A SELF CONTAINED BUNDLE (FOR DISTRIBUTION) +# MORE DETAILS AT THE PANOTOOLS WIKI: http://wiki.panotools.org/Hugin_Compiling_OSX +# +# Install cmake and llvm from homebrew (OpenMP support is missing from Apple's clang) +# +# brew install llvm cmake +# +# Build the external programs (see in folder ExternalProgramms) by running +# download-all.sh and build-all.sh +# +# create and cd into a folder next to the "hugin" source folder (i.e. "build") +# +# someFolder +# |- hugin (the source folder) +# - build (cd into this folder) +# +# then run: +# $ ../hugin/mac/cmake-bundle.sh +# $ make +# +# for packaging: +# +# $ make package (to create a dmg image) +# +# (styling the dmg can sometimes be a bit fiddly, +# retry if it doesn't work correctly) + + +# You can add -DHUGIN_BUILDER="YOUR NAME" to the cmake call + +TYPE="Release" +PREFIX="/" + +SDKVERSION=$(sw_vers -productVersion | sed "s:.[[:digit:]]*.$::g") # "10.12" +REPOSITORYDIR=$(cd .. && pwd)"/hugin/mac/ExternalPrograms/repository" + +PKG_CONFIG_PATH=$REPOSITORYDIR/lib/pkgconfig \ +CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++ \ +cmake ../hugin -B. \ +-DCMAKE_OSX_SYSROOT="macosx${SDKVERSION}" \ +-DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_FIND_ROOT_PATH="$REPOSITORYDIR" \ +-DBUILD_HSI=OFF -DENABLE_LAPACK=ON -DMAC_SELF_CONTAINED_BUNDLE=ON \ +-DCMAKE_BUILD_TYPE="$TYPE" -G "Unix Makefiles" diff -Nru hugin-2018.0.0+dfsg/mac/CopyTranslations.sh hugin-2019.0.0+dfsg/mac/CopyTranslations.sh --- hugin-2018.0.0+dfsg/mac/CopyTranslations.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/CopyTranslations.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +cd $1 + +mkdir -p mac +for file in *.gmo; do + ext=${file%.*} + mkdir -p "mac/${ext}.lproj" + cp -p "$file" "mac/${ext}.lproj/hugin.mo" +done +mkdir -p "mac/en_US.lproj" Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/mac/DmgBackground.jpg and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/mac/DmgBackground.jpg differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/mac/DmgDS_Store.in and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/mac/DmgDS_Store.in differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/mac/DmgScript.scpt and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/mac/DmgScript.scpt differ diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/patches/tiff.h.patch hugin-2019.0.0+dfsg/mac/ExternalPrograms/patches/tiff.h.patch --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/patches/tiff.h.patch 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/patches/tiff.h.patch 2016-05-14 09:54:48.000000000 +0000 @@ -0,0 +1,14 @@ +diff --git a/tiff.h b/tiff.h +index bc46acd..78753f7 100644 +--- a/tiff.h ++++ b/tiff.h +@@ -75,7 +75,8 @@ typedef TIFF_INT32_T int32; + typedef TIFF_UINT32_T uint32; + + typedef TIFF_INT64_T int64; +-typedef TIFF_UINT64_T uint64; ++typedef uint64_t uint64; ++ + + /* + * Some types as promoted in a variable argument list diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/readme.txt hugin-2019.0.0+dfsg/mac/ExternalPrograms/readme.txt --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/readme.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/readme.txt 2012-11-09 17:29:42.000000000 +0000 @@ -0,0 +1,50 @@ +External Programs +(This is for 10.6 and above and will built a 64bit only bundle and tools.) + + +HOWTO: +1. Download the source package of the external programs. You typically want to place it in the "ExternalPrograms" folder. +2. Edit ExternalPrograms/scripts/SetEnv-*.txt.org file appropriately, especially the myREPOSITORYDIR variable and + save it as SetEnv-*.txt. +3. Open a Terminal window (bash is preferred). +5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') +4. Set the variables for the compilation. (eg. 'source ../scripts/SetEnv-universal.txt') +6. Using the appropriate shell script, build the source. (eg. 'sh ../scripts/libjpeg.sh') + + +RESULT: +The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). + + +USAGE: +When compiling programs from source specifying the above directory as prefix. You probably have to specify the correct SDK (-isysroot) and MacOS target version (-mmacosx-version-min) as well. +You can make multiple 'repositories' as well. For example, you can make one for statically and one for dynamically linked product, or ones with different target architecture/OS versions. + + +PROGRAMS: +The following sets are recommended and assumed for building Hugin. Different versions may require editing the version numbers in the scripts. + +[Dynamic Build for distributable Hugin.app and PTBatcherGUI.app] +boost (1.41) +libexpat (2.0.1) +libiconv +gettext (0.17) +libjpeg (8) +libpng (1.2.41) +libtiff (3.8.2) +ilmbase (1.0.1) +openexr16 (1.6.2) +pano13 (2.9.17) +wxmac28 (2.9.x) +libexiv2 (0.19) +lcms (1.17) +libxmi (1.2) +libglew (1.5.1) +gnumake (Darwin 9/gnumake-119/make) +enblend (4.0) + +LICENSE: +The scripts for compiling universal builds are originally copyrighted by Ippei Ukai (2007-2008), and distributed under the modified BSD license. + + +$Id: howto.txt 1902 2007-02-04 22:27:47Z ippei diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/boost.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/boost.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/boost.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/boost.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,62 @@ +#!/usr/bin/env bash +# ------------------ +# boost +# ------------------ +# $Id: boost.sh 1902 2007-02-04 22:27:47Z ippei $ +# Copyright (c) 2007-2008, Ippei Ukai + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# ppcOSVERSION="10.4" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcOPTIMIZE="-mcpu=G3 -mtune=G4" \ +# i386TARGET="i386-apple-darwin8" \ +# i386OSVERSION="10.4" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386OPTIMIZE ="-march=prescott -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 1_41 +# 20100121.1 sg Script reverted to 1_40 +# 20100624.0 hvdw More robust error checking on compilation +# 20100831.0 hvdw Upgraded to 1_44 +# 20100920.0 hvdw Add removed libboost_system again and add iostreams and regex +# 20100920.1 hvdw Add date_time as well +# 20111230.0 hvdw Adapt for versions >= 1.46. slightly different source tree structure +# 20111230.1 hvdw Correct stupid typo +# ------------------------------- + + +echo "## First compiling b2 ##" +cd "./tools/build/" +sh "bootstrap.sh" +mkdir -p bin +./b2 install --prefix=./bin toolset=darwin +cd "../../" +B2=$(ls ./tools/build/bin/bin/b2) + +echo "b2 command is: $B2" +echo "## Done compiling b2 ##" + + +echo "using darwin : : $CXX : ;" > ./user-conf.jam +$B2 -a --prefix="$REPOSITORYDIR" --user-config=./user-conf.jam install \ + --with-filesystem --with-system \ + variant=release \ + cxxflags="$OPTIMIZE -std=c++11 -stdlib=libc++ -mmacosx-version-min=$DEPLOY_TARGET" \ + linkflags="-stdlib=libc++ -lc++ -mmacosx-version-min=$DEPLOY_TARGET" || fail "building" + + +if [ -f "$REPOSITORYDIR/lib/libboost_filesystem.dylib" ]; then + install_name_tool -id "$REPOSITORYDIR/lib/libboost_filesystem.dylib" "$REPOSITORYDIR/lib/libboost_filesystem.dylib"; + install_name_tool -change "libboost_system.dylib" "$REPOSITORYDIR/lib/libboost_system.dylib" "$REPOSITORYDIR/lib/libboost_filesystem.dylib"; +fi + +if [ -f "$REPOSITORYDIR/lib/libboost_system.dylib" ]; then + install_name_tool -id "$REPOSITORYDIR/lib/libboost_system.dylib" "$REPOSITORYDIR/lib/libboost_system.dylib"; +fi diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/build-all.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/build-all.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/build-all.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/build-all.sh 2019-01-27 06:59:54.000000000 +0000 @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100110.0 sg Make libGLEW and libexiv2 dynamic +# Update to enblend-enfuse-4.0 and panotools 2.9.15 +# 20100112.0 sg Made libxmi dynamic. Created lib-static directory +# 20100117.0 sg Update for glew 1.5.2 +# 20100119.0 HvdW Add libiconv +# 20100118.1 sg Fixed missing "" and named SVN directory for panotools libpano13-2.9.16 +# 20100121.0 sg Updated for newer packages: boost,jpeg,png,tiff,exiv2,lcms +# 20100121.1 sg Backed out new version of boost +# 20120413.0 hvdw update a lot of stuff. Add new scripts +# 20121010.0 hvdw update lots of scripts +# ------------------------------- + +DIR="$(cd "$(dirname "$0")" && pwd)" +cd "$DIR" || exit 1 +source SetEnv.sh +pre="<<<<<<<<<<<<<<<<<<<<" +pst=">>>>>>>>>>>>>>>>>>>>" + +FORCE_BUILD=$1 + +build(){ + cd "$REPOSITORYDIR" + + local name=$1 + local dir=$2 + if [[ -n "$4" ]]; then + local patch=$3 + local script=$4 + else + local script=$3 + fi + if [[ ! -f "_built/$name" ]] || [[ $FORCE_BUILD = "$name" ]]; then + echo "$pre $name: building $pst" + cd "$dir" || exit 1 + sh -c "$patch" + { $BASH "$script" || exit 1; } && touch "../_built/$name" + cd .. + else + echo "$pre $name: already built $pst" + fi +} + +cd "$REPOSITORYDIR" +mkdir -p _built + +build "libomp" libomp* ../../scripts/libomp.sh +build "boost" boost* ../../scripts/boost.sh +build "gettext" gettext* ../../scripts/gettext.sh +build "libffi" libffi* ../../scripts/libffi.sh +build "glib2" glib* ../../scripts/libglib2.sh +build "fftw" fftw* ../../scripts/fftw.sh +build "libglew" glew* ../../scripts/libglew.sh +build "gsl" gsl* ../../scripts/gsl.sh +build "libjpeg" jpeg* ../../scripts/libjpeg.sh +build "libpng" libpng* ../../scripts/libpng.sh +build "libtiff" tiff* ../../scripts/libtiff.sh +build "ilmbase" ilmbase* ../../scripts/ilmbase.sh +build "openexr" openexr* ../../scripts/openexr.sh +build "libpano" libpano13* ../../scripts/pano13.sh +build "libexiv2" exiv2* ../../scripts/libexiv2.sh +build "liblcms2" lcms2* ../../scripts/lcms2.sh +build "vigra" vigra* ../../scripts/vigra.sh +build "wxmac" wxWidgets* ../../scripts/wxmac.sh +build "enblend" enblend* ../../scripts/enblend.sh + +echo "$pre Finished! $pst" + +cd "$REPOSITORYDIR" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/download-all.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/download-all.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/download-all.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/download-all.sh 2019-01-27 06:59:54.000000000 +0000 @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +pre="<<<<<<<<<<<<<<<<<<<<" +pst=">>>>>>>>>>>>>>>>>>>>" + +DIR="$(cd "$(dirname "$0")" && pwd)" +cd "$DIR" || exit 1 +source SetEnv.sh + +download(){ + name=$1 + url=$2 + out=$3 + echo "$pre Downloading $name $pst" + if [[ -n $out ]]; then + curl -L -o "$out" "$url" + else + curl -L -O "$url" + fi + if [[ $? != 0 ]]; then + echo "++++++ Download of $name failed" + exit 1 + fi +} + + +cd "$REPOSITORYDIR" + +rm -rf _build +mkdir -p _src && cd _src + + +download "boost" "https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.gz" +download "exiv2" "http://www.exiv2.org/builds/exiv2-0.27.0a-Source.tar.gz" +download "fftw" "http://www.fftw.org/fftw-3.3.8.tar.gz" +download "gettext" "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.gz" +download "glew" "https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.zip/download" "glew-2.1.0.tgz" +download "glib" "https://ftp.gnome.org/pub/gnome/sources/glib/2.59/glib-2.59.0.tar.xz" +download "gsl" "http://ftpmirror.gnu.org/gsl/gsl-2.5.tar.gz" +download "ilmbase" "https://github.com/openexr/openexr/releases/download/v2.3.0/ilmbase-2.3.0.tar.gz" +download "openexr" "https://github.com/openexr/openexr/releases/download/v2.3.0/openexr-2.3.0.tar.gz" +download "exiftool" "http://owl.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.26.tar.gz" +download "jpeg" "http://www.ijg.org/files/jpegsrc.v9c.tar.gz" +download "lcms2" "https://sourceforge.net/projects/lcms/files/lcms/2.9/lcms2-2.9.tar.gz/download" "lcms2-2.9.tar.gz" +download "libffi" "ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz" +download "libomp" "https://www.openmprtl.org/sites/default/files/libomp_20160808_oss.tgz" +download "libpano13" "https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.19/libpano13-2.9.19.tar.gz/download" "libpano13-2.9.19.tar.gz" +download "libpng" "https://download.sourceforge.net/libpng/libpng-1.6.36.tar.gz" "libpng-1.6.36.tar.gz" +download "tiff" "http://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz" +download "vigra" "https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz" +download "wxWidgets" "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2" + +cd .. + +echo "$pre Downloading enblend-enfuse $pst" +hg clone http://hg.code.sf.net/p/enblend/code enblend-enfuse -r stable-4_2 + +for f in _src/*; do + echo "Extracting $f" + tar xf "$f"; +done \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/enblend.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/enblend.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/enblend.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/enblend.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# ------------------ +# enblend 4.0 +# ------------------ +# $Id: enblend3.sh 1908 2007-02-05 14:59:45Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20091209.0 sg Script enhanced to build Enblemd-Enfuse 4.0 +# 20091210.0 hvdw Removed code that downgraded optimization from -O3 to -O2 +# 20091223.0 sg Added argument to configure to locate missing TTF +# Building enblend documentation requires tex. Check if possible. +# 20100624.0 hvdw More robust error checking on compilation +# 20120430.0 hvdw Patch too old vigra in enblend for libpng 14 +# 20121010.0 hvdw simplify script to make this the default non openmp one +# ------------------------------- + +CC="$CC" CXX="$CXX" \ +PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ +LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS" \ +cmake . -DCMAKE_INSTALL_PREFIX="$REPOSITORYDIR" -DENABLE_OPENMP=ON \ + -DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOY_TARGET" -DCMAKE_OSX_SYSROOT="$MACSDKDIR" + + +make clean || fail "make clean step" +make $MAKEARGS || fail "make step"; +make install || fail "make install step"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/fftw.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/fftw.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/fftw.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/fftw.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking || fail "configure step" + +make $MAKEARGS || fail "make step" +make install || fail "make install step" \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/gettext.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/gettext.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/gettext.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/gettext.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# ------------------ +# gettext +# ------------------ +# Based on the works of (c) 2007, Ippei Ukai +# Created for Hugin by Harry van der Wolf 2009 + +# download location ftp.gnu.org/gnu/gettext/ + +# prepare + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100116.0 HvdW Correct script for libintl install_name in libgettext*.dylib +# 20100624.0 hvdw More robust error checking on compilation +# 20121110.0 hvdw update to 0.18.1 +# 20121114.0 hvdw fix some errors in symlinking +# ------------------------------- + + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS " \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-shared --enable-static=no --disable-csharp --disable-java \ + --with-included-gettext --with-included-glib \ + --with-included-libxml --without-examples --with-libexpat-prefix="$REPOSITORYDIR" \ + --with-included-libcroco --without-emacs --with-libiconv-prefix="$REPOSITORYDIR" || fail "configure step for $ARCH" ; + + +make clean || fail "make clean step" +make $MAKEARGS || fail "failed at make step of $ARCH"; +make install || fail "make install step of $ARCH"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/gsl.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/gsl.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/gsl.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/gsl.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# ------------------ +# gsl +# ------------------ +# $Id: $ +# Copyright (c) 2008, Ippei Ukai +# 2012, Harry van der Wolf + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20120111.0 initial version of gnu science library +# Dependency for new enblend after GSOC 2011 +# 20121010.0 hvdw remove ppc and ppc64 stuff +# ------------------------------- + + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-shared --enable-static=no || fail "configure step" + + make clean || fail "make clean step" + + make $MAKEARGS || fail "make step" + make install || fail "make install step" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/ilmbase.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/ilmbase.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/ilmbase.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/ilmbase.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +# ------------------ +# openexr +# ------------------ +# $Id: openexr.sh 2004 2007-05-11 00:17:50Z ippei $ +# Copyright (c) 2007, Ippei Ukai + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386TARGET="i386-apple-darwin8" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100624.0 hvdw More robust error checking on compilation +# 20121010.0 hvdw remove ppc and ppc64 part +# ------------------------------- + + +$CXX "./Half/eLut.cpp" -o "./Half/eLut-native" -stdlib=libc++ -lc++ +$CXX "./Half/toFloat.cpp" -o "./Half/toFloat-native" -stdlib=libc++ -lc++ + +[ -f "./Half/Makefile.in-original" ] || mv "./Half/Makefile.in" "./Half/Makefile.in-original" +sed -e 's/\.\/eLut/\.\/eLut-native/' \ + -e 's/\.\/toFloat/\.\/toFloat-native/' \ + "./Half/Makefile.in-original" > "./Half/Makefile.in" + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -stdlib=libc++ -lc++" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-shared --enable-static=no --cache-file=./cache || fail "configure step"; + +make clean || fail "make clean step" +make $MAKEARGS all || fail "make step"; +make install || fail "make install step"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/lcms2.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/lcms2.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/lcms2.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/lcms2.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# ------------------ +# liblcms2 +# ------------------ +# $Id: liblcms.sh 1902 2008-01-02 22:27:47Z Harry $ +# Copyright (c) 2007, Ippei Ukai +# script skeleton Copyright (c) 2007, Ippei Ukai +# lcms2 specifics 2012, Harry van der Wolf + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# OTHERARGs=""; + +# ------------------------------- +# 20120111.0 hvdw initial lcms2 (lcms version 2) script +# 20121010.0 hvdw update to 2.4 +# ------------------------------- + + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-static=no --enable-shared --with-zlib="$MACSDKDIR/usr/lib" || fail "configure step"; + # --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + +make clean || fail "make clean step" +make $MAKEARGS || fail "failed at make step" +make install || fail "make install step" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libexiv2.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libexiv2.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libexiv2.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libexiv2.sh 2019-01-27 06:59:54.000000000 +0000 @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +# ------------------ +# libexiv2 +# ------------------ +# $Id: $ +# Copyright (c) 2008, Ippei Ukai + +# ------------------------------- +# 20091206.0 sg Script NOT tested but uses std boilerplate +# 20100111.0 sg Script tested for building dylib +# 20100121.0 sg Script updated for 0.19 +# 20100624.0 hvdw More robust error checking on compilation +# 20120414.0 hvdw update to 0.22 +# 20121010.0 hvdw update to 0.23 +# ------------------------------- + +env \ + PATH="$REPOSITORYDIR/bin:$PATH" \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind -stdlib=libc++ -lc++" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + NEXT_ROOT="$MACSDKDIR" \ + cmake -DCMAKE_INSTALL_PREFIX="$REPOSITORYDIR" -DCMAKE_OSX_SYSROOT="macosx${SDKVERSION}" \ + -DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOY_TARGET" \ + -DEXIV2_ENABLE_LENSDATA=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF -DEXIV2_BUILD_SAMPLES=OFF . \ + || fail "cmake step"; + +make $MAKEARGS || fail "make step of $ARCH"; +make install || fail "make install step of $ARCH"; + +install_name_tool -id "$REPOSITORYDIR/lib/libexiv2."??".dylib" "$REPOSITORYDIR/lib/libexiv2."??".dylib" \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libffi.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libffi.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libffi.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libffi.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# ------------------ +# libffi +# ------------------ +# $Id: libffi.sh 1902 2008-01-02 22:27:47Z Harry $ +# Copyright (c) 2007, Ippei Ukai +# script skeleton Copyright (c) 2007, Ippei Ukai +# libffi specifics 2012, Harry van der Wolf + + +# prepare + +# ------------------------------- +# 20120411.0 HvdW Script tested +# 20121010.0 hvdw remove ppc stuff +# ------------------------------- + +# init + +VERSION_NAME=$(basename "$PWD") + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-static=no --enable-shared || fail "configure step"; + +make clean || fail "make clean step" +make $MAKEARGS || fail "make step" +make install || fail "make install" + + +cp -rv "$REPOSITORYDIR/lib/$VERSION_NAME/" "$REPOSITORYDIR" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libglew.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libglew.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libglew.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libglew.sh 2019-01-27 06:59:54.000000000 +0000 @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# ------------------ +# libglew +# ------------------ +# $Id: libglew.sh 1908 2007-02-05 14:59:45Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100110.0 sg Script enhanced to copy dynamic lib also +# 20100624.0 hvdw More robust error checking on compilation +# 20120414.0 hvdw updated to 1.7 +# 20120428.0 hvdw use gcc 4.6 for x86_64 for openmp compatibility on lion an up +# 20121010.0 hvdw update to 1.9; remove openmp stuff and place in openmp script +# ------------------------------- + + +cd build + +CC="$CC" CXX="$CXX" \ +LDFLAGS="$LDARGS" \ +cmake ./cmake -DCMAKE_INSTALL_PREFIX="$REPOSITORYDIR" -DBUILD_UTILS=OFF \ + -DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOY_TARGET" -DCMAKE_OSX_SYSROOT="$MACSDKDIR" || fail "cmake step"; + +make glew || fail "make step"; +make install || fail "make install step"; + +install_name_tool -id "$REPOSITORYDIR/lib/libGLEW.dylib" "$REPOSITORYDIR/lib/libGLEW.dylib" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libglib2.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libglib2.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libglib2.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libglib2.sh 2019-01-27 06:59:54.000000000 +0000 @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# ------------------ +# libglib2 +# ------------------ +# $Id: libglib2.sh 1902 2008-01-02 22:27:47Z Harry $ +# Copyright (c) 2007, Ippei Ukai +# script skeleton Copyright (c) 2007, Ippei Ukai +# libglib2 specifics 2012, Harry van der Wolf + + +# prepare + +# ------------------------------- +# 20120411.0 HvdW Script tested +# 20121010.0 hvdw remove openmp stuff +# ------------------------------- + +# init + + +export MSGFMT="$REPOSITORYDIR/bin/msgfmt" + +[ ! -f ./configure ] && ./autogen.sh + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + ZLIB_CFLAGS="-I$MACSDKDIR/usr/include" ZLIB_LIBS="-L$MACSDKDIR/usr/lib" \ + GETTEXT_CFLAGS="-I$REPOSITORYDIR/include" GETTEXT_LIBS="-L$REPOSITORYDIR/lib" \ + LIBFFI_CFLAGS="-I$REPOSITORYDIR/include" LIBFFI_LIBS="-L$REPOSITORYDIR/lib -lffi" \ + --disable-selinux --disable-fam --disable-xattr \ + --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf \ + --disable-man --disable-dtrace --disable-systemtap \ + --enable-static=no --enable-shared --with-pcre=internal || fail "configure step of $ARCH"; + +make clean || fail "make clean step" +make $MAKEARGS || fail "make step of $ARCH" +make install || fail "make install step of $ARCH" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libjpeg.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libjpeg.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libjpeg.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libjpeg.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# ------------------ +# libjpeg +# ------------------ +# $Id: libjpeg-8.sh 1902 2007-02-04 22:27:47Z ippei $ +# Copyright (c) 2007, Ippei Ukai + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4 -mmacosx-version-min=10.3" \ +# i386TARGET="i386-apple-darwin8" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386ONLYARG="-march=prescott -mtune=pentium-m -ftree-vectorize -mmacosx-version-min=10.4" \ +# OTHERARGs=""; + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for version 8 +# 20100624.0 hvdw More robust error checking on compilation +# 20120427.0 hvdw compile x86_64 with gcc 4.6 for Lion and up openmp compatibility +# ------------------------------- + + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-shared --enable-static=no || fail "configure step for $ARCH"; + +make clean || fail "make clean step" +make $MAKEARGS || fail "make step of $ARCH"; +make install || fail "make install step of $ARCH"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libomp.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libomp.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libomp.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libomp.sh 2019-01-27 06:59:54.000000000 +0000 @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +env \ +CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ +CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ +CPPFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include" \ +LDFLAGS="-L$REPOSITORYDIR/lib" \ +cmake -DCMAKE_INSTALL_PREFIX="$REPOSITORYDIR" \ +-DCMAKE_OSX_SYSROOT="macosx${SDKVERSION}" -DCMAKE_OSX_DEPLOYMENT_TARGET="$OSVERSION" \ +-DLIBOMP_ARCH="32e" . || fail "configure step for $ARCH"; + +make $MAKEARGS || fail "failed at make step of $ARCH"; +make install || fail "make install step of $ARCH"; + +install_name_tool -id "$REPOSITORYDIR/lib/libiomp5.dylib" "$REPOSITORYDIR/lib/libiomp5.dylib" +ln -sf "libiomp5.dylib" "$REPOSITORYDIR/lib/libomp.dylib" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libpng.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libpng.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libpng.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libpng.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# ------------------ +# libpng +# ------------------ +# $Id: libpng.sh 1902 2007-02-04 22:27:47Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# prepare + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 1.2.40 +# 201005xx.0 hvdw Adapted for 1.2.43 +# 20100624.0 hvdw More robust error checking on compilation +# 20100831.0 hvdw upgrade to 1.2.44 +# 20120422.0 hvdw upgrade to 1.5.10 +# 20120427.0 hvdw use gcc 4.6 for x86_64 for openmp compatibility on lion an up +# 20120430.0 hvdw downgrade from 1.5.10 to 1.4.11 as enblend's vigra can't work with 1.5.10 even after patching +# ------------------------------- + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -lz $LDARGS" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" || fail "configure step" + +make clean || fail "make clean step" +make $MAKEARGS || fail "make step" +make install || fail "make install"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libtiff.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libtiff.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/libtiff.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/libtiff.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# ------------------ +# libtiff +# ------------------ +# $Id: libtiff.sh 1902 2007-02-04 22:27:47Z ippei $ +# Copyright (c) 2007, Ippei Ukai + + +# prepare + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100121.0 sg Script updated for 3.9.2 +# 20100624.0 hvdw More robust error checking on compilation +# 20121010.0 hvdw Update to 4.03 +# 20130131.0 hvdw Temporarily back to 3.94 as 4.03 gives weird UINT64 errors +# ------------------------------- + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDFLAGS -stdlib=libc++ -lc++" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-static=no --enable-shared --with-apple-opengl-framework --without-x \ + || fail "configure step for $ARCH" ; + +make clean || fail "make clean step" +make $MAKEARGS || fail "failed at make step of $ARCH"; +make install || fail "make install step of $ARCH"; + + +cd "$REPOSITORYDIR/include" +patch -p1 -N < ../../patches/tiff.h.patch diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/LICENSE.txt hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/LICENSE.txt --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/LICENSE.txt 2016-04-15 20:40:16.000000000 +0000 @@ -0,0 +1,28 @@ +The Mac external library build scripts are distributed under the following +modified BSD license, unless otherwise noted. +-------------------------------------------------------------------------------- + +Copyright (c) 2007-2008, Ippei Ukai +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + * Neither the name of the Hugin Project nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/openexr.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/openexr.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/openexr.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/openexr.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,54 @@ +#!/usr/bin/env bash +# ------------------ +# openexr +# ------------------ +# $Id: openexr.sh 2004 2007-05-11 00:17:50Z ippei $ +# Copyright (c) 2007, Ippei Ukai + + +# prepare + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100624.0 hvdw More robust error checking on compilation +# 201204013.0 hvdw update openexr to 17, e.g. rename script +# 20121010.0 hvdw remove ppc and ppc64 stuff +# ------------------------------- + +$CXX -DHAVE_CONFIG_H -I./IlmImf -I./config \ + -I"$REPOSITORYDIR/include/OpenEXR" -D_THREAD_SAFE \ + -I. -I./config -I"$REPOSITORYDIR/include" \ + -I/usr/include $ARGS \ + -mmacosx-version-min="$DEPLOY_TARGET" -O3 -stdlib=libc++ -lc++ -L"$REPOSITORYDIR/lib" -lHalf \ + -o "./IlmImf/b44ExpLogTable-native" ./IlmImf/b44ExpLogTable.cpp + + if [ -f "./IlmImf/b44ExpLogTable-native" ] ; then + echo "Created b44ExpLogTable-native" + else + echo " Error Failed to create b44ExpLogTable-native" + exit 1 + fi + + if [ -f "./IlmImf/Makefile.in-original" ]; then + echo "original already exists!"; + else + mv "./IlmImf/Makefile.in" "./IlmImf/Makefile.in-original" + fi + sed -e 's/\.\/b44ExpLogTable/\.\/b44ExpLogTable-native/' \ + "./IlmImf/Makefile.in-original" > "./IlmImf/Makefile.in" + + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind -stdlib=libc++ -lc++" \ + NEXT_ROOT="$MACSDKDIR" \ + PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --enable-shared --enable-static=no || fail "configure step "; + +make clean || fail "make clean step" +make $MAKEARGS all || fail "make step"; +make install || fail "make install step"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/pano13.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/pano13.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/pano13.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/pano13.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# ------------------ +# pano13 +# ------------------ +# $Id: pano13.sh 1904 2007-02-05 00:10:54Z ippei $ +# Copyright (c) 2007, Ippei Ukai + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100113.0 sg Script adjusted for libpano13-2.9.15 +# 20100117.0 sg Move code for detecting which version of pano13 to top for visibility +# 20100119.0 sg Support the SVN version of panotools - 2.9.16 +# 201004xx.0 hvdw support 2.9.17 +# 20100624.0 hvdw More robust error checking on compilation +# 20110107.0 hvdw support for 2.9.18 +# 20110427.0 hvdw compile x86_64 with gcc 4.6 for openmp compatibility on lion and up +# 20121010.0 hvdw remove openmp stuff to make it easier to build +# ------------------------------- + + + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + PKGCONFIG="$REPOSITORYDIR/lib" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --without-java \ + --with-zlib=/usr \ + --with-png="$REPOSITORYDIR" \ + --with-jpeg="$REPOSITORYDIR" \ + --with-tiff="$REPOSITORYDIR" \ + --enable-shared --enable-static=no || fail "configure step for $ARCH"; + + +make clean || fail "make clean step" +make $MAKEARGS || fail "make step of $ARCH"; +make install || fail "make install step of $ARCH"; diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/SetEnv.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/SetEnv.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/SetEnv.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/SetEnv.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,60 @@ +#!/usr/bin/env bash +# Configuration for 64-bit build, only possible from Leopard and up +# Copyright (c) 2008, Ippei Ukai +# Somewhere end of 2010 removed the 64bit ppc stuf as Apple doesn;t support it anymore +# April 2012: Remove support for PPC and Tiger. +# November 2012: tune for only 64-bit. This is the simple version without openmp + +########### Adjust these as neccessary: ############################# + + +# The compiler(s) to use +CC="/usr/local/opt/llvm/bin/clang" +CXX="/usr/local/opt/llvm/bin/clang++" + + +# The minimum macOS version required to run the compiled files +# USE AT LEAST VERSION 10.9 +DEPLOY_TARGET="10.9" + + +# The version of your Xcode macOS-SDK. If you use a current Xcode version this is +# will be your macOS version +SDKVERSION=$(sw_vers -productVersion | sed "s:.[[:digit:]]*.$::g") # "10.12" + +##################################################################### +##################################################################### +##################################################################### + + + +# number of jobs that make can use, probably same as the number of CPUs. +if [ "$(uname -p)" = i386 ] || [ "$(uname -p)" = x86_64 ] ; then + PROCESSNUM=$(hostinfo | grep "Processors active:" | sed 's/^.*://' | wc -w | sed 's/[^[:digit:]]//g'); +else + PROCESSNUM="1" +fi + +DIR="$(cd "$(dirname "$BASH_SOURCE")" && pwd)" +REPOSITORYDIR="$(realpath "$DIR/..")/repository" # "..../mac/ExternalPrograms/repository" +mkdir -p "$REPOSITORYDIR" + +fail() +{ + echo + echo "** Failed at $1 **" + exit 1 +} +export -f fail + +export \ + REPOSITORYDIR SDKVERSION DEPLOY_TARGET CC CXX\ + MACSDKDIR="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${SDKVERSION}.sdk" \ + MAKEARGS="--jobs=$PROCESSNUM" \ + OPTIMIZE="-march=core2 -mtune=core2 -ftree-vectorize" \ + ARGS="$OPTIMIZE -mmacosx-version-min=$DEPLOY_TARGET" \ + LDARGS="-mmacosx-version-min=$DEPLOY_TARGET" + +# cmake settings +export CMAKE_INCLUDE_PATH="$REPOSITORYDIR/include" +export CMAKE_LIBRARY_PATH="$REPOSITORYDIR/lib" diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/vigra.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/vigra.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/vigra.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/vigra.sh 2019-01-27 06:59:55.000000000 +0000 @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +env \ + CC="$CC" CXX="$CXX" \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-I$REPOSITORYDIR/include -isysroot $MACSDKDIR" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind -stdlib=libc++ -lc++" \ + cmake -DCMAKE_INSTALL_PREFIX="$REPOSITORYDIR" -DDEPENDENCY_SEARCH_PREFIX="$REPOSITORYDIR" \ + -DCMAKE_OSX_SYSROOT="macosx${SDKVERSION}" -DCMAKE_OSX_DEPLOYMENT_TARGET="$DEPLOY_TARGET" \ + -DWITH_OPENEXR=1 \ + -DFFTW3F_LIBRARY="$REPOSITORYDIR/lib" -DFFTW3F_INCLUDE_DIR="$REPOSITORYDIR/include" . || fail "configure step" + +make $MAKEARGS || fail "make step" +make install || fail "make install step" \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/wxmac.sh hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/wxmac.sh --- hugin-2018.0.0+dfsg/mac/ExternalPrograms/scripts/wxmac.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/ExternalPrograms/scripts/wxmac.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# ------------------ +# wxMac 3.0 +# ------------------ +# $Id: wxmac29.sh 1902 2007-02-04 22:27:47Z ippei $ +# Copyright (c) 2007-2008, Ippei Ukai + +# 2009-12-04.0 Remove unneeded arguments to make and make install; made make single threaded + + +# prepare + +# ------------------------------- +# 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# Works Intel: 10.5, 10.6 & Powerpc 10.4, 10.5 +# 20100624.0 hvdw More robust error checking on compilation +# 20120415.0 hvdw upgrade to 2.8.12 +# 20120526.0 hvdw upgrade to 2.9.3 and rename to wxmac29.sh +# 20121010.0 hvdw upgrade to 2.9.4 +# 20130205.0 hvdw temporarily downgrade to 2.9.3 again +# ------------------------------- + +env \ + CC=clang CXX=clang++ \ + CFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CXXFLAGS="-isysroot $MACSDKDIR $ARGS -O3" \ + CPPFLAGS="-isysroot $MACSDKDIR -I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS -prebind -stdlib=libc++" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --with-macosx-sdk="$MACSDKDIR" --with-macosx-version-min="$DEPLOY_TARGET" \ + --enable-monolithic --enable-unicode --with-opengl --disable-graphics_ctx \ + --with-libjpeg --with-libtiff --with-libpng --with-zlib \ + --with-cocoa --without-sdl --disable-sdltest --disable-mediactrl \ + --enable-shared --disable-debug --enable-aui || fail "configure step"; + +mkdir build && cd build + +make clean || fail "make clean step" + +make $MAKEARGS || fail "make step"; +make install || fail "make install step"; \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/mac/PackageCreateToolsLibs.sh hugin-2019.0.0+dfsg/mac/PackageCreateToolsLibs.sh --- hugin-2018.0.0+dfsg/mac/PackageCreateToolsLibs.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/PackageCreateToolsLibs.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +rm -r $1 2> /dev/null +mkdir -p $1 || exit 1 +cd $1 || exit 1 + +#ignore first arg +shift + +# iterate +while test ${#} -gt 0 +do + if [[ ${1} == :* ]]; then + ln -sf "../PTBatcherGUI.app/Contents/MacOS/${1:1}" "." + else + ln -sf "../Hugin.app/Contents/MacOS/${1}" "." + fi + shift +done + diff -Nru hugin-2018.0.0+dfsg/mac/PackageMacAppBundleLibs.sh hugin-2019.0.0+dfsg/mac/PackageMacAppBundleLibs.sh --- hugin-2018.0.0+dfsg/mac/PackageMacAppBundleLibs.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/mac/PackageMacAppBundleLibs.sh 2017-05-14 06:09:13.000000000 +0000 @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +# This script attempts to copy needed 3rd party libraries into the application +# bundle. It will set the 'install_name' for each library so that it references +# Library 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 (already taken care of if using the ones built in ExternalPrograms). + +BASE_DIR="$2" +cd ${BASE_DIR} + +CMAKE_SOURCE_DIR="$3" + +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" +RPATH_LIBRARY_PATH="@executable_path/../Libraries" + + +echo "*-----------------------------------------------------------*" +echo "* Copying Support Libraries for ${APPLICATION_APP_BUNDLE}" +echo "* Located in ${BASE_DIR}" + +mkdir -p "${PLUGINS_PATH}" + +get_libraries() { + local LIBRARIES=$(echo $(otool -L $1 | grep -v ${RPATH_LIBRARY_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 +} + +resolve_symlink(){ + local lib=$1 + while [ -L "${lib}" ]; do + lib="$(dirname ${lib})/$(readlink ${lib})" + done + echo "${lib}" +} + +update_library() { + local lib="$1" + local bin="$2" + + local real_lib=$(resolve_symlink ${lib}) + local real_lib_file=$(basename ${real_lib}) + if [ ! -f "${BASE_DIR}/${PLUGINS_PATH}/${real_lib_file}" ]; then + echo "* Installing Library -->$1<-- into ${APPLICATION_APP_BUNDLE} " + cp "${real_lib}" "${BASE_DIR}/${PLUGINS_PATH}" || exit 1 + install_name_tool -id "${RPATH_LIBRARY_PATH}/${real_lib_file}" "${BASE_DIR}/${PLUGINS_PATH}/${real_lib_file}" + chmod 755 "${BASE_DIR}/${PLUGINS_PATH}/${real_lib_file}" + get_libraries "${BASE_DIR}/${PLUGINS_PATH}/${real_lib_file}" + fi + install_name_tool -change "${lib}" "${RPATH_LIBRARY_PATH}/${real_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-2018.0.0+dfsg/platforms/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/CMakeLists.txt 2018-02-03 13:24:40.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/CMakeLists.txt 2014-03-19 18:33:21.000000000 +0000 @@ -0,0 +1,9 @@ + +IF(WIN32) + ADD_SUBDIRECTORY(windows) +ENDIF() + +IF(UNIX) + ADD_SUBDIRECTORY(linux) +ENDIF() + diff -Nru hugin-2018.0.0+dfsg/platforms/linux/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/linux/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/linux/CMakeLists.txt 2014-03-19 18:33:21.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/linux/CMakeLists.txt 2019-01-05 08:42:14.000000000 +0000 @@ -1,2 +1,3 @@ ADD_SUBDIRECTORY(appdata) +ADD_SUBDIRECTORY(icons) diff -Nru hugin-2018.0.0+dfsg/platforms/linux/icons/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/linux/icons/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/linux/icons/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/linux/icons/CMakeLists.txt 2019-01-05 08:47:23.000000000 +0000 @@ -0,0 +1,15 @@ +# install icon files in different sizes +INSTALL(FILES hugin_16.png DESTINATION ${DATADIR}/icons/hicolor/16x16/apps RENAME hugin.png) +INSTALL(FILES hugin_32.png DESTINATION ${DATADIR}/icons/hicolor/32x32/apps RENAME hugin.png) +INSTALL(FILES hugin_48.png DESTINATION ${DATADIR}/icons/hicolor/48x48/apps RENAME hugin.png) +INSTALL(FILES hugin_128.png DESTINATION ${DATADIR}/icons/hicolor/128x128/apps RENAME hugin.png) +INSTALL(FILES hugin_256.png DESTINATION ${DATADIR}/icons/hicolor/256x256/apps RENAME hugin.png) + +INSTALL(FILES ptbatcher_16.png DESTINATION ${DATADIR}/icons/hicolor/16x16/apps RENAME ptbatcher.png) +INSTALL(FILES ptbatcher_32.png DESTINATION ${DATADIR}/icons/hicolor/32x32/apps RENAME ptbatcher.png) +INSTALL(FILES ptbatcher_48.png DESTINATION ${DATADIR}/icons/hicolor/48x48/apps RENAME ptbatcher.png) +INSTALL(FILES ptbatcher_128.png DESTINATION ${DATADIR}/icons/hicolor/128x128/apps RENAME ptbatcher.png) +INSTALL(FILES ptbatcher_256.png DESTINATION ${DATADIR}/icons/hicolor/256x256/apps RENAME ptbatcher.png) + +#finally also svg version +INSTALL(FILES hugin.svg ptbatcher.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps) Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/hugin_128.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/hugin_128.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/hugin_16.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/hugin_16.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/hugin_256.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/hugin_256.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/hugin_32.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/hugin_32.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/hugin_48.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/hugin_48.png differ diff -Nru hugin-2018.0.0+dfsg/platforms/linux/icons/hugin.svg hugin-2019.0.0+dfsg/platforms/linux/icons/hugin.svg --- hugin-2018.0.0+dfsg/platforms/linux/icons/hugin.svg 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/linux/icons/hugin.svg 2019-01-05 08:43:17.000000000 +0000 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher_128.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher_128.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher_16.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher_16.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher_256.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher_256.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher_32.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher_32.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher_48.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher_48.png differ diff -Nru hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher.svg hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher.svg --- hugin-2018.0.0+dfsg/platforms/linux/icons/ptbatcher.svg 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/linux/icons/ptbatcher.svg 2019-01-05 08:43:37.000000000 +0000 @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru hugin-2018.0.0+dfsg/platforms/mac/autopano/apsc_plugin-Info.plist hugin-2019.0.0+dfsg/platforms/mac/autopano/apsc_plugin-Info.plist --- hugin-2018.0.0+dfsg/platforms/mac/autopano/apsc_plugin-Info.plist 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/autopano/apsc_plugin-Info.plist 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + autopano-sift-c + CFBundleIdentifier + net.sourceforge.hugin.autopano-sift-C.APSCpp + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Autopano-SIFT-C + CFBundlePackageType + BNDL + CFBundleShortVersionString + 2.5 + CFBundleSignature + Hgin + HginAutoCPArgs + --ransac on --maxmatches %p %o %s + + diff -Nru hugin-2018.0.0+dfsg/platforms/mac/autopano/autopano-complete-mac.sh hugin-2019.0.0+dfsg/platforms/mac/autopano/autopano-complete-mac.sh --- hugin-2018.0.0+dfsg/platforms/mac/autopano/autopano-complete-mac.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/autopano/autopano-complete-mac.sh 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,168 @@ +#!/bin/bash +# Time-stamp: <2005-07-24 22:05:26 oliver> +# by Pablo d'Angelo +# modified by Ippei UKAI for HuginOSX +# Oliver Beckstein 2005-07-24 +# - dirty hack to handle filenames with spaces +# (better: reimplement in perl/python) + + +set -e + +myexit() +{ + sleep 10 + exit 1 +} + +# dirty hack to protect whitespace in filenames +# replace temporarily with ' ' -> '__SPACE__' +# (the same trick is later used to get quotes where they are supposed to be) +_SPACE='__SPACE__'; +_QUOTE='__QUOTE__'; + +function protect_space () { + local a="${1}" + echo "${a}" | sed -e "s| |${_SPACE}|g"; +} + +function unprotect_space () { + local a="${1}" + echo "${a}" | sed -e "s|${_SPACE}| |g"; +} + + +MONO=$(which mono) +if [ "$MONO" = "" -o ! -x "$MONO" ] +then + echo "Error: Mono not found" + echo "You need to install Mono the .Net environment to use autopano-sift." + myexit +fi + +# Set this to the directory you installed autopano-sift into, for example +#AUTOPANO_PATH="/usr/local/lib/autopano-sift/bin" + +# Do not use a trailing backslash. If the executebles are within your path +# (recommended, you can leave the line below). +#AUTOPANO_PATH=$(dirname $(which generatekeys-sd.exe)) +AUTOPANO_PATH=`dirname "$0"`/autopano-sift + +usage() +{ + echo "usage: autopano-complete.sh [options] -o panoproject.pto image1 image2 [...]" + echo + echo " -o name filename of created panorama project" + echo + echo "[options]:" +# echo " -a path specifies path to the directory where" +# echo " autopano.exe and generatekeys-sd.exe are." + echo " -s number downsize images until width and height is" + echo " smaller than number, default 700" + echo " -p number number of generated control points between," + echo " each pair, default: 10" + echo " -n no ransac detection, useful for fisheye images" + echo " -c do not reuse keypoints detected in earlier runs," + echo " deletes old keypoint files." + myexit +} + +echo `basename "$0"` "$@" +echo "AUTOPANO_PATH = \"$AUTOPANO_PATH\"" + +#NARG=$# +#if [ $NARG -lt 2 ]; then +# usage +# exit 1 +#fi + + +# dirty hack to protect space in filenames +protected_args=""; +for a in "$@"; do + a=`protect_space "${a}"`; + protected_args="${protected_args} ${a}"; +done + +set -- ${protected_args} + +#args=`getopt o:a:s:p:nch $*` +args=`getopt o:s:p:nch $*` +set -- $args + +if [ $? != 0 ] ; then echo "Error! (parsing arguments failed)"; echo "Terminating..." >&2 ; myexit; fi + + +POINTS=10; +RANSAC=1; +CLEAN=0; +SIZE=800; + +while true ; do + case "$1" in + -o) PANOFILE="`unprotect_space $2`"; shift 2;; +# -a) AUTOPANO_PATH=$2; shift 2;; + -s) SIZE=$2; shift 2;; + -p) POINTS=$2; shift 2 ;; + -n) RANSAC=0; shift 1;; + -c) CLEAN=1; shift 1;; + -h) usage; shift 1;; + --) shift ; break ;; + *) echo "Command line parsing error at: $1" ; myexit ;; + esac +done + +echo "Remaining arguments ($#):" +for arg do echo '--> '"\`$arg'" ; done + +# Allow user to override temporary directory. +TMP=${TMPDIR:-/tmp} + +if [ ! -f "$AUTOPANO_PATH/generatekeys-sd.exe" ] +then echo error "Cannot locate generatekeys-sd.exe in $AUTOPANO_PATH"; myexit; fi +if [ ! -f "$AUTOPANO_PATH/autopano.exe" ] +then echo error "Cannot locate autopano.exe in $AUTOPANO_PATH"; myexit; fi + +# DEBUGGING: set -x +# bring back space only when filename complete +# (bash quoting sucks---rewrite in perl or whatever) +KEYFILES="" +for arg do + FILENAME="$(basename $arg).key.gz" + # keep space-protected filenames in KEYFILES + # (unprotect only when needed at end): + KEYFILES="$KEYFILES $FILENAME" + # unprotect filenames which are needed NOW: + FILENAME="`unprotect_space ${FILENAME}`" + arg="`unprotect_space ${arg}`" + if [ -f "$FILENAME" ]; then + if [ $CLEAN -ne 0 ]; then + echo "$MONO \"$AUTOPANO_PATH/generatekeys-sd.exe\" \"$arg\" \"$FILENAME\" $SIZE" + $MONO "$AUTOPANO_PATH/generatekeys-sd.exe" "$arg" "$FILENAME" $SIZE + else + echo "Using previously generated keypoint file: $FILENAME" + fi + else + echo "$MONO \"$AUTOPANO_PATH/generatekeys-sd.exe\" \"$arg\" \"$FILENAME\" $SIZE" + $MONO "$AUTOPANO_PATH/generatekeys-sd.exe" "$arg" "$FILENAME" $SIZE + fi +done + +echo "keyfiles (space protected): $KEYFILES" +ARG="--ransac $RANSAC --maxmatches $POINTS"; +echo "$MONO \"$AUTOPANO_PATH/autopano.exe\" $ARG \"$PANOFILE\" $KEYFILES" + +# splice in KEYFILES with spaces +cmd="$MONO \"$AUTOPANO_PATH/autopano.exe\" $ARG \"$PANOFILE\"" +keys="" +# use __QUOTE__ and __SPACE__ to build final commandline +for k in ${KEYFILES}; do + keys="${keys} ${_QUOTE}${k}${_QUOTE}" +done; +cmd=`echo "${cmd} ${keys}" | sed -e "s|${_QUOTE}|\"|g" -e "s|${_SPACE}| |g"` +echo "Final command: '${cmd}" +sleep 3; + +eval "${cmd}" + +sleep 3; diff -Nru hugin-2018.0.0+dfsg/platforms/mac/autopano/matchpoint-complete-mac.sh hugin-2019.0.0+dfsg/platforms/mac/autopano/matchpoint-complete-mac.sh --- hugin-2018.0.0+dfsg/platforms/mac/autopano/matchpoint-complete-mac.sh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/autopano/matchpoint-complete-mac.sh 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,160 @@ +#!/bin/bash +# Time-stamp: <2005-07-24 22:05:26 oliver> +# by Pablo d'Angelo +# modified by Ippei UKAI for HuginOSX +# Oliver Beckstein 2005-07-24 +# - dirty hack to handle filenames with spaces +# (better: reimplement in perl/python) +# Adapted for matchpoint by Harry van der Wolf (hvdwolf@gmail.com) + + +set -e + +myexit() +{ + sleep 10 + exit 1 +} + +# dirty hack to protect whitespace in filenames +# replace temporarily with ' ' -> '__SPACE__' +# (the same trick is later used to get quotes where they are supposed to be) +_SPACE='__SPACE__'; +_QUOTE='__QUOTE__'; + +function protect_space () { + local a="${1}" + echo "${a}" | sed -e "s| |${_SPACE}|g"; +} + +function unprotect_space () { + local a="${1}" + echo "${a}" | sed -e "s|${_SPACE}| |g"; +} + + +# Set this to the directory you installed autopano-sift into, for example +#AUTOPANO_PATH="/usr/local/lib/autopano-sift/bin" + +# Do not use a trailing backslash. If the executebles are within your path +# (recommended, you can leave the line below). +AUTOPANO_PATH="`dirname \"$0\"`" + +usage() +{ + echo "usage: matchpoint-complete.sh [options] -o panoproject.pto image1 image2 [...]" + echo + echo " -o name filename of created panorama project" + echo + echo "[options]:" +# echo " -a path specifies path to the directory where" +# echo " autopano and matchpoint are." + echo " -s number downsize images until width and height is" + echo " smaller than number, default 700" + echo " -p number number of generated control points between," + echo " each pair, default: 10" + echo " -n no ransac detection, useful for fisheye images" + echo " -c do not reuse keypoints detected in earlier runs," + echo " deletes old keypoint files." + myexit +} + +echo `basename "$0"` "$@" +echo "AUTOPANO_PATH = \"$AUTOPANO_PATH\"" + +#NARG=$# +#if [ $NARG -lt 2 ]; then +# usage +# exit 1 +#fi + + +# dirty hack to protect space in filenames +protected_args=""; +for a in "$@"; do + a=`protect_space "${a}"`; + protected_args="${protected_args} ${a}"; +done + +set -- ${protected_args} + +#args=`getopt o:a:s:p:nch $*` +args=`getopt o:s:p:nch $*` +set -- $args + +if [ $? != 0 ] ; then echo "Error! (parsing arguments failed)"; echo "Terminating..." >&2 ; myexit; fi + + +POINTS=10; +RANSAC=1; +CLEAN=0; +SIZE=800; + +while true ; do + case "$1" in + -o) PANOFILE="`unprotect_space $2`"; shift 2;; +# -a) AUTOPANO_PATH=$2; shift 2;; + -s) SIZE=$2; shift 2;; + -p) POINTS=$2; shift 2 ;; + -n) RANSAC=0; shift 1;; + -c) CLEAN=1; shift 1;; + -h) usage; shift 1;; + --) shift ; break ;; + *) echo "Command line parsing error at: $1" ; myexit ;; + esac +done + +echo "Remaining arguments ($#):" +for arg do echo '--> '"\`$arg'" ; done + +# Allow user to override temporary directory. +TMP=${TMPDIR:-/tmp} + +if [ ! -f "$AUTOPANO_PATH/matchpoint" ] +then echo error "Cannot locate matchpoint in $AUTOPANO_PATH"; myexit; fi +if [ ! -f "$AUTOPANO_PATH/autopano" ] +then echo error "Cannot locate autopano in $AUTOPANO_PATH"; myexit; fi + +# DEBUGGING: set -x +# bring back space only when filename complete +# (bash quoting sucks---rewrite in perl or whatever) +KEYFILES="" +for arg do + FILENAME="$(basename $arg).key.gz" + # keep space-protected filenames in KEYFILES + # (unprotect only when needed at end): + KEYFILES="$KEYFILES $FILENAME" + # unprotect filenames which are needed NOW: + FILENAME="`unprotect_space ${FILENAME}`" + arg="`unprotect_space ${arg}`" + if [ -f "$FILENAME" ]; then + if [ $CLEAN -ne 0 ]; then + echo "\"$AUTOPANO_PATH/matchpoint\" \"$arg\" \"$FILENAME\"" + "$AUTOPANO_PATH/matchpoint" "$arg" "$FILENAME" + else + echo "Using previously generated keypoint file: $FILENAME" + fi + else + echo "\"$AUTOPANO_PATH/matchpoint\" \"$arg\" \"$FILENAME\"" + "$AUTOPANO_PATH/matchpoint" "$arg" "$FILENAME" + fi +done + +echo "keyfiles (space protected): $KEYFILES" +ARG="--ransac $RANSAC --maxmatches $POINTS"; +echo "\"$AUTOPANO_PATH/autopano\" $ARG \"$PANOFILE\" $KEYFILES" + +# splice in KEYFILES with spaces +cmd="\"$AUTOPANO_PATH/autopano\" $ARG \"$PANOFILE\"" +keys="" +# use __QUOTE__ and __SPACE__ to build final commandline +for k in ${KEYFILES}; do + keys="${keys} ${_QUOTE}${k}${_QUOTE}" +done; +cmd=`echo "${cmd} ${keys}" | sed -e "s|${_QUOTE}|\"|g" -e "s|${_SPACE}| |g"` +echo "Final command: '${cmd}" +sleep 3; + +eval "${cmd}" + +sleep 3; Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/mac/autopano/PutAutoCPtoApplicationSupport.applescript and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/mac/autopano/PutAutoCPtoApplicationSupport.applescript differ diff -Nru hugin-2018.0.0+dfsg/platforms/mac/autopano/PutAutopanoSiftToHugin.applescript hugin-2019.0.0+dfsg/platforms/mac/autopano/PutAutopanoSiftToHugin.applescript --- hugin-2018.0.0+dfsg/platforms/mac/autopano/PutAutopanoSiftToHugin.applescript 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/autopano/PutAutopanoSiftToHugin.applescript 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,29 @@ +display alert "Do you know what you are doing?" message + "Please read the readme and license files carefully before use. You'd better know what you are doing before you proceed." buttons {"Quit", "OK"} cancel button 1 as warning + +tell application "Finder" + copy "" to autopanoDirPath + repeat while autopanoDirPath is equal to "" + copy (choose folder with prompt "Where is autopano-sift bin folder?" without invisibles) to autopanoDirPath + if (not (exists file "autopano.exe" of folder autopanoDirPath)) + or (not (exists file "generatekeys-sd.exe" of folder autopanoDirPath)) + or (not (exists file "libsift.dll" of folder autopanoDirPath)) then + copy "" to autopanoDirPath + display alert "Error: autopano-sift file names do not match" as warning + end if + end repeat + copy "" to huginPath + repeat while huginPath is equal to "" + copy (choose file of type {"APPL"} with prompt "Where is Hugin.app?" without invisibles) to huginPath + if the name of file huginPath is not equal to "Hugin.app" then + copy "" to huginPath + display alert "Error: Hugin.app file name do not match" as warning + end if + end repeat + if exists folder "autopano-sift" of folder "Contents:Resources:" of file huginPath then delete folder "autopano-sift" of folder "Contents:Resources:" of file huginPath + + copy (make new folder with properties {name:"autopano-sift"} at folder "Contents:Resources:" of file huginPath) to autopanoSiftFolder + duplicate file "autopano.exe" of folder autopanoDirPath to autopanoSiftFolder + duplicate file "generatekeys-sd.exe" of folder autopanoDirPath to autopanoSiftFolder + duplicate file "libsift.dll" of folder autopanoDirPath to autopanoSiftFolder +end tell \ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/mac/droplets/apps/Align_Enfuse_droplet.app and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/mac/droplets/apps/Align_Enfuse_droplet.app differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/mac/droplets/apps/Auto_Align_Enfuse_droplet.app and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/mac/droplets/apps/Auto_Align_Enfuse_droplet.app differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/mac/droplets/apps/Auto_Enfuse_droplet.app and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/mac/droplets/apps/Auto_Enfuse_droplet.app differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/mac/droplets/apps/Enfuse_droplet.app and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/mac/droplets/apps/Enfuse_droplet.app differ diff -Nru hugin-2018.0.0+dfsg/platforms/mac/droplets/apps/_README.txt hugin-2019.0.0+dfsg/platforms/mac/droplets/apps/_README.txt --- hugin-2018.0.0+dfsg/platforms/mac/droplets/apps/_README.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/droplets/apps/_README.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,8 @@ +The "BP Progress Bar.app" is a stand-alone application and can be used to display either +a "progress bar" or a "barber pole" waiting screen. The "BP Progress Bar.app" is a free +open source applescript application by Bruce Phillips. +You can download it from http://scriptbuilders.net/files/bpprogressbar1.0.html. + + +The "*droplet.apps" are NOT stand-alone programs. They need enfuse, align_image_stack and the "BP Progress Bar.app" to reside in the same directory. + diff -Nru hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Align_Enfuse_droplet.applescript hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Align_Enfuse_droplet.applescript --- hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Align_Enfuse_droplet.applescript 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Align_Enfuse_droplet.applescript 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,274 @@ +---------------------------------------------------------------- +---------------------------------------------------------------- +-- Enfuse droplet applescript 0.0.2 +-- Harry van der wolf 15 Mar 2008 +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_ABOUT() + display dialog "Enfuse droplet 0.0.2 by Harry van der Wolf" & return & return & + "This (G)UI wrapper uses enfuse and align_image_stack " & + "to fuse your set of images with different exposure " & + "settings to one fused image." & return & return & + "You can use this GUI either by starting it " & + "manually and then select your images" & + return & return & "OR" & return & return & + "drag and drop your images onto this little application." buttons {"Ok"} + +end FUNC_ABOUT +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_AIS_PARAM() + display dialog "align_image_stack parameters" & return & return & + "# default parameters already set by this script:" & return & + "-p file, output .pto => set to pano.pto" & return & + "-a prefix align images => set to fused" & return & return & + "# other parameters (to be set by you):" & return & + "-e assume input images are full frame fish eye (default: rectilinear)" & return & + "-t num Remove all control points with an error higher than num pixels (default: 3)" & return & + "-f HFOV approximate horizontal field of view of input images, use if EXIF info not complete" & return & + "-m Optimize field of view for all images, except for first. Useful for aligning focus stacks with slightly different magnification." & return & + "-c num number of control points (per grid) to create between adjacent images (default: 8)" & return & + "-l Assume linear input files" & return & + "-s scale Scale down image by 2^scale (default: 1 [2x downsampling])" & return & + "-g gsize Break image into a rectangular grid (gsize x gsize) and attempt to find + num control points in each section (default: 5 [5x5 grid] )" & return & return + buttons {"Ok"} + +end FUNC_AIS_PARAM +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_ENF_PARAM() + display dialog "==== enfuse, version 3.1 ====" & return & + "Common options:" & return & + " -l number Number of levels to use (1 to 29)" & return & + " -o filename Write output to file" & return & + "-w Blend across -180/+180 boundary" & return & + "--compression=COMP Set compression of the output image." & return & + "Valid values for compression are:" & return & + "For TIFF files: LZW, DEFLATE" & return & + "For JPEG files: 0-100" & return & return & + "Extended options:" & return & + "-b kilobytes Image cache block size (default=2MiB)" & return & + "-c Use CIECAM02 to blend colors" & return & + "-g Associated alpha hack for Gimp (ver. < 2) and Cinepaint" & return & + "-f WIDTHxHEIGHT+x0+y0 Manually set the size and position of the output image." & return & + "Useful for cropped and shifted input TIFF images," & + "such as those produced by Nona." & + "-m megabytes Use this much memory before going to disk (default=1GiB)" & return & return & + "Fusion options:" & return & + "--wExposure=W Weight given to well-exposed pixels (from 0 to 1)." & return & + "default value: 1.0" & return & + "--wSaturation=W Weight given to highly-saturated pixels (from 0 to 1)." & return & + "default value: 0.2" & return & + "--wContrast=W Weight given to high-contrast pixels (from 0 to 1)." & return & + "default value: 0" & return & + "--HardMask Force hard blend masks (no averaging) on finest" & + "scale. This is especially useful for focus" & + "stacks with thin and high contrast features such" & + "as insect hairs etc, but will lead to increased noise." & return & return & + "Expert options:" & return & + "--ContrastWindowSize=s Window size for local contrast analysis." & return & + "Default: 5, (must be bigger than 3)." & return + buttons {"Ok"} +end FUNC_ENF_PARAM +---------------------------------------------------------------- +on FUNC_Initialize_BP_PGB(titlebarmsg, topmsg, bottommsg) + tell application "BP Progress Bar" + launch + set title of window 1 to titlebarmsg + activate + show window 1 + tell window 1 of application "BP Progress Bar" + tell progress indicator 1 + set indeterminate to true + start + end tell + end tell + tell window 1 of application "BP Progress Bar" to tell text field 1 to set content to topmsg + tell window 1 of application "BP Progress Bar" to tell text field 2 to set content to bottommsg + end tell +end FUNC_Initialize_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_quit_BP_PGB() + tell application "BP Progress Bar" to quit +end FUNC_quit_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +-- function enfuse +on FUNC_ENFUSE(dropped_on, ImageList) + + + -- set enfuse_additional_parameters to "--wExposure=1 --wSaturation=1 --wContrast=1" + set enfuse_additional_parameters to "" + ---- start images selection if dropped_on is false + if not dropped_on then + set ImageList to "" + set theImages to + choose file with prompt + "Select the image files of your choice" default location (path to pictures folder) + of type {"JPEG", "TIFF", "PNG"} with multiple selections allowed without invisibles + repeat with OneImage in theImages + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of OneImage + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + ---- end of images selection + end if + + -- Find the working dir of the program, otherwise it will default to $HOME where ais and enfuse are not available + tell application "Finder" to get folder of (path to me) as Unicode text + set workingDir to POSIX path of result + + ---- start of requesting align_image_stack parameters + set align_image_stack_parameters to "" + set get_going to "NOK" + repeat while get_going is "NOK" + display dialog "align_image_stack parameters" & return & return & + "# default parameters set by this script:" & return & + "-p file, output .pto => set to pano.pto" & return & + "-a prefix align images => set to fused" & return & return & + "# Other parameters can be set by you:" & return & + "(Click Show Parameters to show possibilities)" & return & return & + "Enter your additional parameters below. " default answer align_image_stack_parameters + buttons {"Show Parameters", "Quit", "Ok"} default button "Ok" + set dialogResult to result + set align_image_stack_parameters to text returned of dialogResult + set choice to button returned of dialogResult + if choice = "Show Parameters" then FUNC_AIS_PARAM() + if choice = "Quit" then return -- exit script immediately + if choice = "Ok" then set get_going to "OK" + end repeat + --- end of requesting align_image_stack parameters + + -- delete possible previous fused intermediate images (normally overwritten + -- when there are more images from a previous run than need to be calculated, you get strange images + --tell application "Finder" + try -- use try to not display (error) dialog on non existing files + do shell script "rm " & workingDir & "fused*.tif" + end try + --end tell + + + ---- kick off align_image_stack and set barber pole + FUNC_Initialize_BP_PGB("Running align_image_stack", "Align_image_stack is aligning your images", "This will take some time. Please wait....") + do shell script "cd " & workingDir & "; " & workingDir & "align_image_stack" & " -a fused " & align_image_stack_parameters & " " & ImageList + FUNC_quit_BP_PGB() + ---- align_image_stack finished. stop barber pole + + ---- start of requesting enfuse parameters + set get_going to "NOK" + repeat while get_going is "NOK" + display dialog "Enfuse additional parameters" & return & return & + "Here you can specify your parameters." & return & + "(Click Show Parameters to show possibilities)" & return & return + default answer enfuse_additional_parameters buttons {"Show Parameters", "Quit", "Ok"} default button "Ok" + set dialogResult to result + set enfuse_additional_parameters to text returned of dialogResult + set choice to button returned of dialogResult + if choice = "Show Parameters" then FUNC_ENF_PARAM() + if choice = "Quit" then return -- exit script immediately + if choice = "Ok" then set get_going to "OK" + end repeat + --- end of requesting enfuse parameters + + ----Ask filename of fused image and where it should be stored + set NewImgName to (choose file name with prompt "Specify the filename of your new fused image" default location (path to pictures folder)) + set NewImage to quoted form of POSIX path of NewImgName + set testname to POSIX path of NewImgName + -- file extensions are not treated case-sensitive within applescript + if (testname as text) ends with ".TIF" or (testname as text) ends with ".JPG" or (testname as text) ends with ".TIFF" or (testname as text) ends with ".JPEG" then + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + else + -- No image extension, so make it a tif + set testname to testname & ".tif" + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + end if + ---- kick off enfuse and set barber pole + FUNC_Initialize_BP_PGB("Running enfuse", "enfuse is merging your images", "This will take some time. Please wait....") + do shell script "cd " & workingDir & "; " & workingDir & "enfuse " & enfuse_additional_parameters & " -o " & NewImage & " " & workingDir & "fused*.tif" + FUNC_quit_BP_PGB() + ---- enfuse finished. stop barber pole + + ---- Show fused image to the public + -- Stupid preview application is not scriptable so we need to shell out. + -- Next to that there is another stupidity: It's called Preview.app on Tiger and preview.app on Leopard. + do shell script "open /Applications/Preview.app " & NewImage + do shell script "open /Applications/preview.app " & NewImage + +end FUNC_ENFUSE +-- end of function enfuse +---------------------------------------------------------------- +---------------------------------------------------------------- + + +-- Main part of script +-- Here does it all start +-- Define some (initial) variables/properties +global ImageList +set ImageList to "" + +-- "open" handler triggered by drag'n'drop launch. +-- This parts starts when a user drops files on it +on open of finderObjects + global HUGIN_PATH + --set HUGIN_PATH to "/Applications/Hugin.app" + set HUGIN_PATH to "" + set ImageList to "" + repeat with OneImage in (finderObjects) -- in case multiple objects dropped on applet + --set pipo to quoted form of POSIX path of i as text + --display dialog pipo -- show file/folder's info + if folder of (info for OneImage) is true then -- process folder's contents too + repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of NewImgName + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + end if + -- repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + -- end repeat + end repeat + -- run function enfuse + set dropped_on to true + FUNC_ENFUSE(dropped_on, ImageList) +end open +-- end of drag'n'drop launch + +-- This is the part that starts when user opens application by double-clicking it + +set ImageList to "" +-- ask user what he/she wants +set quit_app to false +repeat until quit_app is true + display dialog "Click Enfuse to get going!" buttons {"about", "quit", "Enfuse"} default button "Enfuse" + set choice to button returned of result + if choice = "Enfuse" then + set dropped_on to false + FUNC_ENFUSE(dropped_on, ImageList) + else if choice = "about" then + FUNC_ABOUT() + else + return --user has chosen quit so quit script + end if +end repeat +end run \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Align_Enfuse_droplet.applescript hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Align_Enfuse_droplet.applescript --- hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Align_Enfuse_droplet.applescript 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Align_Enfuse_droplet.applescript 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,182 @@ +---------------------------------------------------------------- +---------------------------------------------------------------- +-- Enfuse droplet applescript 0.0.3 +-- Harry van der wolf 29 Apr 2008 +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_ABOUT() + display dialog "Enfuse droplet 0.0.2 by Harry van der Wolf" & return & return & + "This (G)UI wrapper uses enfuse and align_image_stack " & + "to fuse your set of images with different exposure " & + "settings to one fused image." & return & return & + "You can use this GUI either by starting it " & + "manually and then select your images" & + return & return & "OR" & return & return & + "drag and drop your images onto this little application." buttons {"Ok"} + +end FUNC_ABOUT +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_Initialize_BP_PGB(titlebarmsg, topmsg, bottommsg) + tell application "BP Progress Bar" + launch + set title of window 1 to titlebarmsg + activate + show window 1 + tell window 1 of application "BP Progress Bar" + tell progress indicator 1 + set indeterminate to true + start + end tell + end tell + tell window 1 of application "BP Progress Bar" to tell text field 1 to set content to topmsg + tell window 1 of application "BP Progress Bar" to tell text field 2 to set content to bottommsg + end tell +end FUNC_Initialize_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_quit_BP_PGB() + tell application "BP Progress Bar" to quit +end FUNC_quit_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +-- function enfuse +on FUNC_ENFUSE(dropped_on, ImageList) + + + -- set enfuse_additional_parameters to "--wExposure=1 --wSaturation=1 --wContrast=1" + set enfuse_additional_parameters to "" + ---- start images selection if dropped_on is false + if not dropped_on then + set ImageList to "" + set theImages to + choose file with prompt + "Select the image files of your choice" default location (path to pictures folder) + of type {"JPEG", "TIFF", "PNG"} with multiple selections allowed without invisibles + repeat with OneImage in theImages + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of OneImage + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + ---- end of images selection + end if + + -- Find the working dir of the program, otherwise it will default to $HOME where ais and enfuse are not available + tell application "Finder" to get folder of (path to me) as Unicode text + set workingDir to POSIX path of result + + -- delete possible previous fused intermediate images (normally overwritten + -- when there are more images from a previous run than need to be calculated, you get strange images + --tell application "Finder" + try -- use try to not display (error) dialog on non existing files + do shell script "rm " & workingDir & "fused*.tif" + end try + --end tell + + + ---- kick off align_image_stack and set barber pole + FUNC_Initialize_BP_PGB("Running align_image_stack", "Align_image_stack is aligning your images", "This will take some time. Please wait....") + do shell script "cd " & workingDir & "; " & workingDir & "align_image_stack" & " -a fused " & " " & ImageList + FUNC_quit_BP_PGB() + ---- align_image_stack finished. stop barber pole + + ----Ask filename of fused image and where it should be stored + set NewImgName to (choose file name with prompt "Specify the filename of your new fused image" default location (path to pictures folder)) + set NewImage to quoted form of POSIX path of NewImgName + set testname to POSIX path of NewImgName + -- file extensions are not treated case-sensitive within applescript + if (testname as text) ends with ".TIF" or (testname as text) ends with ".JPG" or (testname as text) ends with ".TIFF" or (testname as text) ends with ".JPEG" then + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + else + -- No image extension, so make it a tif + set testname to testname & ".tif" + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + end if + ---- kick off enfuse and set barber pole + FUNC_Initialize_BP_PGB("Running enfuse", "enfuse is merging your images", "This will take some time. Please wait....") + do shell script "cd " & workingDir & "; " & workingDir & "enfuse " & " -o " & NewImage & " " & workingDir & "fused*.tif" + FUNC_quit_BP_PGB() + ---- enfuse finished. stop barber pole + + ---- Show fused image to the public + -- Stupid preview application is not scriptable so we need to shell out. + -- Next to that there is another stupidity: It's called Preview.app on Tiger and preview.app on Leopard. + do shell script "open /Applications/Preview.app " & NewImage + do shell script "open /Applications/preview.app " & NewImage + +end FUNC_ENFUSE +-- end of function enfuse +---------------------------------------------------------------- +---------------------------------------------------------------- + + +-- Main part of script +-- Here does it all start +-- Define some (initial) variables/properties +global ImageList +set ImageList to "" + +-- "open" handler triggered by drag'n'drop launch. +-- This parts starts when a user drops files on it +on open of finderObjects + global HUGIN_PATH + --set HUGIN_PATH to "/Applications/Hugin.app" + set HUGIN_PATH to "" + set ImageList to "" + repeat with OneImage in (finderObjects) -- in case multiple objects dropped on applet + --set pipo to quoted form of POSIX path of i as text + --display dialog pipo -- show file/folder's info + if folder of (info for OneImage) is true then -- process folder's contents too + repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of NewImgName + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + end if + -- repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + -- end repeat + end repeat + -- run function enfuse + set dropped_on to true + FUNC_ENFUSE(dropped_on, ImageList) +end open +-- end of drag'n'drop launch + +-- This is the part that starts when user opens application by double-clicking it + +set ImageList to "" +-- ask user what he/she wants +set quit_app to false +repeat until quit_app is true + display dialog "Click Enfuse to get going!" buttons {"about", "quit", "Enfuse"} default button "Enfuse" + set choice to button returned of result + if choice = "Enfuse" then + set dropped_on to false + FUNC_ENFUSE(dropped_on, ImageList) + else if choice = "about" then + FUNC_ABOUT() + else + return --user has chosen quit so quit script + end if +end repeat +end run \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Enfuse_droplet.applescript hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Enfuse_droplet.applescript --- hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Enfuse_droplet.applescript 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Auto_Enfuse_droplet.applescript 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,175 @@ +---------------------------------------------------------------- +---------------------------------------------------------------- +-- Enfuse droplet applescript 0.0.4 +-- Harry van der wolf 12 Aug 2008 +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_ABOUT() + display dialog "Enfuse droplet 0.0.4 by Harry van der Wolf" & return & return & + "This (G)UI wrapper uses enfuse " & + "to fuse your set of images with different exposure " & + "settings to one fused image." & return & return & + "You can use this GUI either by starting it " & + "manually and then select your images" & + return & return & "OR" & return & return & + "drag and drop your images onto this little application." buttons {"Ok"} + +end FUNC_ABOUT +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_Initialize_BP_PGB(titlebarmsg, topmsg, bottommsg) + tell application "BP Progress Bar" + launch + set title of window 1 to titlebarmsg + activate + show window 1 + tell window 1 of application "BP Progress Bar" + tell progress indicator 1 + set indeterminate to true + start + end tell + end tell + tell window 1 of application "BP Progress Bar" to tell text field 1 to set content to topmsg + tell window 1 of application "BP Progress Bar" to tell text field 2 to set content to bottommsg + end tell +end FUNC_Initialize_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_quit_BP_PGB() + tell application "BP Progress Bar" to quit +end FUNC_quit_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +-- function enfuse +on FUNC_ENFUSE(dropped_on, ImageList) + + + -- set enfuse_additional_parameters to "--wExposure=1 --wSaturation=1 --wContrast=1" + set enfuse_additional_parameters to "" + ---- start images selection if dropped_on is false + if not dropped_on then + set ImageList to "" + set theImages to + choose file with prompt + "Select the image files of your choice" default location (path to pictures folder) + of type {"JPEG", "TIFF", "PNG"} with multiple selections allowed without invisibles + repeat with OneImage in theImages + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of OneImage + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + ---- end of images selection + end if + + -- Find the working dir of the program, otherwise it will default to $HOME where ais and enfuse are not available + tell application "Finder" to get folder of (path to me) as Unicode text + set workingDir to POSIX path of result + + -- delete possible previous fused intermediate images (normally overwritten + -- when there are more images from a previous run than need to be calculated, you get strange images + --tell application "Finder" + try -- use try to not display (error) dialog on non existing files + do shell script "rm " & workingDir & "fused*.tif" + end try + --end tell + + ----Ask filename of fused image and where it should be stored + set NewImgName to (choose file name with prompt "Specify the filename of your new fused image" default location (path to pictures folder)) + set NewImage to quoted form of POSIX path of NewImgName + set testname to POSIX path of NewImgName + -- file extensions are not treated case-sensitive within applescript + if (testname as text) ends with ".TIF" or (testname as text) ends with ".JPG" or (testname as text) ends with ".TIFF" or (testname as text) ends with ".JPEG" then + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + else + -- No image extension, so make it a tif + set testname to testname & ".tif" + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + end if + ---- kick off enfuse and set barber pole + FUNC_Initialize_BP_PGB("Running enfuse", "enfuse is merging your images", "This will take some time. Please wait....") + do shell script "cd " & workingDir & "; " & workingDir & "enfuse " & " -o " & NewImage & " " & ImageList + FUNC_quit_BP_PGB() + ---- enfuse finished. stop barber pole + + ---- Show fused image to the public + -- Stupid preview application is not scriptable so we need to shell out. + -- Next to that there is another stupidity: It's called Preview.app on Tiger and preview.app on Leopard. + do shell script "open /Applications/Preview.app " & NewImage + do shell script "open /Applications/preview.app " & NewImage + +end FUNC_ENFUSE +-- end of function enfuse +---------------------------------------------------------------- +---------------------------------------------------------------- + + +-- Main part of script +-- Here does it all start +-- Define some (initial) variables/properties +global ImageList +set ImageList to "" + +-- "open" handler triggered by drag'n'drop launch. +-- This parts starts when a user drops files on it +on open of finderObjects + global HUGIN_PATH + --set HUGIN_PATH to "/Applications/Hugin.app" + set HUGIN_PATH to "" + set ImageList to "" + repeat with OneImage in (finderObjects) -- in case multiple objects dropped on applet + --set pipo to quoted form of POSIX path of i as text + --display dialog pipo -- show file/folder's info + if folder of (info for OneImage) is true then -- process folder's contents too + repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of NewImgName + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + end if + -- repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + -- end repeat + end repeat + -- run function enfuse + set dropped_on to true + FUNC_ENFUSE(dropped_on, ImageList) +end open +-- end of drag'n'drop launch + +-- This is the part that starts when user opens application by double-clicking it + +set ImageList to "" +-- ask user what he/she wants +set quit_app to false +repeat until quit_app is true + display dialog "Click Enfuse to get going!" buttons {"about", "quit", "Enfuse"} default button "Enfuse" + set choice to button returned of result + if choice = "Enfuse" then + set dropped_on to false + FUNC_ENFUSE(dropped_on, ImageList) + else if choice = "about" then + FUNC_ABOUT() + else + return --user has chosen quit so quit script + end if +end repeat +end run \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Enfuse_droplet.applescript hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Enfuse_droplet.applescript --- hugin-2018.0.0+dfsg/platforms/mac/droplets/scripts/Enfuse_droplet.applescript 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/mac/droplets/scripts/Enfuse_droplet.applescript 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,219 @@ +---------------------------------------------------------------- +---------------------------------------------------------------- +-- Enfuse droplet applescript 0.0.4 +-- Harry van der wolf 12 Aug 2008 +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_ABOUT() + display dialog "Enfuse droplet 0.0.4 by Harry van der Wolf" & return & return & + "This (G)UI wrapper uses enfuse " & + "to fuse your set of images with different exposure " & + "settings to one fused image." & return & return & + "You can use this GUI either by starting it " & + "manually and then select your images" & + return & return & "OR" & return & return & + "drag and drop your images onto this little application." buttons {"Ok"} + +end FUNC_ABOUT +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_ENF_PARAM() + display dialog "==== enfuse, version 3.1 ====" & return & + "Common options:" & return & + " -l number Number of levels to use (1 to 29)" & return & + " -o filename Write output to file" & return & + "-w Blend across -180/+180 boundary" & return & + "--compression=COMP Set compression of the output image." & return & + "Valid values for compression are:" & return & + "For TIFF files: LZW, DEFLATE" & return & + "For JPEG files: 0-100" & return & return & + "Extended options:" & return & + "-b kilobytes Image cache block size (default=2MiB)" & return & + "-c Use CIECAM02 to blend colors" & return & + "-g Associated alpha hack for Gimp (ver. < 2) and Cinepaint" & return & + "-f WIDTHxHEIGHT+x0+y0 Manually set the size and position of the output image." & return & + "Useful for cropped and shifted input TIFF images," & + "such as those produced by Nona." & + "-m megabytes Use this much memory before going to disk (default=1GiB)" & return & return & + "Fusion options:" & return & + "--wExposure=W Weight given to well-exposed pixels (from 0 to 1)." & return & + "default value: 1.0" & return & + "--wSaturation=W Weight given to highly-saturated pixels (from 0 to 1)." & return & + "default value: 0.2" & return & + "--wContrast=W Weight given to high-contrast pixels (from 0 to 1)." & return & + "default value: 0" & return & + "--HardMask Force hard blend masks (no averaging) on finest" & + "scale. This is especially useful for focus" & + "stacks with thin and high contrast features such" & + "as insect hairs etc, but will lead to increased noise." & return & return & + "Expert options:" & return & + "--ContrastWindowSize=s Window size for local contrast analysis." & return & + "Default: 5, (must be bigger than 3)." & return + buttons {"Ok"} +end FUNC_ENF_PARAM +---------------------------------------------------------------- +on FUNC_Initialize_BP_PGB(titlebarmsg, topmsg, bottommsg) + tell application "BP Progress Bar" + launch + set title of window 1 to titlebarmsg + activate + show window 1 + tell window 1 of application "BP Progress Bar" + tell progress indicator 1 + set indeterminate to true + start + end tell + end tell + tell window 1 of application "BP Progress Bar" to tell text field 1 to set content to topmsg + tell window 1 of application "BP Progress Bar" to tell text field 2 to set content to bottommsg + end tell +end FUNC_Initialize_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +on FUNC_quit_BP_PGB() + tell application "BP Progress Bar" to quit +end FUNC_quit_BP_PGB +---------------------------------------------------------------- +---------------------------------------------------------------- +-- function enfuse +on FUNC_ENFUSE(dropped_on, ImageList) + + + -- set enfuse_additional_parameters to "--wExposure=1 --wSaturation=1 --wContrast=1" + set enfuse_additional_parameters to "" + ---- start images selection if dropped_on is false + if not dropped_on then + set ImageList to "" + set theImages to + choose file with prompt + "Select the image files of your choice" default location (path to pictures folder) + of type {"JPEG", "TIFF", "PNG"} with multiple selections allowed without invisibles + repeat with OneImage in theImages + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of OneImage + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + ---- end of images selection + end if + + -- Find the working dir of the program, otherwise it will default to $HOME where ais and enfuse are not available + tell application "Finder" to get folder of (path to me) as Unicode text + set workingDir to POSIX path of result + + + ---- start of requesting enfuse parameters + set get_going to "NOK" + repeat while get_going is "NOK" + display dialog "Enfuse additional parameters" & return & return & + "Here you can specify your parameters." & return & + "(Click Show Parameters to show possibilities)" & return & return + default answer enfuse_additional_parameters buttons {"Show Parameters", "Quit", "Ok"} default button "Ok" + set dialogResult to result + set enfuse_additional_parameters to text returned of dialogResult + set choice to button returned of dialogResult + if choice = "Show Parameters" then FUNC_ENF_PARAM() + if choice = "Quit" then return -- exit script immediately + if choice = "Ok" then set get_going to "OK" + end repeat + --- end of requesting enfuse parameters + + ----Ask filename of fused image and where it should be stored + set NewImgName to (choose file name with prompt "Specify the filename of your new fused image" default location (path to pictures folder)) + set NewImage to quoted form of POSIX path of NewImgName + set testname to POSIX path of NewImgName + -- file extensions are not treated case-sensitive within applescript + if (testname as text) ends with ".TIF" or (testname as text) ends with ".JPG" or (testname as text) ends with ".TIFF" or (testname as text) ends with ".JPEG" then + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + else + -- No image extension, so make it a tif + set testname to testname & ".tif" + set NewImage to quoted form of POSIX path of testname + --display dialog NewImage + end if + ---- kick off enfuse and set barber pole + FUNC_Initialize_BP_PGB("Running enfuse", "enfuse is merging your images", "This will take some time. Please wait....") + do shell script "cd " & workingDir & "; " & workingDir & "enfuse " & enfuse_additional_parameters & " -o " & NewImage & " " & ImageList + FUNC_quit_BP_PGB() + ---- enfuse finished. stop barber pole + + ---- Show fused image to the public + -- Stupid preview application is not scriptable so we need to shell out. + -- Next to that there is another stupidity: It's called Preview.app on Tiger and preview.app on Leopard. + do shell script "open /Applications/Preview.app " & NewImage + do shell script "open /Applications/preview.app " & NewImage + +end FUNC_ENFUSE +-- end of function enfuse +---------------------------------------------------------------- +---------------------------------------------------------------- + + +-- Main part of script +-- Here does it all start +-- Define some (initial) variables/properties +global ImageList +set ImageList to "" + +-- "open" handler triggered by drag'n'drop launch. +-- This parts starts when a user drops files on it +on open of finderObjects + global HUGIN_PATH + --set HUGIN_PATH to "/Applications/Hugin.app" + set HUGIN_PATH to "" + set ImageList to "" + repeat with OneImage in (finderObjects) -- in case multiple objects dropped on applet + --set pipo to quoted form of POSIX path of i as text + --display dialog pipo -- show file/folder's info + if folder of (info for OneImage) is true then -- process folder's contents too + repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set testname to POSIX path of NewImgName + -- we need this extension later + if (testname as text) ends with ".TIF" or (testname as text) ends with ".TIFF" then + set ImgExt to ".tif" + else + set ImgExt to ".jpg" + end if + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + end repeat + end if + -- repeat with OneImage in finderObjects + set OneImage to quoted form of POSIX path of OneImage + set ImagePath to quoted form of POSIX path of OneImage --should do it only once but who cares + set ImageList to ImageList & OneImage & " " + -- end repeat + end repeat + -- run function enfuse + set dropped_on to true + FUNC_ENFUSE(dropped_on, ImageList) +end open +-- end of drag'n'drop launch + +-- This is the part that starts when user opens application by double-clicking it + +set ImageList to "" +-- ask user what he/she wants +set quit_app to false +repeat until quit_app is true + display dialog "Click Enfuse to get going!" buttons {"about", "quit", "Enfuse"} default button "Enfuse" + set choice to button returned of result + if choice = "Enfuse" then + set dropped_on to false + FUNC_ENFUSE(dropped_on, ImageList) + else if choice = "about" then + FUNC_ABOUT() + else + return --user has chosen quit so quit script + end if +end repeat +end run \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/CMakeLists.txt 2018-02-03 14:34:23.000000000 +0000 @@ -0,0 +1,10 @@ + +SET(HUGIN_BUILDER "" CACHE STRING "set Builder Name." ) +IF(NOT HUGIN_BUILDER) + MESSAGE(FATAL_ERROR "Need to set builder (HUGIN_BUILDER) manually") +ENDIF() + + +IF(BUILD_HUGINSETUP) + ADD_SUBDIRECTORY(huginsetup) +ENDIF() diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/CHANGELOG.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/CHANGELOG.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/CHANGELOG.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/CHANGELOG.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,76 @@ +* -DEV + + Removed Autopano-sift-C options --projection %f,%v (suggested by Aron H) + + Added Installer Script to Hugin/WindowsSetup Sourceforge repository + + Refactored Control Points generators scripts (names and languages string) + + Control Point Generators are now stored into their own directory $INSTALLDIR$/CPG/ + + Added Autopano-SIFT-C multirow/stacked from Lemur build (autopano.exe and generatekeys.exe) + + Added Clean registry settings during install (thanks Matthew Petroff) + +* 0.2.11 (2010-09-25) + + Refactored install Functions + + Added Panomatic SourceForge mirror select (thanks Matthew Petroff) + + Fixed CPGs settings for default to latest installed CPG (thanks Matthew Petroff) + +* 0.2.10 (2010-09-21) + + Fixed "Download Failed" messages for Control Points Generators + + Fixed Autopano-SIFT-C 2.5.2 download and setup bug + + Fixed Autopano-103 settings (wrong zip extraction) + + Fixed Match-n-shift settings (doubled .exe extension) + +* 0.2.8 (2010-09-15) + + Using Match-n-shift version 2008-02-19 (from my Dropbox folder) + + Added Stacked/Multirow settings (tests needed) + + Added Italian translation to ControlPointDisclaimer + + Added HuginSetup.nsi with CMake settings directives (needs works) + + Updated 32/64bit installers for 2010.2.0-beta2 build (thanks to Aron Helser - www.aronhelser.com ) + +* 0.2.6 (2010-09-06) + + Refactored Control Point Generators scripts (moved into own folder) + + Splitted 32/64bit installers + + Added CP align_image_stack.exe + + Fixed Autopano-sift-c read-only selection + + Removed debug messages during CP registry settings writing + + Some code clean-up + +* 0.2.0 (2010-09-04): + + Added more ControlPoints: Match-n-shift and Autopano-sift-C + + Added control point settings in Hugin Settings (install and go!) + + Source code available on BitBucket: https://bitbucket.org/thePanz/huginsetup + +* 0.1.28 (2010-09-03): + + Fixed Italian translation (thanks to Cristian) + + Added room for Control Point Disclaimer translation (waiting for translations) + +* 0.1.26 (2010-09-03): + + Fixed German translation (thanks again to Brian) + + Added support for 32bit/64bit installers (common Documentation used) + + Added installer for 64bit version (using Tom Glastonbury and AronH builds) + +* 0.1.24 (2010-09-02): + + Added more translatable strings + + Added (partial) German translation (thanks to Brian) + + Added (partial) Italian translation + +* 0.1.22 (2010-09-02): + + Added translatable message strings + + Added fake Italian translation + +* 0.1.20 (2010-09-02): + + Added finish page (install/uninstall) + + Fixed component wrong sizes + +* 0.1.18 (2010-09-02): + + Added Documentation install options + + Added Control Panel uninstall size + +* 0.1.17 (2010-09-01): + + Fixed default install path trailing slash + + Fixed Windows permissions bug (thanks to Brian) + +* 0.1.16 (2010-09-01): + + Added ControlPoints disclaimer + + Changed Licenses/Plugins folder structure + +* 0.1.15 (2010-08-31): + + Added Welcome screen logo + + First public release diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/CMakeLists.txt 2016-11-22 17:12:19.000000000 +0000 @@ -0,0 +1,31 @@ +# Windows installer settings +IF(WIN32) + # Set install directory + IF(CMAKE_SIZEOF_VOID_P EQUAL 4) #32bit + SET(WINDOWS_INSTALL_DIRECTORY "$PROGRAMFILES\\Hugin") + SET(WINDOWS_ARCH_TYPE "32") + ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4) + IF(CMAKE_SIZEOF_VOID_P EQUAL 8) #64bit + SET(WINDOWS_INSTALL_DIRECTORY "$PROGRAMFILES64\\Hugin") + SET(WINDOWS_ARCH_TYPE "64") + ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8) + + # Toggle Development Version Warning + IF(HUGIN_DEVELOPMENT_VERSION EQUAL 1) + SET(DEV_WARNING_TOGGLE "$(TEXT_PreReleaseWelcomePage)") + ELSE(HUGIN_DEVELOPMENT_VERSION EQUAL 1) + SET(DEV_WARNING_TOGGLE "$(TEXT_WelcomePage)") + ENDIF(HUGIN_DEVELOPMENT_VERSION EQUAL 1) + + # Configure Files + CONFIGURE_FILE(HuginSetup.nsi ${CMAKE_INSTALL_PREFIX}/../HuginSetup.nsi) + + # Install Files + INSTALL(FILES HuginSetup_common.nsh + DESTINATION ${CMAKE_INSTALL_PREFIX}/../) + add_subdirectory(Functions) + add_subdirectory(Graphics) + add_subdirectory(Languages) + add_subdirectory(Licenses) + add_subdirectory(Plugins) +ENDIF(WIN32) \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Functions/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Functions/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Functions/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Functions/CMakeLists.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,4 @@ +# Install Files +INSTALL(FILES DownloadFunctions.nsh + RegistryFunctions.nsh + DESTINATION ${CMAKE_INSTALL_PREFIX}/../Functions) \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Functions/DownloadFunctions.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Functions/DownloadFunctions.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Functions/DownloadFunctions.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Functions/DownloadFunctions.nsh 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,259 @@ +; Download Functions +; @todo: replace log strings with translatable ones! +; +# from http://nsis.sourceforge.net/Using_NSISdl_to_download_from_a_random_(or_not_random)_mirror + +# Downloads a file from a list of mirrors +# (the fist mirror is selected at random) +# +# Usage: +# Push Mirror1 +# Push [Mirror2] +# ... +# Push [Mirror10] +# Push NumMirrors # 10 Max +# Push FileName +# Call DownloadFromRandomMirror +# Pop Return +# +# Returns the NSISdl result + +;variable for choosing random mirror +var RandomSeed +Function DownloadFromRandomMirror + Exch $R1 #File name + Exch + Exch $R0 #Number of Mirros + Push $0 + Exch 3 + Pop $0 #Mirror 1 + IntCmpU "2" $R0 0 0 +4 + Push $1 + Exch 4 + Pop $1 #Mirror 2 + IntCmpU "3" $R0 0 0 +4 + Push $2 + Exch 5 + Pop $2 #Mirror 3 + IntCmpU "4" $R0 0 0 +4 + Push $3 + Exch 6 + Pop $3 #Mirror 4 + IntCmpU "5" $R0 0 0 +4 + Push $4 + Exch 7 + Pop $4 #Mirror 5 + IntCmpU "6" $R0 0 0 +4 + Push $5 + Exch 8 + Pop $5 #Mirror 6 + IntCmpU "7" $R0 0 0 +4 + Push $6 + Exch 9 + Pop $6 #Mirror 7 + IntCmpU "8" $R0 0 0 +4 + Push $7 + Exch 10 + Pop $7 #Mirror 8 + IntCmpU "9" $R0 0 0 +4 + Push $8 + Exch 11 + Pop $8 #Mirror 9 + IntCmpU "10" $R0 0 0 +4 + Push $9 + Exch 12 + Pop $9 #Mirror 10 + Push $R4 + Push $R2 + Push $R3 + Push $R5 + Push $R6 + + # If you don't want a random mirror, replace this block with: + # StrCpy $R3 "0" + # ----------------------------------------------------------- + StrCmp $RandomSeed "" 0 +2 + StrCpy $RandomSeed $HWNDPARENT #init RandomSeed + + Push $RandomSeed + Push $R0 + Call LimitedRandomNumber + Pop $R3 + Pop $RandomSeed + # ----------------------------------------------------------- + + StrCpy $R5 "0" +MirrorsStart: + IntOp $R5 $R5 + "1" + StrCmp $R3 "0" 0 +3 + StrCpy $R2 $0 + Goto MirrorsEnd + StrCmp $R3 "1" 0 +3 + StrCpy $R2 $1 + Goto MirrorsEnd + StrCmp $R3 "2" 0 +3 + StrCpy $R2 $2 + Goto MirrorsEnd + StrCmp $R3 "3" 0 +3 + StrCpy $R2 $3 + Goto MirrorsEnd + StrCmp $R3 "4" 0 +3 + StrCpy $R2 $4 + Goto MirrorsEnd + StrCmp $R3 "5" 0 +3 + StrCpy $R2 $5 + Goto MirrorsEnd + StrCmp $R3 "6" 0 +3 + StrCpy $R2 $6 + Goto MirrorsEnd + StrCmp $R3 "7" 0 +3 + StrCpy $R2 $7 + Goto MirrorsEnd + StrCmp $R3 "8" 0 +3 + StrCpy $R2 $8 + Goto MirrorsEnd + StrCmp $R3 "9" 0 +3 + StrCpy $R2 $9 + Goto MirrorsEnd + StrCmp $R3 "10" 0 +3 + StrCpy $R2 $10 + Goto MirrorsEnd + +MirrorsEnd: + IntOp $R6 $R3 + "1" + DetailPrint "Downloading from mirror $R6: $R2" + + NSISdl::download "$R2" "$R1" + Pop $R4 + StrCmp $R4 "success" Success + StrCmp $R4 "cancel" DownloadCanceled + IntCmp $R5 $R0 NoSuccess + DetailPrint "Download failed (error $R4), trying with other mirror" + IntOp $R3 $R3 + "1" + IntCmp $R3 $R0 0 MirrorsStart + StrCpy $R3 "0" + Goto MirrorsStart + +DownloadCanceled: + DetailPrint "Download Canceled: $R2" + Goto End +NoSuccess: + DetailPrint "Download Failed: $R1" + Goto End +Success: + DetailPrint "Download completed." +End: + Pop $R6 + Pop $R5 + Pop $R3 + Pop $R2 + Push $R4 + Exch + Pop $R4 + Exch 2 + Pop $R1 + Exch 2 + Pop $0 + Exch + + IntCmpU "2" $R0 0 0 +4 + Exch 2 + Pop $1 + Exch + IntCmpU "3" $R0 0 0 +4 + Exch 2 + Pop $2 + Exch + IntCmpU "4" $R0 0 0 +4 + Exch 2 + Pop $3 + Exch + IntCmpU "5" $R0 0 0 +4 + Exch 2 + Pop $4 + Exch + IntCmpU "6" $R0 0 0 +4 + Exch 2 + Pop $5 + Exch + IntCmpU "7" $R0 0 0 +4 + Exch 2 + Pop $6 + Exch + IntCmpU "8" $R0 0 0 +4 + Exch 2 + Pop $7 + Exch + IntCmpU "9" $R0 0 0 +4 + Exch 2 + Pop $8 + Exch + IntCmpU "10" $R0 0 0 +4 + Exch 2 + Pop $9 + Exch + Pop $R0 +FunctionEnd + +############################################################### +# +# NOTE: If you don't want a random mirror, remove this Function +# +# Returns a random number +# +# Usage: +# Push Seed (or previously generated number) +# Call RandomNumber +# Pop Generated Random Number +Function RandomNumber + Exch $R0 + + IntOp $R0 $R0 * "13" + IntOp $R0 $R0 + "3" + IntOp $R0 $R0 % "1048576" # Values goes from 0 to 1048576 (2^20) + + Exch $R0 +FunctionEnd + +#################################################### +# +# NOTE: If you don't want a random mirror, remove this Function +# +# Returns a random number between 0 and Max-1 +# +# Usage: +# Push Seed (or previously generated number) +# Push MaxValue +# Call RandomNumber +# Pop Generated Random Number +# Pop NewSeed +Function LimitedRandomNumber + Exch $R0 + Exch + Exch $R1 + Push $R2 + Push $R3 + + StrLen $R2 $R0 + Push $R1 +RandLoop: + Call RandomNumber + Pop $R1 #Random Number + IntCmp $R1 $R0 0 NewRnd + StrLen $R3 $R1 + IntOp $R3 $R3 - $R2 + IntOp $R3 $R3 / "2" + StrCpy $R3 $R1 $R2 $R3 + IntCmp $R3 $R0 0 RndEnd +NewRnd: + Push $R1 + Goto RandLoop +RndEnd: + StrCpy $R0 $R3 + IntOp $R0 $R0 + "0" #removes initial 0's + Pop $R3 + Pop $R2 + Exch $R1 + Exch + Exch $R0 +FunctionEnd \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Functions/RegistryFunctions.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Functions/RegistryFunctions.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Functions/RegistryFunctions.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Functions/RegistryFunctions.nsh 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,89 @@ +; Common functions for Hugin Setup +; @Author: thePanz @gmail.com + +; Write Hugin uninstall informations into Windows Register +Function WriteUninstallRegistry + ; Write uninstall information to the registry + ; as in http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "DisplayName" "Hugin ${HUGIN_VERSION}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "DisplayIcon" "$INSTDIR\bin\hugin.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "DisplayVersion" "${HUGIN_VERSION} ${HUGIN_VERSION_BUILD}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "Publisher" "The Hugin Development Team" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "URLInfoAbout" "http://hugin.sourceforge.net" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "HelpLink" "http://groups.google.com/group/hugin-ptx" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "InstallLocation" "$INSTDIR" + ; No Repair/Modify options + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "NoRepair" 1 + ; Setting Install Size + Call GetInstalledSize + Pop $0 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" "EstimatedSize" $0 + +FunctionEnd + +; Return on top of stack the total size of the selected (installed) sections, formated as DWORD +; Assumes no more than 256 sections are defined +Var GetInstalledSize.total +Function GetInstalledSize + Push $0 + Push $1 + StrCpy $GetInstalledSize.total 0 + ${ForEach} $1 0 256 + 1 + ${if} ${SectionIsSelected} $1 + SectionGetSize $1 $0 + IntOp $GetInstalledSize.total $GetInstalledSize.total + $0 + ${Endif} + ${Next} + Pop $1 + Pop $0 + IntFmt $GetInstalledSize.total "0x%08X" $GetInstalledSize.total + Push $GetInstalledSize.total +FunctionEnd + +; Write registry settings for CP generators +; R0 = Type +; R1 = Option +; R2 = Program +; R3 = Arguments +; R4 = Description +Function ControlPointRegistryAdd + ReadRegDWORD $0 HKCU "Software\hugin\AutoPano" "AutoPanoCount" + ; Make sure it's an Integer (empty string if AutoPanoCount doesn't exists) + IntOp $0 $0 + 0 + + ; MessageBox MB_OK "Adding $R2: '$R4' ($R3) into AutoPano_$0" + + ; Writing settings + WriteRegDWORD HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Type" "$R0" + WriteRegDWORD HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Option" "$R1" + WriteRegStr HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Program" "$R2" + WriteRegStr HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Arguments" "$R3" + WriteRegStr HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Description" "$R4" + + IntOp $0 $0 + 1 + ; MessageBox MB_OK "How many CP now?? $0" + WriteRegDWORD HKCU "Software\hugin\AutoPano" "AutoPanoCount" $0 + WriteRegDWORD HKCU "Software\hugin\AutoPano" "Default" $0 +FunctionEnd + +; Write registry settings for CP Stacked +; R0 = Type [Matcher|Stack] +; R1 = Autopano_ID (-1 for last setting present) +; R2 = Program +; R3 = Arguments +Function ControlPointRegistryAddMulti + IntCmp $R1 -1 0 ok + ReadRegDWORD $0 HKCU "Software\hugin\AutoPano" "AutoPanoCount" + ; Make sure it's an Integer (empty string if AutoPanoCount doesn't exists) + IntOp $0 $0 - 1 + StrCpy $R1 $0 + ok: + + ; MessageBox MB_OK "Adding $R0 as $R2: '$R4' ($R3) into AutoPano_$0" + + ; Writing settings + WriteRegStr HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Program$R0" "$R2" + WriteRegStr HKCU "Software\Hugin\AutoPano\AutoPano_$0" "Arguments$R0" "$R3" +FunctionEnd diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Graphics/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Graphics/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Graphics/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Graphics/CMakeLists.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,6 @@ +# Install Files +INSTALL(FILES Hugin.bmp + hugin-installer-icon.ico + Hugin-sidebar.bmp + hugin-uninstaller-icon.ico + DESTINATION ${CMAKE_INSTALL_PREFIX}/../Graphics) \ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Graphics/Hugin.bmp and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Graphics/Hugin.bmp differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Graphics/hugin-installer-icon.ico and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Graphics/hugin-installer-icon.ico differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Graphics/Hugin-sidebar.bmp and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Graphics/Hugin-sidebar.bmp differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Graphics/hugin-uninstaller-icon.ico and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Graphics/hugin-uninstaller-icon.ico differ diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/HuginSetup_common.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/HuginSetup_common.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/HuginSetup_common.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/HuginSetup_common.nsh 2016-11-22 17:15:15.000000000 +0000 @@ -0,0 +1,273 @@ +; Hugin installer script +!define VERSION 0.2.11.0 +; Author: thePanz (thepanz@gmail.com) + +; uninstaller definitions +!define APP_NAME "Hugin" +!define INSTDIR_REG_ROOT "HKLM" +!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" + +;-------------------------------- +;Include Modern UI + !include "MUI2.nsh" +;Include the Uninstall log header + !include "Plugins\AdvUninstLog.nsh" + + !addplugindir "./Plugins" +;-------------------------------- +;General + + ; General CP Disclaimer + ;!define CP_LICENSE_DISCLAIMER $(License_ControlPointDisclaimer) + + ;Name and file + Name "Hugin ${HUGIN_VERSION}" + BrandingText "Hugin Setup" + + OutFile "HuginSetup_${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}_${ARCH_TYPE}bit.exe" + SetCompressor /SOLID lzma + SetCompressorDictSize 128 + + ;Request application privileges for Windows Vista + RequestExecutionLevel admin + +;-------------------------------- +;Interface Configuration + !define MUI_VERSION "${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}" + !define MUI_COMPONENTSPAGE_SMALLDESC ; Small description in Component selection + + !define MUI_HEADERIMAGE + !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange.bmp" ; optional + !define MUI_HEADERIMAGE_UNBITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-uninstall.bmp" ; optional + + !define MUI_ICON "Graphics\hugin-installer-icon.ico" + !define MUI_UNICON "Graphics\hugin-uninstaller-icon.ico" + + !define MUI_ABORTWARNING + + !define MUI_FINISHPAGE_NOAUTOCLOSE + !define MUI_WELCOMEPAGE_TEXT "${DEV_WARNING_TOGGLE}" + !define MUI_WELCOMEFINISHPAGE_BITMAP "Graphics\Hugin-sidebar.bmp" + !define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH + !define MUI_UNWELCOMEFINISHPAGE_BITMAP "Graphics\Hugin-sidebar.bmp" + !define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH + + !define MUI_FINISHPAGE_RUN $INSTDIR\bin\hugin.exe + !define MUI_FINISHPAGE_RUN_NOTCHECKED + !define MUI_FINISHPAGE_LINK $(TEXT_FinishPageLink) + !define MUI_FINISHPAGE_LINK_LOCATION "http://hugin.sourceforge.net" + + ;uninstaller mode + !insertmacro INTERACTIVE_UNINSTALL +;-------------------------------- +;Pages + ;Show all languages, despite user's codepage + !define MUI_LANGDLL_ALLLANGUAGES + + !insertmacro MUI_PAGE_WELCOME + ;!insertmacro MUI_PAGE_LICENSE $(License_Hugin) + !insertmacro MUI_PAGE_LICENSE "Licenses\GPLv2.txt" + !insertmacro MUI_PAGE_COMPONENTS + + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + + !insertmacro MUI_UNPAGE_CONFIRM + !insertmacro MUI_UNPAGE_COMPONENTS + !insertmacro MUI_UNPAGE_INSTFILES + !insertmacro MUI_UNPAGE_FINISH + +;-------------------------------- +; Include Functions + !include "Functions\RegistryFunctions.nsh" + !include "Functions\DownloadFunctions.nsh" + +;-------------------------------- +; Installer Sections + +; Core Hugin files +Section "!Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}" SecHugin + SectionIn RO + + Call CleanRegistryOnInstallIfSelected + + DetailPrint $(TEXT_HuginExtracting) + SetDetailsPrint listonly + + SetOutPath "$INSTDIR" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + CreateDirectory "$INSTDIR\bin" + CreateDirectory "$INSTDIR\share" + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + + SetDetailsPrint both + SetOutPath "$INSTDIR\bin" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File /r "FILES\bin\*.*" ;bin folder + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + SetOutPath "$INSTDIR\share" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File /r "FILES\share\*.*" ;share folder + + ; Call AddCPAutoPanoSiftCStacked + ;Call AddCPAlignImageStack + + ; register .pto files with hugin + WriteRegStr HKCR ".pto" "" "HuginProject" + WriteRegStr HKCR "HuginProject" "" "Hugin PTO" + WriteRegStr HKCR "HuginProject\DefaultIcon" "" "$INSTDIR\share\hugin\xrc\data\pto_icon.ico,0" + + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + + Call WriteUninstallRegistry +SectionEnd + +Section /o $(TEXT_SecCleanRegistrySettings) SecCleanRegistrySettings + ; done during install +SectionEnd + +; Hugin documentation section +Section $(TEXT_SecHuginDoc) SecHuginDoc + SetOutPath "$INSTDIR" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + CreateDirectory "$INSTDIR\doc" + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL + + DetailPrint $(TEXT_HuginDocExtracting) + SetDetailsPrint listonly + + SetDetailsPrint both + + SetOutPath "$INSTDIR\doc" + !insertmacro UNINSTALL.LOG_OPEN_INSTALL + File /r "FILES\doc\*.*" ;doc folder + + !insertmacro UNINSTALL.LOG_CLOSE_INSTALL +SectionEnd + +SectionGroup /e $(TEXT_SecShortcuts) SecShortcuts + Section $(TEXT_SecShortcutPrograms) SecShortcutPrograms + AddSize 1 + ; SetShellVarContext all + SetOutPath "$INSTDIR\bin" + CreateDirectory "$SMPROGRAMS\${APP_NAME}" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "${UNINST_EXE}" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\Hugin.lnk" "$INSTDIR\bin\hugin.exe" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\Calibrate Lens GUI.lnk" "$INSTDIR\bin\calibrate_lens_gui.exe" + CreateShortCut "$SMPROGRAMS\${APP_NAME}\Batch Processor.lnk" "$INSTDIR\bin\PTBatcherGUI.exe" + SectionEnd + + Section $(TEXT_SecShortcutDesktop) SecShortcutDesktop + AddSize 1 + SetOutPath "$INSTDIR\bin" + CreateShortCut "$DESKTOP\Hugin.lnk" "$INSTDIR\bin\hugin.exe" "" + SectionEnd +SectionGroupEnd + +;-------------------------------- +;Descriptions + ;Assign language strings to sections + !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecHugin} $(DESC_SecHugin) + !insertmacro MUI_DESCRIPTION_TEXT ${SecHuginDoc} $(DESC_SecHuginDoc) + !insertmacro MUI_DESCRIPTION_TEXT ${SecCleanRegistrySettings} $(DESC_SecCleanRegistrySettings) + !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} $(DESC_SecShortcuts) + !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcutPrograms} $(DESC_SecShortcutPrograms) + !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcutDesktop} $(DESC_SecShortcutDesktop) + !insertmacro MUI_FUNCTION_DESCRIPTION_END + +;-------------------------------- +;Uninstaller Section + +Section "un.Uninstall Hugin" + !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL + SectionIn RO + !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR" + ; SetShellVarContext all + Delete "$SMPROGRAMS\${APP_NAME}\Hugin.lnk" + Delete "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" + RMDir "$SMPROGRAMS\${APP_NAME}" + + !insertmacro UNINSTALL.LOG_END_UNINSTALL + + ;Delete Desktop shortcut (if exists) + Delete "$DESKTOP\Hugin.lnk" + + ;Delete Uninstaller And Uninstall Registry Entries + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hugin" + + ;Delete .pto file assiciation + DeleteRegKey HKLM "SOFTWARE\Classes\.pto" + DeleteRegKey HKLM "SOFTWARE\Classes\HuginProject" +SectionEnd + +Section /o "un.$(TEXT_SecCleanRegistrySettings)" + DeleteRegKey HKCU "Software\Hugin" +SectionEnd + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Italian" + + ; Language Files + !include "Licenses\licenses.nsh" + + !include "Languages\EN.nsh" + !include "Languages\DE.nsh" + !include "Languages\IT.nsh" + +; ---------------------- +; Installer versions + VIProductVersion ${VERSION} + VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}" + VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${VERSION} + VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Hugin Setup" + VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "" + +; -------------------------- +; Functions + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + + ;prepare uninstall log + !insertmacro UNINSTALL.LOG_PREPARE_INSTALL + +FunctionEnd + +Function .onInstSuccess + + ;create log file for use with uninstaller + !insertmacro UNINSTALL.LOG_UPDATE_INSTALL + +FunctionEnd + +;Clean registry on install if selected +Function CleanRegistryOnInstallIfSelected + + SectionGetFlags ${SecCleanRegistrySettings} $R0 + IntOp $R0 $R0 & ${SF_SELECTED} + IntCmp $R0 ${SF_SELECTED} CleanRegistry DoNotCleanRegistry + + CleanRegistry: + DeleteRegKey HKCU "Software\Hugin" + + DoNotCleanRegistry: + ;do nothing +FunctionEnd + +; Add Align_Image_Stack control point generator settings to registry +; Align_image_stack.exe is provided directly from Hugin +;Function AddCPAlignImageStack +; StrCpy $R0 1 ; R0 = Type +; StrCpy $R1 1 ; R1 = Option +; StrCpy $R2 "$INSTDIR\bin\align_image_stack.exe" ; R2 = Program +; StrCpy $R3 "-f %v -v -p %o %i" ; R3 = Arguments +; StrCpy $R4 "Align image stack"; R4 = Description +; Call ControlPointRegistryAdd +;FunctionEnd diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/HuginSetup.nsi hugin-2019.0.0+dfsg/platforms/windows/huginsetup/HuginSetup.nsi --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/HuginSetup.nsi 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/HuginSetup.nsi 2018-02-12 16:25:58.000000000 +0000 @@ -0,0 +1,22 @@ +; Installer for Hugin Release +; defines will be generated using CMake directives + + !define ARCH_TYPE "@WINDOWS_ARCH_TYPE@" ;32 or 64 + !define HUGIN_VERSION "@HUGIN_PACKAGE_VERSION@" + !define HUGIN_VERSION_BUILD "hg_@HUGIN_WC_REVISION@" + + ; Default installation folder + InstallDir "@WINDOWS_INSTALL_DIRECTORY@" + ;InstallDir "$PROGRAMFILES\Hugin" ;for 32bit + ; or + ; InstallDir "$PROGRAMFILES64\Hugin" ;for 64bit + + ; Development version warning toggle + !define DEV_WARNING_TOGGLE "@DEV_WARNING_TOGGLE@" + ;!define DEV_WARNING_TOGGLE "$(TEXT_WelcomePage)" ;for stable releases + ;or + ;!define DEV_WARNING_TOGGLE "$(TEXT_PreReleaseWelcomePage)" ;for development snapshots + +; ---------------------------------------- +; Now the common part +!include HuginSetup_common.nsh \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/CMakeLists.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,5 @@ +# Install Files +INSTALL(FILES DE.nsh + EN.nsh + IT.nsh + DESTINATION ${CMAKE_INSTALL_PREFIX}/../Languages) \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/DE.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/DE.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/DE.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/DE.nsh 2016-11-22 17:16:03.000000000 +0000 @@ -0,0 +1,27 @@ + ;German Language strings (translator: brian@slowpoke.de) + LangString TEXT_WelcomePage ${LANG_GERMAN} "Dieses Setup wird Sie durch die Installation von Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD} fhren.$\r$\n $\r$\nMit Hugin knnen Sie mehrere Bilder in ein komplettes Panorama zusammenfhren, eine Serie von berlappenden Bildern zusammenfhren und vieles mehr." + LangString TEXT_FinishPageLink ${LANG_GERMAN} "Hugin Webseite besuchen" + + LangString TEXT_HuginExtracting ${LANG_GERMAN} "Extrahiere Hugin Paket..." + LangString TEXT_HuginExtractDetails ${LANG_GERMAN} "Installiere Hugin ${HUGIN_VERSION} package %s..." + + LangString TEXT_HuginDocExtracting ${LANG_GERMAN} "Extrahiere Hugin Dokumentation Paket..." + LangString TEXT_HuginDocExtractDetails ${LANG_GERMAN} "Installiere Hugin ${HUGIN_VERSION} Dokumentation Paket %s..." + + LangString DESC_SecHugin ${LANG_GERMAN} "Hugin Dateien und andere Dateien fr Foto-Stitching, -Zusammenfhrung und Linsenkorrektur" + + LangString DESC_SecHuginDoc ${LANG_GERMAN} "Hugin Dokumentation installieren" + LangString TEXT_SecHuginDoc ${LANG_GERMAN} "Dokumentation" + + LangString DESC_SecShortcuts ${LANG_GERMAN} "Verknpfungen erstellen" + LangString TEXT_SecShortcuts ${LANG_GERMAN} "Verknpfungen" + + LangString DESC_SecShortcutPrograms ${LANG_GERMAN} "Programmordner im Startmen erstellen" + LangString TEXT_SecShortcutPrograms ${LANG_GERMAN} "Zum Startmen hinzufgen" + + LangString DESC_SecShortcutDesktop ${LANG_GERMAN} "Verknpfung auf dem Desktop erstellen" + LangString TEXT_SecShortcutDesktop ${LANG_GERMAN} "Desktopverknpfung hinzufgen" + + LangString TEXT_ERROR_DownloadFailed ${LANG_GERMAN} "Download ist fehlgeschlagen: $0" + LangString TEXT_SecCleanRegistrySettings ${LANG_GERMAN} "Registrierungseintrge subern" + LangString DESC_SecCleanRegistrySettings ${LANG_GERMAN} "Registrierungseintrge subern" \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/EN.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/EN.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/EN.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/EN.nsh 2016-11-22 17:16:27.000000000 +0000 @@ -0,0 +1,29 @@ + ;English Language strings (thepanz@gmail.com) + LangString TEXT_WelcomePage ${LANG_ENGLISH} "This setup will guide you through the installation of Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}.$\r$\n $\r$\nWith Hugin you can assemble a mosaic of photographs into a complete immersive panorama, stitch any series of overlapping pictures and much more." + LangString TEXT_PreReleaseWelcomePage ${LANG_ENGLISH} "IMPORTANT: This package is highly experimental alpha software. Use at your own risk.$\r$\n $\r$\nThis setup will guide you through the installation of Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}.$\r$\n $\r$\nWith Hugin you can assemble a mosaic of photographs into a complete immersive panorama, stitch any series of overlapping pictures and much more." + LangString TEXT_FinishPageLink ${LANG_ENGLISH} "Visit Hugin website" + + LangString TEXT_HuginExtracting ${LANG_ENGLISH} "Extracting Hugin package..." + LangString TEXT_HuginExtractDetails ${LANG_ENGLISH} "Installing Hugin ${HUGIN_VERSION} package %s..." + + LangString TEXT_HuginDocExtracting ${LANG_ENGLISH} "Extracting Hugin Documentation package..." + LangString TEXT_HuginDocExtractDetails ${LANG_ENGLISH} "Installing Hugin ${HUGIN_VERSION} Documentation package %s..." + + LangString DESC_SecHugin ${LANG_ENGLISH} "Hugin binary and other core files for image stitching, lens correction and merging.." + + LangString DESC_SecHuginDoc ${LANG_ENGLISH} "Install Hugin Documentation" + LangString TEXT_SecHuginDoc ${LANG_ENGLISH} "Documentation" + + LangString DESC_SecShortcuts ${LANG_ENGLISH} "Create program shortcuts" + LangString TEXT_SecShortcuts ${LANG_ENGLISH} "Shortcuts" + + LangString DESC_SecShortcutPrograms ${LANG_ENGLISH} "Create Hugin shortcuts in Start-Menu Programs" + LangString TEXT_SecShortcutPrograms ${LANG_ENGLISH} "Add to Start Menu" + + LangString DESC_SecShortcutDesktop ${LANG_ENGLISH} "Create Hugin shortcut on Desktop" + LangString TEXT_SecShortcutDesktop ${LANG_ENGLISH} "Add Desktop shortcut" + + LangString TEXT_ERROR_DownloadFailed ${LANG_ENGLISH} "Download failed: $0" + LangString TEXT_SecCleanRegistrySettings ${LANG_ENGLISH} "Clean Registry Settings" + LangString DESC_SecCleanRegistrySettings ${LANG_ENGLISH} "Clean Registry Settings" + \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/IT.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/IT.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Languages/IT.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Languages/IT.nsh 2016-11-22 17:16:47.000000000 +0000 @@ -0,0 +1,30 @@ + ;Italian Language strings (thepanz@gmail.com) + LangString TEXT_WelcomePage ${LANG_ITALIAN} "Questo programma vi guider nell'installazione di Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}.$\r$\n $\r$\nCon Hugin possibile assemblare un mosaico di fotografie in un panorama, unire una qualsiasi serie di immagini che si sovrappongono e molto altro ancora." + LangString TEXT_PreReleaseWelcomePage ${LANG_ITALIAN} "ATTENZIONE: Questo software in versione alfa altamente sperimentale. Usare a proprio rischio.$\r$\n $\r$\nQuesto programma vi guider nell'installazione di Hugin ${HUGIN_VERSION}-${HUGIN_VERSION_BUILD}.$\r$\n $\r$\nCon Hugin possibile assemblare un mosaico di fotografie in un panorama, unire una qualsiasi serie di immagini che si sovrappongono e molto altro ancora." + LangString TEXT_FinishPageLink ${LANG_ITALIAN} "Visita il sito di Hugin" + + LangString TEXT_HuginExtracting ${LANG_ITALIAN} "Estrazione di Hugin in corso..." + LangString TEXT_HuginExtractDetails ${LANG_ITALIAN} "Installazione di Hugin ${HUGIN_VERSION} in corso %s..." + + LangString TEXT_HuginDocExtracting ${LANG_ITALIAN} "Estrazione della documentazione di Hugin in corso..." + LangString TEXT_HuginDocExtractDetails ${LANG_ITALIAN} "Installazione della documentazione di Hugin ${HUGIN_VERSION} in corso %s..." + + LangString DESC_SecHugin ${LANG_ITALIAN} "File eseguibile di Hugin e altri file essenziali per l'unione delle immagini, la correzione degli obiettivi e la fusione..." + + LangString DESC_SecHuginDoc ${LANG_ITALIAN} "Installa la documentazione di Hugin" + LangString TEXT_SecHuginDoc ${LANG_ITALIAN} "Documentazione" + + LangString DESC_SecShortcuts ${LANG_ITALIAN} "Crea le scorciatoie del programma" + LangString TEXT_SecShortcuts ${LANG_ITALIAN} "Scorciatoie" + + LangString DESC_SecShortcutPrograms ${LANG_ITALIAN} "Crea le scorciatoie di Hugin nel menu Start" + LangString TEXT_SecShortcutPrograms ${LANG_ITALIAN} "Aggiungi al menu Start" + + LangString DESC_SecShortcutDesktop ${LANG_ITALIAN} "Crea un'icona di Hugin sul Desktop" + LangString TEXT_SecShortcutDesktop ${LANG_ITALIAN} "Aggiungi al Desktop" + + + LangString TEXT_ERROR_DownloadFailed ${LANG_ITALIAN} "Scaricamento non riuscito: $0" + LangString TEXT_SecCleanRegistrySettings ${LANG_ITALIAN} "Elimina le impostazioni dal registro di Windows" + LangString DESC_SecCleanRegistrySettings ${LANG_ITALIAN} "Elimina le impostazioni dal registro di Windows" + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano_IT.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano_IT.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano_IT.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano_IT.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,7 @@ +Licenza di Autopano: + + Questo software fornito solamente per un utilizzo non-commerciale. + + L'universit della British Columbia ha richiesto un bervetto per l'algoritmo +SIFT negli Stati Uniti. Le applicazioni commerciali di questo programma potrebbero +necessitare di una licenza dall'universit della British Columbia. diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Autopano.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1 @@ +Autopano License: This software is provided for non-commercial use only. The University of British Columbia has applied for a patent on the SIFT algorithm in the United States. Commercial applications of this software may require a license from the University of British Columbia. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/CMakeLists.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,7 @@ +# Install Files +INSTALL(FILES ControlPointDisclaimer_DE.txt + ControlPointDisclaimer_EN.txt + ControlPointDisclaimer_IT.txt + GPLv2.txt + Licenses.nsh + DESTINATION ${CMAKE_INSTALL_PREFIX}/../Licenses) \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_DE.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_DE.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_DE.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_DE.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,5 @@ +You have selected to download and install one or many additional software packages for Control Point Generation. + +Be aware that these packages are separate from Hugin. These packages may or may not be encumbered by patents in your residence's jurisdiction and they are subject to their own licenses. + +It is your responsibility to make sure that you are not infringing on any rights when installing and running these packages in your jurisdiction. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_EN.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_EN.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_EN.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_EN.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,5 @@ +You have selected to download and install one or many additional software packages for Control Point Generation. + +Be aware that these packages are separate from Hugin. These packages may or may not be encumbered by patents in your residence's jurisdiction and they are subject to their own licenses. + +It is your responsibility to make sure that you are not infringing on any rights when installing and running these packages in your jurisdiction. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_IT.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_IT.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_IT.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/ControlPointDisclaimer_IT.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,5 @@ +Si scelto di scaricare e installare uno dei pacchetti software aggiuntivi per la ricerca dei punti di controllo. + +Si avvisa che questi pacchetti sono separati da Hugin. Potrebbero o non potrebbero essere sottoposti a brevetto nella giurisdizione di residenza e sono soggetti alle rispettive licenze. + + responsabilit dell'utilizzatore accertare che non stia ingfrangendo la legge al momento dell'installazione e dell'esecuzione di questi pacchetti nella propria giurisdizione. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/GPLv2.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/GPLv2.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/GPLv2.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/GPLv2.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1 @@ + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Licenses.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Licenses.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Licenses.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Licenses.nsh 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,9 @@ +; Hugin Lincense +; LicenseLangString License_Hugin ${LANG_ENGLISH} "Licenses\GNUv2.txt" +; LicenseLangString License_Hugin ${LANG_GERMAN} "Licenses\GNUv2.txt" +; LicenseLangString License_Hugin ${LANG_ITALIAN} "Licenses\GNUv2.txt" + +; ControlPoint Disclaimer +LicenseLangString License_ControlPointDisclaimer ${LANG_ENGLISH} "Licenses\ControlPointDisclaimer_EN.txt" +LicenseLangString License_ControlPointDisclaimer ${LANG_GERMAN} "Licenses\ControlPointDisclaimer_DE.txt" +LicenseLangString License_ControlPointDisclaimer ${LANG_ITALIAN} "Licenses\ControlPointDisclaimer_IT.txt" \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic_IT.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic_IT.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic_IT.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic_IT.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1 @@ +Licenza di Pan-o-Matic: Pan-o-matic i distribuito nei termini della General Public Licence v2 (o successiva). Questo programma contiene una implementazione dell'algoritmo SIFT (Speeded Up Robust Features) sottoposta a brevetto. Usare sotto la propria responsabilit. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Licenses/Panomatic.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1 @@ +Pan-o-Matic License: Pan-o-matic is distributed under the terms of General Public Licence v2 (or later). Please note that this software contains an implementation of the patented SURF algorithm(Speeded Up Robust Features). Use at your own risk. \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,437 @@ + ;_____________________________ HEADER FILE BEGIN ____________________________ + + # Advanced Uninstall Log NSIS header + # Version 1.0 2007-01-31 + # By Red Wine (http://nsis.sf.net/User:Red_Wine) + + # Usage: See included examples Uninstall_Log_Default_UI.nsi - Uninstall_Log_Modern_UI.nsi + +!verbose push + !verbose 3 + +!ifndef ADVANCED_UNINSTALL.LOG_NSH + !define ADVANCED_UNINSTALL.LOG_NSH + +!ifndef INSTDIR_REG_ROOT | INSTDIR_REG_KEY + !error "You must properly define both INSTDIR_REG_ROOT and INSTDIR_REG_KEY" +!endif + +!ifndef UNINSTALL_LOG + !define UNINSTALL_LOG "Uninstall" +!endif + +!ifndef UNINST_LOG_VERBOSE + !define UNINST_LOG_VERBOSE "3" +!endif + +!verbose pop + +!echo "Advanced Uninstall Log NSIS header v1.0 2007-01-31 by Red Wine (http://nsis.sf.net/User:Red_Wine)" + +!verbose push + !verbose ${UNINST_LOG_VERBOSE} + +!define UNINST_EXE "$INSTDIR\${UNINSTALL_LOG}.exe" +!define UNINST_DAT "$INSTDIR\${UNINSTALL_LOG}.dat" +!define UNLOG_PART "$PLUGINSDIR\part." +!define UNLOG_TEMP "$PLUGINSDIR\unlog.tmp" +!define EXCLU_LIST "$PLUGINSDIR\exclude.tmp" +!define UNLOG_HEAD "=========== Uninstaller Log please do not edit this file ===========" + + var unlog_tmp_0 + var unlog_tmp_1 + var unlog_tmp_2 + var unlog_tmp_3 + var unlog_error + +!include FileFunc.nsh +!include TextFunc.nsh + +!insertmacro Locate +!insertmacro un.Locate +!insertmacro DirState +!insertmacro un.DirState +!insertmacro FileJoin +!insertmacro TrimNewLines +!insertmacro un.TrimNewLines + +;.............................. Uninstaller Macros .............................. + +!macro UNINSTALL.LOG_BEGIN_UNINSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + IfFileExists "${UNINST_DAT}" +3 + MessageBox MB_ICONSTOP|MB_OK "${UNINST_DAT} not found, unable to perform uninstall." /SD IDOK + Quit + + StrCmp "$PLUGINSDIR" "" 0 +2 + InitPluginsDir + + CopyFiles "${UNINST_DAT}" "${UNLOG_TEMP}" + FileOpen $unlog_tmp_2 "${UNLOG_TEMP}" r + + !verbose pop +!macroend + + +!macro UNINSTALL.LOG_END_UNINSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + FileClose $unlog_tmp_2 + DeleteRegValue ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}.dat" + DeleteRegValue ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory" + + !verbose pop +!macroend + + +!macro UNINSTALL.LOG_UNINSTALL TargetDir + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + !ifndef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL + !error "You must insert either Interactive or Unattended Uninstall neither both, neither none." + !endif + + !ifdef INTERACTIVE_UNINSTALL + GetTempFileName $unlog_tmp_5 "$PLUGINSDIR" + FileOpen $unlog_tmp_4 "$unlog_tmp_5" a + !endif + + ${PerfomUninstall} "${TargetDir}" "${UnLog_Uninstall_CallBackFunc}" + + !ifdef INTERACTIVE_UNINSTALL + FileClose $unlog_tmp_4 + !endif + + !verbose pop +!macroend + + +!define PerfomUninstall "!insertmacro PERFORMUNINSTALL" + +!macro PERFORMUNINSTALL TargetDir UninstCallBackFunc + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + !define ID ${__LINE__} + + ${un.Locate} "${TargetDir}" "/L=F" "${UninstCallBackFunc}" + + loop_${ID}: + + StrCpy $unlog_tmp_1 0 + + ${un.Locate} "${TargetDir}" "/L=DE" "${UninstCallBackFunc}" + StrCmp $unlog_tmp_1 "0" 0 loop_${ID} + + ${un.DirState} "${TargetDir}" $unlog_tmp_0 + StrCmp "$unlog_tmp_0" "0" 0 +2 + RmDir "${TargetDir}" + + IfErrors 0 +2 + MessageBox MB_ICONEXCLAMATION|MB_OK "${UNINSTALL_LOG} Log error" /SD IDOK + + !undef ID + + !verbose pop +!macroend + + +!macro INTERACTIVE_UNINSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + !ifdef INTERACTIVE_UNINSTALL + !error "INTERACTIVE_UNINSTALL is already defined" + !endif + + var unlog_tmp_4 + var unlog_tmp_5 + + !define INTERACTIVE_UNINSTALL + + !ifdef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL + !error "You must insert either Interactive or Unattended Uninstall neither both, neither none." + !endif + + !ifdef UnLog_Uninstall_CallBackFunc + !undef UnLog_Uninstall_CallBackFunc + !endif + + !ifndef UnLog_Uninstall_CallBackFunc + !insertmacro UNINSTALL.LOG_UNINSTALL_INTERACTIVE + !define UnLog_Uninstall_CallBackFunc "un._LocateCallBack_Function_Interactive" + !endif + + !verbose pop +!macroend + + +!macro UNATTENDED_UNINSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + !ifdef UNATTENDED_UNINSTALL + !error "UNATTENDED_UNINSTALL is already defined" + !endif + + !define UNATTENDED_UNINSTALL + + !ifdef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL + !error "You must insert either Interactive or Unattended Uninstall neither both, neither none." + !endif + + !ifdef UnLog_Uninstall_CallBackFunc + !undef UnLog_Uninstall_CallBackFunc + !endif + + !ifndef UnLog_Uninstall_CallBackFunc + !insertmacro UNINSTALL.LOG_UNINSTALL_UNATTENDED + !define UnLog_Uninstall_CallBackFunc "un._LocateCallBack_Function_Unattended" + !endif + + !verbose pop +!macroend + + +!macro UNINSTALL.LOG_UNINSTALL_UNATTENDED + + Function un._LocateCallBack_Function_Unattended + start: + FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN} + ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3" + StrCmp "$unlog_tmp_3" "$R9" islog + IfErrors nolog + goto start + + islog: + IfFileExists "$R9\*.*" isdir + + isfile: + Delete "$R9" + goto end + + isdir: + RmDir "$R9" + IntOp $unlog_tmp_1 $unlog_tmp_1 + 1 + goto end + + nolog: + ClearErrors + StrCmp "$R9" "${UNINST_EXE}" isfile + StrCmp "$R9" "${UNINST_DAT}" isfile + + end: + FileSeek $unlog_tmp_2 0 SET + Push $unlog_tmp_0 + FunctionEnd + +!macroend + + +!macro UNINSTALL.LOG_UNINSTALL_INTERACTIVE + + Function un._LocateCallBack_Function_Interactive + start: + FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN} + ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3" + StrCmp "$unlog_tmp_3" "$R9" islog + IfErrors nolog + goto start + + islog: + IfFileExists "$R9\*.*" isdir + + isfile: + Delete "$R9" + goto end + + isdir: + RmDir "$R9" + IntOp $unlog_tmp_1 $unlog_tmp_1 + 1 + goto end + + nolog: + ClearErrors + FileSeek $unlog_tmp_4 0 SET + read: + FileRead $unlog_tmp_4 "$unlog_tmp_3" + ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3" + StrCmp "$unlog_tmp_3" "$R9" end + IfErrors +2 + goto read + ClearErrors + StrCmp "$R9" "${UNINST_EXE}" isfile + StrCmp "$R9" "${UNINST_DAT}" isfile + IfFileExists "$R9\*.*" msgdir + + MessageBox MB_ICONQUESTION|MB_YESNO \ + 'Delete File "$R9"?' /SD IDNO IDYES isfile IDNO nodel + + msgdir: + MessageBox MB_ICONQUESTION|MB_YESNO \ + 'Delete Directory "$R9"?' /SD IDNO IDYES isdir IDNO nodel + + nodel: + FileSeek $unlog_tmp_4 0 END + FileWrite $unlog_tmp_4 "$R9$\r$\n" + + end: + FileSeek $unlog_tmp_2 0 SET + Push $unlog_tmp_0 + FunctionEnd + +!macroend + +;................................. Installer Macros ................................. + +!macro UNINSTALL.LOG_INSTALL_UNATTENDED + + Function _LocateCallBack_Function_Install + loop: + FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN} + ${TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3" + IfErrors 0 +4 + ClearErrors + FileSeek $unlog_tmp_2 0 SET + goto next + StrCmp "$R9" "$unlog_tmp_3" end + goto loop + next: + FileWrite $unlog_tmp_1 "$R9$\r$\n" + end: + Push $unlog_tmp_0 + FunctionEnd + +!macroend + + +!ifdef UnLog_Install_Func_CallBack + !undef UnLog_Install_Func_CallBack +!endif + +!ifndef UnLog_Install_Func_CallBack + !insertmacro UNINSTALL.LOG_INSTALL_UNATTENDED + !define UnLog_Install_Func_CallBack "_LocateCallBack_Function_Install" +!endif + + +!macro UNINSTALL.LOG_PREPARE_INSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + Push $0 + Push $1 + ClearErrors + ReadRegStr "$0" ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory" + IfErrors next + ${DirState} "$0" $1 + StrCmp "$1" "-1" next + StrCmp "$1" "0" next + IfFileExists "$0\${UNINSTALL_LOG}.dat" next + MessageBox MB_ICONEXCLAMATION|MB_OK \ + "Previous installation detected at $0.$\n\ + Required file ${UNINSTALL_LOG}.dat is missing.$\n$\nIt is highly recommended \ + to select an empty directory and perform a fresh installation." /SD IDOK + StrCpy $unlog_error "error" + + next: + ClearErrors + StrCmp "$PLUGINSDIR" "" 0 +2 + InitPluginsDir + + GetTempFileName "$1" + FileOpen $0 "$1" w + FileWrite $0 "${UNLOG_HEAD}$\r$\n" + FileClose $0 + Rename "$1" "${UNLOG_TEMP}" + Pop $1 + Pop $0 + + !verbose pop +!macroend + + +!macro UNINSTALL.LOG_UPDATE_INSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + Delete "${UNINST_DAT}" + Rename "${UNLOG_TEMP}" "${UNINST_DAT}" + WriteUninstaller "${UNINST_EXE}" + WriteRegStr ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}.dat" "${UNINST_DAT}" + WriteRegStr ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory" "$INSTDIR" + + !verbose pop +!macroend + + +!define uninstall.log_install "!insertmacro UNINSTALL.LOG_INSTALL" + +!macro UNINSTALL.LOG_INSTALL FileOpenWrite FileOpenRead TargetDir + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + FileOpen $unlog_tmp_1 "${FileOpenWrite}" w + FileOpen $unlog_tmp_2 "${FileOpenRead}" r + + ${Locate} "${TargetDir}" "/L=FD" "${UnLog_Install_Func_CallBack}" + + StrCmp $unlog_error "error" 0 +2 + ClearErrors + + IfErrors 0 +2 + MessageBox MB_ICONEXCLAMATION|MB_OK "Error creating ${UNINSTALL_LOG} Log." /SD IDOK + + FileClose $unlog_tmp_1 + FileClose $unlog_tmp_2 + + !verbose pop +!macroend + + +!define uninstall.log_mergeID "!insertmacro UNINSTALL.LOG_MERGE" + +!macro UNINSTALL.LOG_MERGE UnlogPart + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + ${FileJoin} "${UNLOG_TEMP}" "${UnlogPart}" "${UNLOG_TEMP}" + + !verbose pop +!macroend + + +!macro UNINSTALL.LOG_OPEN_INSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + StrCmp $unlog_error "error" +2 + ${uninstall.log_install} "${EXCLU_LIST}" "${UNINST_DAT}" "$OUTDIR" + + !verbose pop +!macroend + + +!macro UNINSTALL.LOG_CLOSE_INSTALL + !verbose push + !verbose ${UNINST_LOG_VERBOSE} + + !define ID ${__LINE__} + + ${uninstall.log_install} "${UNLOG_PART}${ID}" "${EXCLU_LIST}" "$OUTDIR" + ${uninstall.log_mergeID} "${UNLOG_PART}${ID}" + + !undef ID ${__LINE__} + + !verbose pop +!macroend + +!endif + +!verbose pop + ;_____________________________ HEADER FILE END ____________________________ + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,121 @@ +Overview + +Advanced Uninstall Log for NSIS was born in the need to cover a specific gap. +It's been discussed fairly enough that the File /r command is very useful +in cases when developers want to add a huge amount of sub directories and +files, nevertheless it has the disadvantage that such an installation should +be uninstalled with RmDir /r which is risky and removes also data that has +been added/created later within the installation folder. + + + + +About Advanced Uninstall Log. + +Advanced Uninstall Log is a macro system provided in a NSIS header that +is able to monitor an installation and build an uninstall log file which +is used by the uninstaller to uninstall files/directories that have been +added within specific installation blocks. + +This means that files which have been installed outside these blocks, +or added later either by the user or application's activities, ignored +by the uninstaller. + +Moreover files that might exist into the target directory prior the current +installation, ignored as well. + +Advanced Uninstall Log creates an uninstall log that removes only files that +have been installed and optionally interacts with users for every other file +and/or directory has found in installation folder and requires permission to +remove these files/directories. + +It is enhanced as well to support updates, e.g. if the installer later would +update the installation by adding new data, the uninstaller would remove the +new data that has been added by the installer, without bothering users about. + + + + +Features + +If target installation folder exists and contains files and/or directories +they all preserved from being uninstalled. + +Uninstaller removes data that has been added within specific installation +blocks, preserving all other data that has been created/added outside of +these installation blocks. See included examples for details. + +Supports unlimited updates/reinstallations. + +Supports two uninstaller modes. Interactive mode requires confirmation +to remove every other file exept those files that have been installed. +Unattended mode leaves intact every other file without bothering users. + +In case when uninstall log (uninstall.dat) has been removed manually instead +of execute uninstaller, if users attempt to run the installer later, a warning +issued that they should select a new output folder. + +Implements only the included with NSIS release headers FileFunc and TextFunc. +There is no need for external plugins and headers, adds a very small overhead. + + + + +Restrictions + +If uninstall log (uninstall.dat) is missing uninstaller won't execute at all. + +Due to file create - write procedure that is required in order to add/update +the uninstall log (uninstall.dat), restricted users on NT based systems won't +be able to execute the installer. + + + + +Disadvantage + +Since the header does not implement anything else than the common NSIS release, +a delay occurs while builds and reads the uninstall log because it needs to +throw the list several times. Talking for common cases, most likely the delay +won't be noticeable, however, in cases where the target directory isn't empty +and contains a large amount of data which will be excluded from uninstall log, +or added large amount of data after the installation which will be excluded also, +the delay should be noticeable. + + + + +Credits + +A very big thanks goes to kichik. +When my idea of the Advanced Uninstall Log became an NSIS header, it was +indeed an amateur's attempt to write a flexible and errors free NSIS header. +Kichik dropped me a dozen of suggestions helping me to achieve my plan. +However, his main suggestion to eliminate the mentioned above disadvantage, +still remains untouched by me. + + + + +License + +This header file is provided 'as-is', without any express or implied warranty. +In no event will the author be held liable for any damages arising from the use +of this header file. + +Permission is granted to anyone to use this header file for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + + 1. The origin of this header file must not be misrepresented; + you must not claim that you wrote the original header file. + If you use this header file in a product, an acknowledgment in + the product documentation would be appreciated but is not required. + + 2. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original header file. + + 3. This notice may not be removed or altered from any distribution. + + +eof \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Plugins/CMakeLists.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Plugins/CMakeLists.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/Plugins/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/Plugins/CMakeLists.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,3 @@ +# Install Files +INSTALL(FILES AdvUninstLog.nsh + DESTINATION ${CMAKE_INSTALL_PREFIX}/../Plugins) \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/platforms/windows/huginsetup/TODO.txt hugin-2019.0.0+dfsg/platforms/windows/huginsetup/TODO.txt --- hugin-2018.0.0+dfsg/platforms/windows/huginsetup/TODO.txt 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/huginsetup/TODO.txt 2011-07-17 08:39:20.000000000 +0000 @@ -0,0 +1,3 @@ +ToDo list: + + \ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/windows/wix/big_banner.bmp and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/windows/wix/big_banner.bmp differ diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/filetype.wxs hugin-2019.0.0+dfsg/platforms/windows/wix/filetype.wxs --- hugin-2018.0.0+dfsg/platforms/windows/wix/filetype.wxs 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/filetype.wxs 2016-05-08 18:26:25.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/filetype.xml hugin-2019.0.0+dfsg/platforms/windows/wix/filetype.xml --- hugin-2018.0.0+dfsg/platforms/windows/wix/filetype.xml 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/filetype.xml 2016-05-08 18:26:25.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + + = 600)]]> + + + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc14_x64.wxs hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc14_x64.wxs --- hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc14_x64.wxs 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc14_x64.wxs 2016-05-08 18:26:25.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc14_x86.wxs hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc14_x86.wxs --- hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc14_x86.wxs 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc14_x86.wxs 2016-05-08 18:26:25.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc15_x64.wxs hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc15_x64.wxs --- hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc15_x64.wxs 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc15_x64.wxs 2019-01-26 08:39:29.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc15_x86.wxs hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc15_x86.wxs --- hugin-2018.0.0+dfsg/platforms/windows/wix/redist_vc15_x86.wxs 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/redist_vc15_x86.wxs 2019-01-26 08:40:01.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -Nru hugin-2018.0.0+dfsg/platforms/windows/wix/redist.xml hugin-2019.0.0+dfsg/platforms/windows/wix/redist.xml --- hugin-2018.0.0+dfsg/platforms/windows/wix/redist.xml 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/platforms/windows/wix/redist.xml 2016-05-08 18:26:25.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + = 600)]]> + + + Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/platforms/windows/wix/top_banner.bmp and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/platforms/windows/wix/top_banner.bmp differ diff -Nru hugin-2018.0.0+dfsg/README hugin-2019.0.0+dfsg/README --- hugin-2018.0.0+dfsg/README 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/README 2018-10-31 14:42:07.000000000 +0000 @@ -93,67 +93,7 @@ http://panotools.sourceforge.net/ -3. DEPENDENCIES - -Hugin is work in progress and dependencies can be added any time. - -Hugin depends on the following packages. The list may be -incomplete, and there may be some platform-specific dependencies. - -For the latest updates, check -http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies - - -3.1. Build-Time Dependencies - -Users compiling Hugin from source will need: - - A C++compiler which supports OpenMP and C++11. - * OpenMP support is not required. But when compiling - without OpenMP nona and cpfind (and some other - algorithm) are running only with one thread, - which is slower. - - The wxWidgets GUI toolkit version >=3.0.0. - C++17 TS or boost::filesystem (boost >=1.47) - libtiff the TIFF library with LZW support. - libpano13 version >=2.9.19 - libjpg the JPEG library - libpng the PNG library - libopenexr the OpenEXR library - libvigra the VIGRA libray, header files and impex library (>=1.9) - Exiv2 Image metadata library - GLEW the OpenGL Extension Wrangler Library - gettext - sqlite3, the SQL database backend for the lens database - littlecms2, little cms color engine - optionally, lapack - optionally, libfftw3 - on Unix you need also - libGLU the OpenGL utility library - libxi - libxmu - on Windows you need - HTML Help Workshop for generating compiled HTML help file - on Mac OS you need - freeglut or glut, the OpenGL utility toolkit - for the optional Python Scripting Interface (currently functional and tested only on Linux and Windows) - Python version >=2.6 - SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4 - Hugin can be compiled with gcc, as well as with MSVC. - The build process requires CMake version >=3.1 - - -3.2. At runtime - - enblend >= 3.2 is required. - Exiftool, version >=9.09 is required to support GPano tags. Otherwise they are ignored. - - Starting with Hugin 2010.3 and newer, Hugin ships with its own control points generator cpfind. Prior to 2010.3 another optional but recommended runtime dependency was a control points generator. - Optionally Python argparse command-line parsing library for the Python scripts. - - -4. USE +3. USE hugin can be used to stitch multiple images together. The resulting image can span 360 degrees. Another common use is the creation of very high resolution @@ -165,7 +105,7 @@ for some information on releases for different platforms. -5. TYPICAL WORKFLOW +4. TYPICAL WORKFLOW 1. load images 2. specify initial parameters (lens etc) @@ -174,7 +114,7 @@ 5. set output parameters and stitch images together. -6. KNOWN ISSUES / INCOMPATIBILITIES / LIMITATIONS +5. KNOWN ISSUES / INCOMPATIBILITIES / LIMITATIONS Check the Hugin FAQ and bug tracker diff -Nru hugin-2018.0.0+dfsg/rev.txt hugin-2019.0.0+dfsg/rev.txt --- hugin-2018.0.0+dfsg/rev.txt 2018-01-26 16:31:15.000000000 +0000 +++ hugin-2019.0.0+dfsg/rev.txt 2019-03-23 08:27:46.000000000 +0000 @@ -1 +1 @@ -5abfb4de7961 \ No newline at end of file +a369cbe55179 \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/celeste/Main.cpp hugin-2019.0.0+dfsg/src/celeste/Main.cpp --- hugin-2018.0.0+dfsg/src/celeste/Main.cpp 2017-04-22 17:02:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/celeste/Main.cpp 2018-02-03 14:34:23.000000000 +0000 @@ -390,7 +390,7 @@ for(unsigned int i=0;i0 || mask) + if(!cps.empty() || mask) { try { @@ -400,10 +400,10 @@ { continue; }; - if(cps.size()>0) + if(!cps.empty()) { HuginBase::UIntSet cloudCP = celeste::getCelesteControlPoints(model, in, cps, radius, threshold, resize_dimension); - if(cloudCP.size()>0) + if(!cloudCP.empty()) { for (HuginBase::UIntSet::reverse_iterator it = cloudCP.rbegin(); it != cloudCP.rend(); ++it) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.cpp 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.cpp 2019-02-04 17:11:19.000000000 +0000 @@ -21,6 +21,7 @@ * */ +#include "base_wx/platform.h" #include "AssistantExecutor.h" #include @@ -29,7 +30,6 @@ #include #include "hugin_utils/utils.h" #include "algorithms/optimizer/ImageGraph.h" -#include "base_wx/platform.h" #include "base_wx/wxPlatform.h" #include "hugin/config_defaults.h" @@ -91,7 +91,7 @@ { const HuginBase::CPVector allCP = pano.getCtrlPoints(); bool hasVerticalLines = false; - if (allCP.size() > 0) + if (!allCP.empty()) { for (size_t i = 0; i < allCP.size() && !hasVerticalLines; i++) { @@ -128,21 +128,21 @@ return commands; } - CommandQueue * GetAssistantCommandQueueUserDefined(const HuginBase::Panorama & pano, const wxString & ExePath, const wxString & project, const wxString & assistantSetting) + CommandQueue * GetAssistantCommandQueueUserDefined(const HuginBase::Panorama & pano, const wxString & ExePath, const wxString & project, const wxString & assistantSetting, wxArrayString& tempFilesDelete, std::ostream& errStream) { CommandQueue* commands = new CommandQueue; const wxString quotedProject(wxEscapeFilename(project)); if (pano.getNrOfImages()==0) { - std::cerr << "ERROR: Project contains no images. Nothing to do." << std::endl; + errStream << "ERROR: Project contains no images. Nothing to do." << std::endl; return commands; }; const wxString quotedImage0(wxEscapeFilename(wxString(pano.getImage(0).getFilename().c_str(), HUGIN_CONV_FILENAME))); wxFileInputStream input(assistantSetting); if (!input.IsOk()) { - std::cerr << "ERROR: Can not open file \"" << assistantSetting.mb_str(wxConvLocal) << "\"." << std::endl; + errStream << "ERROR: Can not open file \"" << assistantSetting.mb_str(wxConvLocal) << "\"." << std::endl; return commands; } wxFileConfig settings(input); @@ -150,7 +150,7 @@ settings.Read(wxT("/General/StepCount"), &stepCount, 0); if (stepCount == 0) { - std::cerr << "ERROR: User-setting does not define any assistant steps." << std::endl; + errStream << "ERROR: User-setting does not define any assistant steps." << std::endl; return commands; }; // create some condition variables @@ -172,6 +172,7 @@ }; }; }; + wxString imageListFile; for (size_t i = 0; i < stepCount; ++i) { @@ -179,7 +180,7 @@ stepString << i; if (!settings.HasGroup(stepString)) { - std::cerr << "ERROR: Assistant specifies " << stepCount << " steps, but step " << i << " is missing in configuration." << std::endl; + errStream << "ERROR: Assistant specifies " << stepCount << " steps, but step " << i << " is missing in configuration." << std::endl; CleanQueue(commands); return commands; } @@ -206,7 +207,7 @@ const wxString progName = GetSettingString(&settings, wxT("Program")); if (progName.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no program name specified." << std::endl; + errStream << "ERROR: Step " << i << " has no program name specified." << std::endl; CleanQueue(commands); return commands; }; @@ -222,12 +223,31 @@ wxString args = GetSettingString(&settings, wxT("Arguments")); if (args.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no arguments given." << std::endl; + errStream << "ERROR: Step " << i << " has no arguments given." << std::endl; CleanQueue(commands); return commands; } args.Replace("%project%", quotedProject, true); args.Replace("%image0%", quotedImage0, true); + // build image list file if needed + if (imageListFile.IsEmpty() && args.Find("%imagelist%") != wxNOT_FOUND) + { + wxFileName tempImageList(wxFileName::CreateTempFileName(GetConfigTempDir(wxConfig::Get()) + wxT("hi"))); + imageListFile = tempImageList.GetFullPath(); + tempFilesDelete.Add(imageListFile); + wxFFileOutputStream outputStream(imageListFile); + wxTextOutputStream outputFile(outputStream); + // write image list file + for (auto i = 0; i < pano.getNrOfImages(); ++i) + { + outputFile << wxString(pano.getImage(i).getFilename().c_str(), HUGIN_CONV_FILENAME) << endl; + } + outputFile.Flush(); + }; + if (!imageListFile.IsEmpty()) + { + args.Replace("%imagelist%", wxEscapeFilename(imageListFile)); + }; const wxString description = GetSettingString(&settings, wxT("Description")); commands->push_back(new NormalCommand(prog, args, description)); } diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.h 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/AssistantExecutor.h 2019-02-04 16:58:39.000000000 +0000 @@ -42,9 +42,10 @@ @param[in] ExePath base path to all used utilities @param[in] project name of the project file, the assistant modifies the given file @param[in] assistantSetting assistant file from which the settings should be reads + @param errStream output stream on which the error should be written @return pointer to CommandQueue */ - WXIMPEX CommandQueue* GetAssistantCommandQueueUserDefined(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& assistantSetting); + WXIMPEX CommandQueue* GetAssistantCommandQueueUserDefined(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& assistantSetting, wxArrayString& tempFilesDelete, std::ostream& errStream); }; // namespace #endif diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/Executor.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/Executor.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/Executor.cpp 2018-01-26 16:28:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/Executor.cpp 2019-02-04 16:49:01.000000000 +0000 @@ -216,6 +216,18 @@ #ifdef __WXMSW__ // on Windows assume prog is bundled in program dir return bindir + name; +#elif defined UNIX_SELF_CONTAINED_BUNDLE + // for AppImage check if program is in it + if (wxFileName::FileExists(bindir + name)) + { + // program found in AppImage, so return path in AppImage + return bindir + name; + } + else + { + // not in AppImage, assume it is in PATH of user + return name; + }; #else // on Unix simply return name, assume it is in the path return name; @@ -273,4 +285,18 @@ return s; }; +/** return the temp dir from the preferences, ensure that it ends with path separator */ +const wxString GetConfigTempDir(const wxConfigBase* config) +{ + wxString tempDir = config->Read(wxT("tempDir"), wxT("")); + if (!tempDir.IsEmpty()) + { + if (tempDir.Last() != wxFileName::GetPathSeparator()) + { + tempDir.Append(wxFileName::GetPathSeparator()); + } + }; + return tempDir; +}; + }; // namespace diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/Executor.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/Executor.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/Executor.h 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/Executor.h 2019-02-04 16:48:51.000000000 +0000 @@ -50,7 +50,7 @@ }; /** optional command for queue, processing of queue is always continued, also if an error occurred */ - class OptionalCommand : public NormalCommand + class WXIMPEX OptionalCommand : public NormalCommand { public: OptionalCommand(wxString prog, wxString args, wxString comment=wxEmptyString) : NormalCommand(prog, args, comment) {}; @@ -96,6 +96,9 @@ /** read a string from setting and remove all whitespaces */ WXIMPEX const wxString GetSettingString(wxConfigBase* setting, const wxString& name, const wxString defaultValue = wxEmptyString); + /** return the temp dir from the preferences, ensure that it ends with path separator */ + WXIMPEX const wxString GetConfigTempDir(const wxConfigBase* config); + }; //namespace #endif diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/HFOVDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/HFOVDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/HFOVDialog.cpp 2017-04-22 17:02:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/HFOVDialog.cpp 2019-02-11 17:23:24.000000000 +0000 @@ -305,10 +305,6 @@ t.y = const_map_get(lens.variables,"Vy").getValue(); m_srcImg.setRadialVigCorrCenterShift(t); -// m_srcImg.setExposureValue(const_map_get(vars,"Eev").getValue()); - m_srcImg.setWhiteBalanceRed(const_map_get(lens.variables,"Er").getValue()); - m_srcImg.setWhiteBalanceBlue(const_map_get(lens.variables,"Eb").getValue()); - std::vector resp(5); resp[0] = const_map_get(lens.variables,"Ra").getValue(); resp[1] = const_map_get(lens.variables,"Rb").getValue(); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/huginConfig.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/huginConfig.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/huginConfig.cpp 2015-05-10 06:52:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/huginConfig.cpp 2018-12-22 11:53:22.000000000 +0000 @@ -24,10 +24,9 @@ * */ +#include "platform.h" #include "huginConfig.h" - #include "hugin/config_defaults.h" -#include "platform.h" // functions to handle with default project/output filenames typedef std::map Placeholdersmap; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/LensTools.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/LensTools.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/LensTools.cpp 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/LensTools.cpp 2019-02-11 17:52:56.000000000 +0000 @@ -130,8 +130,8 @@ const char ** varname = HuginBase::Lens::variableNames; while (*varname) { - //ignore exposure value and hfov, hfov is separately handled by the code above - if (std::string(*varname) == "Eev" || std::string(*varname) == "v") + //ignore hfov, hfov is separately handled by the code above + if (std::string(*varname) == "v") { varname++; continue; @@ -188,7 +188,7 @@ vars[i]=pano->getImageVariables(*it); for (HuginBase::LensVarMap::iterator it2 = lens.variables.begin(); it2 != lens.variables.end(); ++it2) { - if(it2->second.getName()=="EeV") + if (it2->second.getName() == "Eev" || it2->second.getName() == "Er" || it2->second.getName() == "Eb") { continue; }; @@ -205,7 +205,7 @@ std::set unlinkedVariables; for (HuginBase::LensVarMap::iterator it = lens.variables.begin(); it != lens.variables.end(); ++it) { - if(it->second.getName()=="EeV") + if(it->second.getName()=="Eev" || it->second.getName() == "Er" || it->second.getName() == "Eb") { continue; }; @@ -321,11 +321,6 @@ // loop to load lens variables const char ** varname = HuginBase::Lens::variableNames; while (*varname) { - if (std::string(*varname) == "Eev") - { - varname++; - continue; - } wxString key(wxT("Lens/")); key.append(wxString(*varname, wxConvLocal)); d = 0; @@ -470,5 +465,113 @@ return false; }; }; +} + +namespace FormatString +{ +wxString GetExifDateTime(const HuginBase::SrcPanoImage* img) +{ + wxString s; + struct tm exifdatetime; + if (img->getExifDateTime(&exifdatetime) == 0) + { + wxDateTime s_datetime = wxDateTime(exifdatetime); + s = s_datetime.Format(); + } + else + { + s = wxString(img->getExifDate().c_str(), wxConvLocal); + } + return s; +} + +wxString GetFocalLength(const HuginBase::SrcPanoImage* img) +{ + wxString s; + if (img->getExifFocalLength() > 0.0) + { + if (img->getExifFocalLength35() > 0.0) + { + s = wxString::Format(wxT("%0.1f mm (%0.0f mm)"), img->getExifFocalLength(), img->getExifFocalLength35()); + } + else + { + s = wxString::Format(wxT("%0.1f mm"), img->getExifFocalLength()); + }; + } + else + { + s = wxEmptyString; + }; + return s; }; +wxString GetAperture(const HuginBase::SrcPanoImage* img) +{ + wxString s; + if (img->getExifAperture() > 0) + { + s = wxString::Format(wxT("F%.1f"), img->getExifAperture()); + } + else + { + s = wxEmptyString; + }; + return s; +}; + +wxString GetExposureTime(const HuginBase::SrcPanoImage* img) +{ + wxString s; + const double exposureTime = img->getExifExposureTime(); + if (exposureTime > 0.5) + { + if (exposureTime >= 1.0) + { + if (exposureTime >= 10.0) + { + s = wxString::Format(wxT("%3.0f s"), exposureTime); + } + else + { + s = wxString::Format(wxT("%1.1f s"), exposureTime); + } + } + else + { + s = wxString::Format(wxT("%1.2f s"), exposureTime); + } + } + else + { + if (exposureTime > 1e-9) + { + s = wxString::Format(wxT("1/%0.0f s"), 1.0 / exposureTime); + } + else + { + //Sanity + s = wxEmptyString; + } + } + return s; +}; + +wxString GetIso(const HuginBase::SrcPanoImage* img) +{ + wxString s; + if (img->getExifISO() > 0) + { + s = wxString::Format(wxT("%0.0f"), img->getExifISO()); + } + else + { + s = wxEmptyString; + }; + return s; +}; + +}; + + + diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/LensTools.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/LensTools.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/LensTools.h 2015-05-10 06:52:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/LensTools.h 2019-01-27 09:44:59.000000000 +0000 @@ -80,4 +80,18 @@ * @returns true, if all conditions are satisfied, false if user selected cancel in dialog box */ WXIMPEX bool CheckLensStacks(HuginBase::Panorama* pano, bool allowCancel); +namespace FormatString +{ +/** returns Exif DateTimeOriginal as formatted wxString */ +WXIMPEX wxString GetExifDateTime(const HuginBase::SrcPanoImage* img); +/** return focallength and focallength 35 mm as wxString */ +WXIMPEX wxString GetFocalLength(const HuginBase::SrcPanoImage* img); +/** returns formatted aperture value */ +WXIMPEX wxString GetAperture(const HuginBase::SrcPanoImage* img); +/** returns formatted exposure time */ +WXIMPEX wxString GetExposureTime(const HuginBase::SrcPanoImage* img); +/** returns formatted iso value */ +WXIMPEX wxString GetIso(const HuginBase::SrcPanoImage* img); +}; + #endif // LENSTOOLS_H diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2017-04-22 17:02:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2018-07-13 17:55:10.000000000 +0000 @@ -61,7 +61,7 @@ // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -DEFINE_EVENT_TYPE(EVT_QUEUE_PROGRESS) +wxDEFINE_EVENT(EVT_QUEUE_PROGRESS, wxCommandEvent); BEGIN_EVENT_TABLE(MyExecPanel, wxPanel) EVT_TIMER(wxID_ANY, MyExecPanel::OnTimer) @@ -354,7 +354,7 @@ if (c == '\b') { lastCR=false; // backspace - if (currLine.size() > 0) { + if (!currLine.empty()) { if (currLine.Last() != wxChar('\n') ) currLine.Trim(); } @@ -364,7 +364,7 @@ // back to start of line if (currLine.Last() != wxChar('\n') ) { currLine = currLine.BeforeLast('\n'); - if(currLine.size() > 0) { + if(!currLine.empty()) { currLine.Append('\n'); } } @@ -378,7 +378,7 @@ // back to start of line if (currLine.Last() != wxChar('\n') ) { currLine = currLine.BeforeLast('\n'); - if(currLine.size() > 0) { + if(!currLine.empty()) { currLine.Append('\n'); } } @@ -502,6 +502,16 @@ m_textctrl->Copy(); }; +wxArrayString MyExecPanel::GetLogAsArrayString() +{ + wxArrayString output; + for (size_t i = 0; i < m_textctrl->GetNumberOfLines(); ++i) + { + output.push_back(m_textctrl->GetLineText(i)); + } + return output; +}; + void MyExecPanel::AddString(const wxString& s) { if (!s.IsEmpty()) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2018-07-13 17:55:14.000000000 +0000 @@ -76,6 +76,8 @@ bool SaveLog(const wxString &filename); /** copy the content of the log window into the clipboard */ void CopyLogToClipboard(); + /** returns the output */ + wxArrayString GetLogAsArrayString(); /** display the string in the panel */ void AddString(const wxString& s); @@ -162,6 +164,6 @@ DECLARE_EVENT_TABLE() }; -DECLARE_EXPORTED_EVENT_TYPE(WXIMPEX, EVT_QUEUE_PROGRESS, -1) +wxDECLARE_EXPORTED_EVENT(WXIMPEX, EVT_QUEUE_PROGRESS, wxCommandEvent); #endif diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/PanoCommand.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/PanoCommand.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/PanoCommand.cpp 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/PanoCommand.cpp 2018-02-03 14:34:23.000000000 +0000 @@ -458,7 +458,7 @@ bool NewPartCmd::processPanorama(HuginBase::Panorama& pano) { // unlink all the variables in the first image. - DEBUG_ASSERT(image_numbers.size() > 0); + DEBUG_ASSERT(!image_numbers.empty()); unsigned int image_index = *image_numbers.begin(); for (std::set::iterator it = vars.begin(); it != vars.end(); ++it) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/platform.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/platform.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/platform.cpp 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/platform.cpp 2019-02-02 10:11:01.000000000 +0000 @@ -27,6 +27,98 @@ #include "platform.h" #include +#include + +/** return vector of known extensions of raw files */ +std::vector GetRawExtensions() +{ + std::vector rawExt{ "dng", "crw", "cr2","cr3","raw","erf","raf","mrw","nef","orf","rw2","pef","srw","arw" }; + return rawExt; +}; + +/** build filter string "*.ext", adds also upper case version for UNIX paths when needed */ +wxString GetFilterExtensions(const wxString& ext) +{ + wxString extensionString("*."); + extensionString.Append(ext); + if (wxFileName::IsCaseSensitive()) + { + extensionString.Append(";*.").Append(ext.Upper()); + }; + return extensionString; +}; + +wxString GetVigraImageFilter() +{ + wxString filterString; + const std::string extensions = vigra::impexListExtensions(); + std::vector exts = hugin_utils::SplitString(extensions, " "); + if (exts.empty()) + { + // if something goes wrong, add some defaults + exts.push_back("tif"); + exts.push_back("tiff"); + exts.push_back("jpg"); + exts.push_back("jpeg"); + exts.push_back("png"); + } + filterString.Append(_("All Image files")).Append("|"); + for (auto& ext : exts) + { + filterString.Append(GetFilterExtensions(ext)).Append(";"); + }; + // remove last character == ";" + filterString.RemoveLast(); + filterString.Append("|"); + return filterString; +}; + +wxString GetFileDialogImageFilters() +{ + wxString filterString=GetVigraImageFilter(); + filterString.Append(_("JPEG files (*.jpg,*.jpeg)")).Append("|").Append(GetFilterExtensions("jpg")).Append(";").Append(GetFilterExtensions("jpeg")); + filterString.Append("|").Append(_("TIFF files (*.tif,*.tiff)")).Append("|").Append(GetFilterExtensions("tif")).Append(";").Append(GetFilterExtensions("tiff")); + filterString.Append("|").Append(_("PNG files (*.png)")).Append("|").Append(GetFilterExtensions("png")); + filterString.Append("|").Append(_("HDR files (*.hdr)")).Append("|").Append(GetFilterExtensions("hdr")); + filterString.Append("|").Append(_("EXR files (*.exr)")).Append("|").Append(GetFilterExtensions("exr")); + filterString.Append("|").Append(_("All files (*)")).Append("|*"); + return filterString; +} + +wxString GetFileDialogImageAndRawFilters() +{ + wxString filterString = GetVigraImageFilter(); + // now the raw formats + std::vector exts = GetRawExtensions(); + filterString.Append(_("Raw files")).Append("|"); + for (auto& ext : exts) + { + filterString.Append(GetFilterExtensions(ext)).Append(";"); + }; + // remove last character == ";" + filterString.RemoveLast(); + filterString.Append("|"); + // now add some image format at its own + filterString.Append(_("JPEG files (*.jpg,*.jpeg)")).Append("|").Append(GetFilterExtensions("jpg")).Append(";").Append(GetFilterExtensions("jpeg")); + filterString.Append("|").Append(_("TIFF files (*.tif,*.tiff)")).Append("|").Append(GetFilterExtensions("tif")).Append(";").Append(GetFilterExtensions("tiff")); + filterString.Append("|").Append(_("PNG files (*.png)")).Append("|").Append(GetFilterExtensions("png")); + filterString.Append("|").Append(_("HDR files (*.hdr)")).Append("|").Append(GetFilterExtensions("hdr")); + filterString.Append("|").Append(_("EXR files (*.exr)")).Append("|").Append(GetFilterExtensions("exr")); + return filterString; +}; + +bool IsRawExtension(const wxString& testExt) +{ + std::vector rawExts = GetRawExtensions(); + for (auto& ext : rawExts) + { + if (testExt.CmpNoCase(wxString(ext.c_str(), wxConvLocal)) == 0) + { + return true; + }; + }; + return false; +}; #if defined __WXMAC__ || defined __WXOSX_COCOA__ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/platform.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/platform.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/platform.h 2017-04-22 17:02:44.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/platform.h 2019-02-02 10:11:01.000000000 +0000 @@ -40,7 +40,13 @@ #define HUGIN_CONV_FILENAME (*wxConvFileName) #endif -#define HUGIN_WX_FILE_IMG_FILTER _("All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*") +/** return filter for image files, needed by file open dialog + it contains all image format vigra can read and some other format */ +WXIMPEX wxString GetFileDialogImageFilters(); +/** return filter for image and raw files, needed by file open dialog */ +WXIMPEX wxString GetFileDialogImageAndRawFilters(); +/** return true, if given extension is in list of known raw extension (comparision is case insensitive */ +WXIMPEX bool IsRawExtension(const wxString& testExt); #if defined __WXMAC__ || defined __WXOSX_COCOA__ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/PTWXDlg.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/PTWXDlg.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/PTWXDlg.cpp 2017-04-22 17:02:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/PTWXDlg.cpp 2018-12-22 11:54:22.000000000 +0000 @@ -25,8 +25,8 @@ */ #include "hugin_config.h" -#include "panoinc.h" #include "panoinc_WX.h" +#include "panoinc.h" #include "PTWXDlg.h" #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/RunStitchPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/RunStitchPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/RunStitchPanel.cpp 2015-10-23 23:03:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/RunStitchPanel.cpp 2019-01-12 12:02:47.000000000 +0000 @@ -178,7 +178,7 @@ try { // copy pto file to temporary file m_currentPTOfn = wxFileName::CreateTempFileName(tempDir+wxT("huginpto_")); - if(m_currentPTOfn.size() == 0) { + if(m_currentPTOfn.empty()) { wxLogError(_("Could not create temporary file")); } DEBUG_DEBUG("tmpPTOfn file: " << (const char *)m_currentPTOfn.mb_str(wxConvLocal)); @@ -197,17 +197,18 @@ wxString statusText; m_tempFiles.clear(); HuginQueue::CommandQueue* commands; + std::stringstream errors; if (userDefinedOutput.IsEmpty()) { - commands = HuginQueue::GetStitchingCommandQueue(pano, exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR), m_currentPTOfn, basename, statusText, outputFiles, m_tempFiles); + commands = HuginQueue::GetStitchingCommandQueue(pano, exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR), m_currentPTOfn, basename, statusText, outputFiles, m_tempFiles, errors); } else { - commands= HuginQueue::GetStitchingCommandQueueUserOutput(pano, exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR), m_currentPTOfn, basename, userDefinedOutput, statusText, outputFiles, m_tempFiles); + commands= HuginQueue::GetStitchingCommandQueueUserOutput(pano, exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR), m_currentPTOfn, basename, userDefinedOutput, statusText, outputFiles, m_tempFiles, errors); }; if (commands->empty()) { - wxMessageBox(_("Queue is empty. This should never happen.") , _("Error during stitching"), wxICON_ERROR | wxOK); + wxMessageBox(_("Queue is empty. This should never happen.") + "\n\n" + wxString(errors.str()), _("Error during stitching"), wxICON_ERROR | wxOK); return false; }; // check output directories. diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.cpp 2019-02-04 17:00:47.000000000 +0000 @@ -21,8 +21,8 @@ * */ +#include "base_wx/platform.h" #include "StitchingExecutor.h" - #include #include #include @@ -34,7 +34,6 @@ #include "hugin_base/panotools/PanoToolsUtils.h" #include "hugin_base/panodata/PanoramaOptions.h" #include "hugin_base/algorithms/basic/LayerStacks.h" -#include "base_wx/platform.h" #include "base_wx/wxPlatform.h" #include "base_wx/LensTools.h" #include "hugin/config_defaults.h" @@ -64,20 +63,6 @@ }; }; - /** return the temp dir from the preferences, ensure that it ends with path separator */ - const wxString GetConfigTempDir(const wxConfigBase* config) - { - wxString tempDir = config->Read(wxT("tempDir"), wxT("")); - if (!tempDir.IsEmpty()) - { - if (tempDir.Last() != wxFileName::GetPathSeparator()) - { - tempDir.Append(wxFileName::GetPathSeparator()); - } - }; - return tempDir; - }; - /** generate the final argfile @return full name of generated argfile */ @@ -390,13 +375,13 @@ }; } // namespace detail - CommandQueue* GetStitchingCommandQueue(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete) + CommandQueue* GetStitchingCommandQueue(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete, std::ostream& errStream) { CommandQueue* commands = new CommandQueue; const HuginBase::UIntSet allActiveImages = getImagesinROI(pano, pano.getActiveImages()); if (allActiveImages.empty()) { - std::cerr << "ERROR: No active images in ROI. Nothing to do." << std::endl; + errStream << "ERROR: No active images in ROI. Nothing to do." << std::endl; return commands; } std::vector stacks; @@ -407,17 +392,17 @@ opts.remapUsingGPU = config->Read(wxT("/Nona/UseGPU"), HUGIN_NONA_USEGPU) == 1; if (opts.remapper != HuginBase::PanoramaOptions::NONA) { - std::cerr << "ERROR: Only nona remappper is supported by hugin_executor." << std::endl; + errStream << "ERROR: Only nona remappper is supported by hugin_executor." << std::endl; return commands; }; if (opts.blendMode != HuginBase::PanoramaOptions::ENBLEND_BLEND && opts.blendMode != HuginBase::PanoramaOptions::INTERNAL_BLEND) { - std::cerr << "ERROR: Only enblend and internal remappper are currently supported by hugin_executor." << std::endl; + errStream << "ERROR: Only enblend and internal remappper are currently supported by hugin_executor." << std::endl; return commands; }; if (opts.hdrMergeMode != HuginBase::PanoramaOptions::HDRMERGE_AVERAGE) { - std::cerr << "ERROR: Only hdr merger HDRMERGE_AVERAGE is currently supported by hugin_executor." << std::endl; + errStream << "ERROR: Only hdr merger HDRMERGE_AVERAGE is currently supported by hugin_executor." << std::endl; return commands; }; double exiftoolVersion; @@ -572,7 +557,7 @@ } else { - std::cerr << "ERROR: Invalid output image type found." << std::endl; + errStream << "ERROR: Invalid output image type found." << std::endl; return commands; }; }; @@ -837,6 +822,10 @@ break; }; outputFiles.Add(mergedStacksFilename); + if (copyMetadata) + { + filesForFullExiftool.Add(mergedStacksFilename); + }; }; }; if (!opts.outputHDRLayers) @@ -869,11 +858,11 @@ // do some checks on the way // if an error occurs or the input is not valid, the queue is cleared and the function returns false bool AddBlenderCommand(CommandQueue* queue, const wxString& ExePath, const wxString& prog, - const int& stepNr, const wxString& arguments, const wxString& description) + const int& stepNr, const wxString& arguments, const wxString& description, std::ostream& errStream) { if (prog.IsEmpty()) { - std::cerr << "ERROR: Step " << stepNr << " has no program name specified." << std::endl; + errStream << "ERROR: Step " << stepNr << " has no program name specified." << std::endl; CleanQueue(queue); return false; } @@ -975,19 +964,19 @@ } - CommandQueue* GetStitchingCommandQueueUserOutput(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, const wxString& outputSettings, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete) + CommandQueue* GetStitchingCommandQueueUserOutput(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, const wxString& outputSettings, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete, std::ostream& errStream) { CommandQueue* commands = new CommandQueue; const HuginBase::UIntSet allActiveImages = getImagesinROI(pano, pano.getActiveImages()); if (allActiveImages.empty()) { - std::cerr << "ERROR: No active images in ROI. Nothing to do." << std::endl; + errStream << "ERROR: No active images in ROI. Nothing to do." << std::endl; return commands; } wxFileInputStream input(outputSettings); if (!input.IsOk()) { - std::cerr << "ERROR: Can not open file \"" << outputSettings.mb_str(wxConvLocal) << "\"." << std::endl; + errStream << "ERROR: Can not open file \"" << outputSettings.mb_str(wxConvLocal) << "\"." << std::endl; return commands; } wxFileConfig settings(input); @@ -995,7 +984,7 @@ settings.Read(wxT("/General/StepCount"), &stepCount, 0); if (stepCount == 0) { - std::cerr << "ERROR: User-setting does not define any output steps." << std::endl; + errStream << "ERROR: User-setting does not define any output steps." << std::endl; return commands; } const wxString desc = GetSettingString(&settings, wxT("/General/Description"), wxEmptyString); @@ -1046,7 +1035,7 @@ stepString << i; if (!settings.HasGroup(stepString)) { - std::cerr << "ERROR: Output specifies " << stepCount << " steps, but step " << i << " is missing in configuration." << std::endl; + errStream << "ERROR: Output specifies " << stepCount << " steps, but step " << i << " is missing in configuration." << std::endl; CleanQueue(commands); return commands; } @@ -1054,14 +1043,14 @@ const wxString stepType=GetSettingString(&settings, wxT("Type")); if (stepType.IsEmpty()) { - std::cerr << "ERROR: \"" << stepString.mb_str(wxConvLocal) << "\" has no type defined." << std::endl; + errStream << "ERROR: \"" << stepString.mb_str(wxConvLocal) << "\" has no type defined." << std::endl; CleanQueue(commands); return commands; }; wxString args = GetSettingString(&settings, wxT("Arguments")); if (args.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no arguments given." << std::endl; + errStream << "ERROR: Step " << i << " has no arguments given." << std::endl; CleanQueue(commands); return commands; } @@ -1123,14 +1112,14 @@ wxString resultFile = GetSettingString(&settings, wxT("Result")); if (resultFile.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no result file specified." << std::endl; + errStream << "ERROR: Step " << i << " has no result file specified." << std::endl; CleanQueue(commands); return commands; }; resultFile.Replace(wxT("%prefix%"), prefix, true); if (args.Replace(wxT("%result%"), wxEscapeFilename(resultFile), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %result% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %result% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; @@ -1140,7 +1129,7 @@ { if (args.Replace(wxT("%input%"), GetQuotedFilenamesString(remappedImages), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; @@ -1158,7 +1147,7 @@ }; if (args.Replace(wxT("%input%"), GetQuotedFilenamesString(stacksFiles), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; @@ -1176,14 +1165,14 @@ }; if (args.Replace(wxT("%input%"), GetQuotedFilenamesString(exposureLayersFiles), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; } else { - std::cerr << "ERROR: Step " << i << " has invalid input type: \"" << BlenderInput.mb_str(wxConvLocal) << "\"." << std::endl; + errStream << "ERROR: Step " << i << " has invalid input type: \"" << BlenderInput.mb_str(wxConvLocal) << "\"." << std::endl; CleanQueue(commands); return commands; }; @@ -1196,7 +1185,7 @@ args.Prepend(wrapSwitch + wxT(" ")); } if (!detail::AddBlenderCommand(commands, ExePath, GetSettingString(&settings, wxT("Program")), i, - args, description)) + args, description, errStream)) { return commands; }; @@ -1227,18 +1216,18 @@ wxArrayString remappedStackImages = detail::GetNumberedFilename(prefix, intermediateImageType, stacks[stackNr]); if (finalArgs.Replace(wxT("%input%"), GetQuotedFilenamesString(remappedStackImages), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; if (finalArgs.Replace(wxT("%output%"), wxEscapeFilename(stacksFiles[stackNr]), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %output% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %output% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; if (!detail::AddBlenderCommand(commands, ExePath, GetSettingString(&settings, wxT("Program")), i, - finalArgs, description)) + finalArgs, description, errStream)) { return commands; }; @@ -1270,18 +1259,18 @@ wxArrayString remappedLayerImages = detail::GetNumberedFilename(prefix, intermediateImageType, exposureLayers[exposureLayerNr]); if (finalArgs.Replace(wxT("%input%"), GetQuotedFilenamesString(remappedLayerImages), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %input% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; if (finalArgs.Replace(wxT("%output%"), wxEscapeFilename(exposureLayersFiles[exposureLayerNr]), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %output% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %output% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; if (!detail::AddBlenderCommand(commands, ExePath, GetSettingString(&settings, wxT("Program")), i, - finalArgs, description)) + finalArgs, description, errStream)) { return commands; }; @@ -1300,39 +1289,39 @@ wxString inputFiles = GetSettingString(&settings, wxT("File")); if (inputFiles.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no input/output file specified." << std::endl; + errStream << "ERROR: Step " << i << " has no input/output file specified." << std::endl; CleanQueue(commands); return commands; }; if (args.Find(wxT("%file%")) == wxNOT_FOUND) { - std::cerr << "ERROR: Step " << i << " has missing %file% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %file% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; args.Replace(wxT("%project%"), wxEscapeFilename(project), true); if (!detail::ReplacePrefixPlaceholder(args, prefix)) { - std::cerr << "ERROR: Step " << i << " has invalid %prefix% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has invalid %prefix% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; if (!detail::ReplaceWidthHeightPlaceHolder(args, "width", opts.getWidth())) { - std::cerr << "ERROR: Step " << i << " has invalid %width% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has invalid %width% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; } if (!detail::ReplaceWidthHeightPlaceHolder(args, "height", opts.getHeight())) { - std::cerr << "ERROR: Step " << i << " has invalid %height% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has invalid %height% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; } const wxString progName = GetSettingString(&settings, wxT("Program")); if (progName.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no program name specified." << std::endl; + errStream << "ERROR: Step " << i << " has no program name specified." << std::endl; CleanQueue(commands); return commands; }; @@ -1361,7 +1350,7 @@ { if (stacks.empty()) { - std::cerr << "ERROR: Step " << i << " requests to modify stacks, but no stack was created before." << std::endl; + errStream << "ERROR: Step " << i << " requests to modify stacks, but no stack was created before." << std::endl; CleanQueue(commands); return commands; }; @@ -1378,7 +1367,7 @@ { if (exposureLayers.empty()) { - std::cerr << "ERROR: Step " << i << " requests to modify exposure layers, but no exposure layer was created before." << std::endl; + errStream << "ERROR: Step " << i << " requests to modify exposure layers, but no exposure layer was created before." << std::endl; CleanQueue(commands); return commands; }; @@ -1405,14 +1394,14 @@ wxString resultFile = GetSettingString(&settings, wxT("Result")); if (resultFile.IsEmpty()) { - std::cerr << "ERROR: Step " << i << " has no result file specified." << std::endl; + errStream << "ERROR: Step " << i << " has no result file specified." << std::endl; CleanQueue(commands); return commands; }; resultFile.Replace(wxT("%prefix%"), prefix, true); if (args.Replace(wxT("%result%"), wxEscapeFilename(resultFile), true) == 0) { - std::cerr << "ERROR: Step " << i << " has missing %result% placeholder in arguments." << std::endl; + errStream << "ERROR: Step " << i << " has missing %result% placeholder in arguments." << std::endl; CleanQueue(commands); return commands; }; @@ -1422,7 +1411,7 @@ } else { - std::cerr << "ERROR: Step " << i << " has unknown Type \"" << stepType.mb_str(wxConvLocal) << "\"." << std::endl; + errStream << "ERROR: Step " << i << " has unknown Type \"" << stepType.mb_str(wxConvLocal) << "\"." << std::endl; CleanQueue(commands); return commands; }; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.h 2015-07-22 18:56:42.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/StitchingExecutor.h 2019-01-12 11:57:42.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include "Executor.h" +#include namespace HuginQueue { @@ -40,9 +41,10 @@ @param[out] statusText contains a short status text, can be printed before the queue is actually executed, useful for bug reports @param[out] outputFiles array of all output files, contains also the temporary files created during stitching (used for detecting of overwritting files) @param[out] tempFilesDelete array with all temporary files which should be deleted at the end + @param errStream output stream on which the error should be written @return pointer to CommandQueue */ - WXIMPEX CommandQueue* GetStitchingCommandQueue(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete); + WXIMPEX CommandQueue* GetStitchingCommandQueue(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete, std::ostream& errStream); /** generates the command queue for stitching a pano, the commands are parsed from the given executor output file @param[in] pano panorama structure containing the input project @param[in] ExePath ExePath base path to all used utilities @@ -52,9 +54,10 @@ @param[out] statusText contains a short status text, can be printed before the queue is actually executed, useful for bug reports @param[out] outputFiles array of all output files, contains also the temporary files created during stitching (used for detecting of overwritting files) @param[out] tempFilesDelete array with all temporary files which should be deleted at the end + @param errStream output stream on which the error should be written @return pointer to CommandQueue */ - WXIMPEX CommandQueue* GetStitchingCommandQueueUserOutput(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, const wxString& outputSettings, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete); + WXIMPEX CommandQueue* GetStitchingCommandQueueUserOutput(const HuginBase::Panorama & pano, const wxString& ExePath, const wxString& project, const wxString& prefix, const wxString& outputSettings, wxString& statusText, wxArrayString& outputFiles, wxArrayString& tempFilesDelete, std::ostream& errStream); /** return a single string of all given files quoted */ WXIMPEX wxString GetQuotedFilenamesString(const wxArrayString& files); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/wxPanoCommand.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/wxPanoCommand.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/wxPanoCommand.cpp 2017-12-10 09:30:47.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/wxPanoCommand.cpp 2019-02-27 18:18:17.000000000 +0000 @@ -177,26 +177,6 @@ srcImg.setWhiteBalanceBlue(blueBal); }; -void copySrcImageExif(HuginBase::SrcPanoImage& destImg, HuginBase::SrcPanoImage srcImg) -{ - destImg.setExifExposureTime(srcImg.getExifExposureTime()); - destImg.setExifAperture(srcImg.getExifAperture()); - destImg.setExifExposureMode(srcImg.getExifExposureMode()); - destImg.setExifISO(srcImg.getExifISO()); - destImg.setExifMake(srcImg.getExifMake()); - destImg.setExifModel(srcImg.getExifModel()); - destImg.setExifLens(srcImg.getExifLens()); - destImg.setExifOrientation(srcImg.getExifOrientation()); - destImg.setExifFocalLength(srcImg.getExifFocalLength()); - destImg.setExifFocalLength35(srcImg.getExifFocalLength35()); - destImg.setExifCropFactor(srcImg.getExifCropFactor()); - destImg.setExifDistance(srcImg.getExifDistance()); - destImg.setExifDate(srcImg.getExifDate()); - destImg.setExifRedBalance(srcImg.getExifRedBalance()); - destImg.setExifBlueBalance(srcImg.getExifBlueBalance()); - destImg.setFileMetadata(srcImg.getFileMetadata()); -}; - bool getLensDataFromUser(wxWindow * parent, HuginBase::SrcPanoImage & srcImg) { // display lens dialog @@ -221,7 +201,7 @@ bool wxAddImagesCmd::processPanorama(HuginBase::Panorama& pano) { // check if the files should be sorted by date - long sort = wxConfigBase::Get()->Read(wxT("General/SortNewImgOnAdd"), HUGIN_GUI_SORT_NEW_IMG_ON_ADD); + const long sort = wxConfigBase::Get()->Read(wxT("General/SortNewImgOnAdd"), HUGIN_GUI_SORT_NEW_IMG_ON_ADD); switch (sort) { case 1: @@ -237,17 +217,14 @@ break; } - std::vector::const_iterator it; - HuginBase::Lens lens; - HuginBase::SrcPanoImage srcImg; - HuginBase::SrcPanoImage srcImgExif; HuginBase::StandardImageVariableGroups variable_groups(pano); HuginBase::ImageVariableGroup & lenses = variable_groups.getLenses(); const size_t oldImgCount = pano.getNrOfImages(); // load additional images... - for (it = files.begin(); it != files.end(); ++it) { - const std::string &filename = *it; + for (const auto& filename: files) + { + HuginBase::SrcPanoImage srcImg; wxString fname(filename.c_str(), HUGIN_CONV_FILENAME); // try to read settings automatically. @@ -356,6 +333,12 @@ if(ok) { ok = srcImg.applyEXIFValues(); + // load crop factor from database if unknown + if (srcImg.getCropFactor()<0.1) + { + srcImg.readCropfactorFromDB(); + ok=(srcImg.getExifFocalLength()>0 && srcImg.getCropFactor()>0.1); + }; if (srcImg.getProjection() != HuginBase::BaseSrcPanoImage::EQUIRECTANGULAR) { // if projection is equirectangular, we loaded info from gpano tags @@ -364,15 +347,7 @@ }; }; // save EXIF data for later to prevent double loading of EXIF data - srcImgExif=srcImg; applyColorBalanceValue(srcImg, pano); - double redBal=srcImg.getWhiteBalanceRed(); - double blueBal=srcImg.getWhiteBalanceBlue(); - if(srcImg.getCropFactor()<0.1) - { - srcImg.readCropfactorFromDB(); - ok=(srcImg.getExifFocalLength()>0 && srcImg.getCropFactor()>0.1); - }; if (! ok ) { // search for image with matching size and exif data // and re-use it. @@ -385,21 +360,15 @@ other.getExifFocalLength() == srcImg.getExifFocalLength() ) { - double ev = srcImg.getExposureValue(); - srcImg = pano.getSrcImage(i); - srcImg.setFilename(filename); - srcImg.deleteAllMasks(); - copySrcImageExif(srcImg, srcImgExif); // add image + if (srcImg.getCropFactor() <= 0.1) + { + // set crop factor to 1 if not set + srcImg.setCropFactor(other.getCropFactor()); + }; int imgNr = pano.addImage(srcImg); variable_groups.update(); lenses.switchParts(imgNr, lenses.getPartNumber(i)); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_ExposureValue, i); - srcImg.setExposureValue(ev); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed, i); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue, i); - applyColorBalanceValue(srcImg, pano); - pano.setSrcImage(imgNr, srcImg); added=true; break; } @@ -410,7 +379,7 @@ // if no similar image found, ask user if (! ok) { if (!getLensDataFromUser(wxGetActiveWindow(), srcImg)) { - // assume a standart lens + // assume a standard lens srcImg.setHFOV(50); srcImg.setCropFactor(1); } @@ -439,19 +408,6 @@ ) { matchingLensNr = lenses.getPartNumber(i); - // copy data from other image, just keep - // the file name and reload the exif data (for exposure) - ev = srcImg.getExposureValue(); - redBal = srcImg.getWhiteBalanceRed(); - blueBal = srcImg.getWhiteBalanceBlue(); - set_exposure = true; - srcImg = pano.getSrcImage(i); - srcImg.setFilename(filename); - srcImg.deleteAllMasks(); - copySrcImageExif(srcImg, srcImgExif); - srcImg.setExposureValue(ev); - srcImg.setWhiteBalanceRed(redBal); - srcImg.setWhiteBalanceBlue(blueBal); break; } } @@ -461,12 +417,6 @@ if (other.getSize() == srcImg.getSize() ) { matchingLensNr = lenses.getPartNumber(i); - // copy data from other image, just keep - // the file name - srcImg = pano.getSrcImage(i); - srcImg.setFilename(filename); - srcImg.deleteAllMasks(); - copySrcImageExif(srcImg, srcImgExif); break; } } @@ -480,38 +430,12 @@ if (matchingLensNr != -1) { lenses.switchParts(imgNr, matchingLensNr); - // unlink and set exposure value, if wanted. - if (set_exposure) - { - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_ExposureValue, imgNr); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed, imgNr); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue, imgNr); - //don't link image size, this will foul the photometric optimizer - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_Size, imgNr); - /// @todo avoid copying the SrcPanoImage. - HuginBase::SrcPanoImage t = pano.getSrcImage(imgNr); - t.setExposureValue(ev); - t.setWhiteBalanceRed(redBal); - t.setWhiteBalanceBlue(blueBal); - pano.setSrcImage(imgNr, t); - } } if (imgNr == 0) { // get initial value for output exposure HuginBase::PanoramaOptions opts = pano.getOptions(); opts.outputExposureValue = srcImg.getExposureValue(); pano.setOptions(opts); - // set the exposure, but there isn't anything to link to so don't try unlinking. - // links are made by default when adding new images. - if (set_exposure) - { - /// @todo avoid copying the SrcPanoImage. - HuginBase::SrcPanoImage t = pano.getSrcImage(imgNr); - t.setExposureValue(ev); - t.setWhiteBalanceRed(redBal); - t.setWhiteBalanceBlue(blueBal); - pano.setSrcImage(imgNr, t); - } } } if (pano.hasPossibleStacks()) @@ -651,7 +575,7 @@ // open file dialog wxFileDialog dlg(wxGetActiveWindow(), wxString::Format(_("Select image %s"), fname.GetFullName()), basedir, fname.GetFullName(), - HUGIN_WX_FILE_IMG_FILTER, wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_PREVIEW, wxDefaultPosition); + GetFileDialogImageFilters(), wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_PREVIEW, wxDefaultPosition); dlg.SetDirectory(basedir); if (dlg.ShowModal() == wxID_OK) { pano.setImageFilename(i, (const char *)dlg.GetPath().mb_str(HUGIN_CONV_FILENAME)); @@ -844,7 +768,7 @@ wxString path = config->Read(wxT("actualPath"), wxT("")); wxFileDialog dlg(wxGetActiveWindow(), _("Add images"), path, wxT(""), - HUGIN_WX_FILE_IMG_FILTER, wxFD_OPEN|wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST | wxFD_PREVIEW , wxDefaultPosition); + GetFileDialogImageFilters(), wxFD_OPEN|wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST | wxFD_PREVIEW , wxDefaultPosition); dlg.SetDirectory(path); // remember the image extension diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/wxPlatform.cpp hugin-2019.0.0+dfsg/src/hugin1/base_wx/wxPlatform.cpp --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/wxPlatform.cpp 2018-01-26 16:28:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/wxPlatform.cpp 2018-03-14 16:29:37.000000000 +0000 @@ -98,3 +98,27 @@ }; } #endif + +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) +#include +#include +#include +void CheckConfigFilename() +{ + wxStandardPaths& paths = wxStandardPaths::Get(); + // get config file name for old config filename + const wxFileName oldConfigFile (paths.GetUserConfigDir(), paths.MakeConfigFileName(wxTheApp->GetAppName(), wxStandardPaths::ConfigFileConv_Dot)); + // now switch to XDG layout + paths.SetFileLayout(wxStandardPaths::FileLayout_XDG); + if (oldConfigFile.FileExists()) + { + // get the new filename + const wxFileName newConfigFile(paths.GetUserConfigDir(), paths.MakeConfigFileName(wxTheApp->GetAppName(), wxStandardPaths::ConfigFileConv_Dot)); + // if old file exists but not new file, move old config to new place + if (!newConfigFile.FileExists()) + { + wxRenameFile(oldConfigFile.GetFullPath(), newConfigFile.GetFullPath()); + }; + }; +}; +#endif diff -Nru hugin-2018.0.0+dfsg/src/hugin1/base_wx/wxPlatform.h hugin-2019.0.0+dfsg/src/hugin1/base_wx/wxPlatform.h --- hugin-2018.0.0+dfsg/src/hugin1/base_wx/wxPlatform.h 2018-01-26 16:28:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/base_wx/wxPlatform.h 2018-03-13 20:10:11.000000000 +0000 @@ -116,4 +116,9 @@ WXIMPEX void FixHelpSettings(); #endif +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) +/** function to locate Hugins config file */ +WXIMPEX void CheckConfigFilename(); +#endif + #endif // HUGIN_WXPLATFORM_H diff -Nru hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc --- hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc 2011-07-17 08:39:21.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc 2018-02-23 16:15:35.000000000 +0000 @@ -7,9 +7,4 @@ AppIcon ICON "../hugin/xrc/data/hugin.ico" IDI_ICON1 ICON "../hugin/xrc/data/hugin.ico" -// set this to 1 if you don't want to use manifest resource (manifest resource -// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt -// for more information) -#define wxUSE_NO_MANIFEST 1 - #include "wx/msw/wx.rc" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/LensCalApp.cpp hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/LensCalApp.cpp --- hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/LensCalApp.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/LensCalApp.cpp 2018-11-02 15:22:13.000000000 +0000 @@ -34,6 +34,9 @@ #include "base_wx/huginConfig.h" #include "hugin/config_defaults.h" #include "base_wx/PTWXDlg.h" +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) +#include "base_wx/wxPlatform.h" +#endif #include @@ -49,6 +52,9 @@ wxHandleFatalExceptions(); #endif SetAppName(wxT("hugin")); +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) + CheckConfigFilename(); +#endif // register our custom pano tools dialog handlers registerPTWXDlgFcn(); @@ -66,6 +72,16 @@ return false; } m_xrcPrefix = thePath + wxT("/"); +#elif defined UNIX_SELF_CONTAINED_BUNDLE + // initialize paths + { + wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); + exePath.RemoveLastDir(); + const wxString huginRoot=exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); + // add the locale directory specified during configure + m_xrcPrefix = huginRoot + wxT("share/hugin/xrc/"); + locale.AddCatalogLookupPathPrefix(huginRoot + wxT("share/locale")); + } #else // add the locale directory specified during configure m_xrcPrefix = wxT(INSTALL_XRC_DIR); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/LensCalFrame.cpp hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/LensCalFrame.cpp --- hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/LensCalFrame.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/LensCalFrame.cpp 2018-07-23 19:20:15.000000000 +0000 @@ -85,12 +85,12 @@ }; } } - if(invalidFiles.size()>0) + if(!invalidFiles.empty()) { ShowFilenameWarning(frame, invalidFiles); } // we got some images to add. - if (files.size() > 0) + if (!files.empty()) { // use a Command to ensure proper undo and updating of GUI parts frame->AddImages(files); @@ -292,7 +292,7 @@ }; }; }; - if(m_images.size()>0) + if(!m_images.empty()) { const HuginBase::SrcPanoImage* image0=m_images[0]->GetPanoImage(); const HuginBase::SrcPanoImage* image1=image->GetPanoImage(); @@ -339,7 +339,7 @@ wxCommandEvent e; OnImageSelected(e); EnableButtons(); - if(wrongSize.size()>0) + if(!wrongSize.empty()) { wxString fileText; for(unsigned int i=0;i0) + if(!wrongExif.empty()) { wxString fileText; for(unsigned int i=0;iRead(wxT("/actualPath"), wxT("")); wxFileDialog dlg(this,_("Add images"), path, wxT(""), - HUGIN_WX_FILE_IMG_FILTER, + GetFileDialogImageFilters(), wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST | wxFD_PREVIEW, wxDefaultPosition); dlg.SetDirectory(path); @@ -421,7 +421,7 @@ invalidFiles.push_back(Pathnames[i]); }; }; - if(invalidFiles.size()>0) + if(!invalidFiles.empty()) { ShowFilenameWarning(this, invalidFiles); } @@ -676,10 +676,7 @@ { HuginBase::SrcPanoImage img = pano.getSrcImage(i); lenses.switchParts(i,lenses.getPartNumber(0)); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_ExposureValue, i); img.setExposureValue(0); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed, i); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue, i); img.setWhiteBalanceRed(1); img.setWhiteBalanceBlue(1); pano.setSrcImage(i, img); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/LensCalImageCtrl.cpp hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/LensCalImageCtrl.cpp --- hugin-2018.0.0+dfsg/src/hugin1/calibrate_lens/LensCalImageCtrl.cpp 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/calibrate_lens/LensCalImageCtrl.cpp 2019-01-26 20:08:58.000000000 +0000 @@ -55,6 +55,7 @@ m_c=0; m_d=0; m_e=0; + m_monitorProfile = NULL; // load monitor profile wxString profileName; HuginBase::Color::GetMonitorProfile(profileName, m_monitorProfile); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/executor/hugin_executor.cpp hugin-2019.0.0+dfsg/src/hugin1/executor/hugin_executor.cpp --- hugin-2018.0.0+dfsg/src/hugin1/executor/hugin_executor.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/executor/hugin_executor.cpp 2019-02-04 16:58:44.000000000 +0000 @@ -71,11 +71,23 @@ m_locale.AddCatalogLookupPathPrefix(exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + wxT("share\\locale")); #elif defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE // nothing to do +#elif defined UNIX_SELF_CONTAINED_BUNDLE + // initialize paths + { + wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); + exePath.RemoveLastDir(); + const wxString huginRoot=exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); + // add the locale directory specified during configure + m_locale.AddCatalogLookupPathPrefix(huginRoot + wxT("share/locale")); + } #else // add the locale directory specified during configure m_locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR)); #endif // init our config settings +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) + CheckConfigFilename(); +#endif wxConfig* config = new wxConfig(wxT("hugin")); wxConfigBase::Set(config); @@ -123,7 +135,7 @@ } else { - commands = HuginQueue::GetAssistantCommandQueueUserDefined(pano, m_utilsBinDir, m_input, m_userAssistant); + commands = HuginQueue::GetAssistantCommandQueueUserDefined(pano, m_utilsBinDir, m_input, m_userAssistant, tempfiles, std::cerr); }; } else @@ -145,11 +157,11 @@ wxArrayString outputFiles; if (m_userOutput.IsEmpty()) { - commands = HuginQueue::GetStitchingCommandQueue(pano, m_utilsBinDir, inputFile.GetFullPath(), outputPrefix.GetName(), statusText, outputFiles, tempfiles); + commands = HuginQueue::GetStitchingCommandQueue(pano, m_utilsBinDir, inputFile.GetFullPath(), outputPrefix.GetName(), statusText, outputFiles, tempfiles, std::cerr); } else { - commands = HuginQueue::GetStitchingCommandQueueUserOutput(pano, m_utilsBinDir, inputFile.GetFullPath(), outputPrefix.GetName(), m_userOutput, statusText, outputFiles, tempfiles); + commands = HuginQueue::GetStitchingCommandQueueUserOutput(pano, m_utilsBinDir, inputFile.GetFullPath(), outputPrefix.GetName(), m_userOutput, statusText, outputFiles, tempfiles, std::cerr); }; if (!m_dryRun) { @@ -242,9 +254,14 @@ userOutputFile.SetPath(wxString(hugin_utils::GetDataDir().c_str(), HUGIN_CONV_FILENAME)); if (!userOutputFile.FileExists()) { - std::cerr << "ERROR: File \"" << m_userOutput.mb_str(wxConvLocal) << "\" does not exists." << std::endl - << " Also tried file \"" << userOutputFile.GetFullPath().mb_str(wxConvLocal) << "\", which does also not exists." << std::endl; - return false; + const wxString testedFile1 = userOutputFile.GetFullPath(); + userOutputFile.SetPath(wxString(hugin_utils::GetUserAppDataDir().c_str(), HUGIN_CONV_FILENAME)); + if (!userOutputFile.FileExists()) + { + std::cerr << "ERROR: File \"" << m_userOutput.mb_str(wxConvLocal) << "\" does not exists." << std::endl + << " Also tried files \"" << testedFile1.mb_str(wxConvLocal) << "\" and \"" << userOutputFile.GetFullPath().mb_str(wxConvLocal) << "\", which don't exist." << std::endl; + return false; + }; } m_userOutput = userOutputFile.GetFullPath(); } @@ -267,9 +284,14 @@ userAssistantFile.SetPath(wxString(hugin_utils::GetDataDir().c_str(), HUGIN_CONV_FILENAME)); if (!userAssistantFile.FileExists()) { - std::cerr << "ERROR: File \"" << m_userAssistant.mb_str(wxConvLocal) << "\" does not exists." << std::endl - << " Also tried file \"" << userAssistantFile.GetFullPath().mb_str(wxConvLocal) << "\", which does also not exists." << std::endl; - return false; + const wxString testedFile1 = userAssistantFile.GetFullPath(); + userAssistantFile.SetPath(wxString(hugin_utils::GetUserAppDataDir().c_str(), HUGIN_CONV_FILENAME)); + if (!userAssistantFile.FileExists()) + { + std::cerr << "ERROR: File \"" << m_userAssistant.mb_str(wxConvLocal) << "\" does not exists." << std::endl + << " Also tried files \"" << testedFile1.mb_str(wxConvLocal) << "\" and \"" << userAssistantFile.GetFullPath().mb_str(wxConvLocal) << "\", which don't exist." << std::endl; + return false; + }; } m_userAssistant = userAssistantFile.GetFullPath(); } diff -Nru hugin-2018.0.0+dfsg/src/hugin1/executor/scanned2.assistant hugin-2019.0.0+dfsg/src/hugin1/executor/scanned2.assistant --- hugin-2018.0.0+dfsg/src/hugin1/executor/scanned2.assistant 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/executor/scanned2.assistant 2019-03-16 09:43:32.000000000 +0000 @@ -12,7 +12,7 @@ Description=Searching control points Condition=not connected Program=cpfind -Arguments=--multirow -v --output=%project% %project% +Arguments=--multirow --output=%project% %project% [Step2] Description=Check result @@ -35,7 +35,7 @@ [Step5] Description=Setting optimizer variables Program=pto_var -Arguments=--unlink v0 --opt r,TrX,TrY,TrZ,!TrX0,!TrY0,!TrZ0 --output=%project% %project% +Arguments=--opt r,TrX,TrY,TrZ,!TrX0,!TrY0,!TrZ0 --output=%project% %project% [Step6] Description=Optimizing diff -Nru hugin-2018.0.0+dfsg/src/hugin1/executor/scanned.assistant hugin-2019.0.0+dfsg/src/hugin1/executor/scanned.assistant --- hugin-2018.0.0+dfsg/src/hugin1/executor/scanned.assistant 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/executor/scanned.assistant 2019-03-16 09:46:11.000000000 +0000 @@ -12,7 +12,7 @@ Description=Searching control points Condition=not connected Program=cpfind -Arguments=--multirow -v --output=%project% %project% +Arguments=--multirow --output=%project% %project% [Step2] Description=Check result @@ -35,7 +35,7 @@ [Step5] Description=Setting optimizer variables Program=pto_var -Arguments=--unlink d0,e0 --opt r,d,e,!r0,!d0,!e0 --output=%project% %project% +Arguments=--unlink v0,d0,e0 --opt v,r,d,e,!r0,!d0,!e0,!v0 --output=%project% %project% [Step6] Description=Optimizing diff -Nru hugin-2018.0.0+dfsg/src/hugin1/executor/zeronoise.executor hugin-2019.0.0+dfsg/src/hugin1/executor/zeronoise.executor --- hugin-2018.0.0+dfsg/src/hugin1/executor/zeronoise.executor 2017-04-22 17:02:44.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/executor/zeronoise.executor 2019-03-22 16:57:41.000000000 +0000 @@ -10,7 +10,7 @@ Arguments=-r ldr -m TIFF_m --clip-exposure [Step1] -Description=Merge all expsoures +Description=Merge all exposures Type=merge Input=all Program=enfuse diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/AboutDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/AboutDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/AboutDialog.cpp 2016-10-03 07:51:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/AboutDialog.cpp 2018-12-22 15:09:01.000000000 +0000 @@ -38,6 +38,10 @@ #if !(defined HAVE_STD_FILESYSTEM) #include "boost/version.hpp" #endif +#ifdef _WIN32 +// workaround for a conflict between exiv2 and wxWidgets/CMake built +#define HAVE_PID_T 1 +#endif #include "exiv2/exiv2.hpp" #include "lensdb/LensDB.h" #include "sqlite3.h" @@ -206,7 +210,7 @@ #if !(defined HAVE_STD_FILESYSTEM) text=text+wxT("\n")+wxString::Format(wxT("Boost: %i.%i.%i"),BOOST_VERSION / 100000, BOOST_VERSION / 100 % 1000, BOOST_VERSION % 100); #endif - text = text + wxT("\n") + wxT("Exiv2: ") + wxString(Exiv2::version(), wxConvLocal); + text = text + wxT("\n") + wxT("Exiv2: ") + wxString(Exiv2::versionString().c_str(), wxConvLocal); text = text + wxT("\n") + wxT("SQLite3: ") + wxString(sqlite3_libversion(), wxConvLocal); text = text + wxT("\n") + wxString::Format(wxT("Vigra: %s"), wxString(VIGRA_VERSION, wxConvLocal).c_str()); text = text + wxT("\n") + wxString::Format(wxT("LittleCMS2: %i.%i"), LCMS_VERSION / 1000, LCMS_VERSION / 10 % 100); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ChoosyRemapper.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ChoosyRemapper.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ChoosyRemapper.cpp 2015-07-22 18:56:42.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ChoosyRemapper.cpp 2018-03-04 20:43:19.000000000 +0000 @@ -75,8 +75,6 @@ // Add any projections where the poles maps to a big set of points here. case HuginBase::PanoramaOptions::PANINI: case HuginBase::PanoramaOptions::EQUI_PANINI: - case HuginBase::PanoramaOptions::BIPLANE: - case HuginBase::PanoramaOptions::TRIPLANE: case HuginBase::PanoramaOptions::GENERAL_PANINI: // check for pole crossing { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CMakeLists.txt hugin-2019.0.0+dfsg/src/hugin1/hugin/CMakeLists.txt --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CMakeLists.txt 2018-01-26 16:28:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CMakeLists.txt 2019-02-02 10:11:02.000000000 +0000 @@ -33,7 +33,8 @@ GreatCircles.cpp AboutDialog.cpp LayoutRemapper.cpp PreviewLayoutLinesTool.cpp PreviewColorPickerTool.cpp PreviewGuideTool.cpp MaskEditorPanel.cpp MaskImageCtrl.cpp MaskLoadDialog.cpp HtmlWindow.cpp PanoOperation.cpp treelistctrl.cpp ImagesTree.cpp PanoOutputDialog.cpp -GuiLevel.cpp ImageVariableDialog.cpp PreviewEditCPTool.cpp PapywizardImport.cpp ChangeImageVariableDialog.cpp) +GuiLevel.cpp ImageVariableDialog.cpp PreviewEditCPTool.cpp PapywizardImport.cpp ChangeImageVariableDialog.cpp +RawImport.cpp) set(hugin_HEADERS huginApp.h ImagesList.h MainFrame.h CPImageCtrl.h CPImagesComboBox.h CPEditorPanel.h CPDetectorDialog.h @@ -49,13 +50,17 @@ GreatCircles.h AboutDialog.h LayoutRemapper.h PreviewLayoutLinesTool.h PreviewColorPickerTool.h PreviewGuideTool.h MaskEditorPanel.h MaskImageCtrl.h MaskLoadDialog.h HtmlWindow.h PanoOperation.h treelistctrl.h ImagesTree.h PanoOutputDialog.h -GuiLevel.h ImageVariableDialog.h PreviewEditCPTool.h PapywizardImport.h ChangeImageVariableDialog.h) +GuiLevel.h ImageVariableDialog.h PreviewEditCPTool.h PapywizardImport.h ChangeImageVariableDialog.h +RawImport.h) IF(BUILD_HSI) LIST(APPEND hugin_SOURCES PluginItems.cpp) LIST(APPEND hugin_HEADERS PluginItems.h) ENDIF() +# install some file for raw import +INSTALL(FILES hugin_rt.pp3 DESTINATION ${HUGINDATADIR}/data) + IF(APPLE) if (MAC_SELF_CONTAINED_BUNDLE) @@ -78,9 +83,10 @@ ENDFOREACH(_file) #other files - FILE(GLOB OTHER ${CMAKE_SOURCE_DIR}/src/hugin1/executor/*.executor) + FILE(GLOB OTHER ${CMAKE_SOURCE_DIR}/src/hugin1/executor/*.executor ${CMAKE_SOURCE_DIR}/src/hugin1/executor/*.assistant) LIST(APPEND OTHER ${CMAKE_SOURCE_DIR}/src/celeste/data/celeste.model + ${CMAKE_SOURCE_DIR}/src/hugin1/hugin/hugin_rt.pp3 ${CMAKE_SOURCE_DIR}/src/hugin1/base_wx/hugin_exiftool_copy.arg ${CMAKE_BINARY_DIR}/src/hugin1/icpfind/default.setting ) FOREACH(_file ${OTHER}) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPDetectorDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/CPDetectorDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPDetectorDialog.cpp 2017-04-22 17:02:44.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPDetectorDialog.cpp 2019-01-11 15:12:17.000000000 +0000 @@ -25,6 +25,11 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" + // Mingw define still DIFFERENCE, which conflicts with vigra, so disable it +#undef DIFFERENCE +#endif #include "hugin/CPDetectorDialog.h" #include "hugin_config.h" #include "base_wx/huginConfig.h" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.cpp 2017-04-22 17:02:44.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.cpp 2018-12-22 12:22:33.000000000 +0000 @@ -27,9 +27,7 @@ #include "hugin_config.h" // often necessary before panoinc.h -#ifdef __APPLE__ #include "panoinc_WX.h" -#endif // standard hugin include #include "panoinc.h" // both includes above need to come before other wx includes on OSX @@ -71,6 +69,7 @@ EVT_LIST_ITEM_SELECTED(XRCID("cp_editor_cp_list"), CPEditorPanel::OnCPListSelect) EVT_LIST_ITEM_DESELECTED(XRCID("cp_editor_cp_list"), CPEditorPanel::OnCPListDeselect) EVT_LIST_COL_END_DRAG(XRCID("cp_editor_cp_list"), CPEditorPanel::OnColumnWidthChange) + EVT_LIST_COL_CLICK(XRCID("cp_editor_cp_list"), CPEditorPanel::OnColumnHeaderClick) EVT_CHOICE(XRCID("cp_editor_choice_zoom"), CPEditorPanel::OnZoom) EVT_TEXT_ENTER(XRCID("cp_editor_x1"), CPEditorPanel::OnTextPointChange ) EVT_TEXT_ENTER(XRCID("cp_editor_y1"), CPEditorPanel::OnTextPointChange ) @@ -96,6 +95,15 @@ m_countCP = 0; } +// helper function to set image in header +void SetColumnImage(wxListCtrl* list, int col, int image) +{ + wxListItem item; + item.SetMask(wxLIST_MASK_IMAGE); + item.SetImage(image); + list->SetColumn(col, item); +}; + bool CPEditorPanel::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -156,6 +164,42 @@ if(width != -1) m_cpList->SetColumnWidth(j, width); } + m_sortCol = config->Read(wxT("/CPEditorPanel/SortColumn"), -1); + m_sortAscending = config->Read(wxT("/CPEditorPanel/SortAscending"), 1) == 1 ? true : false; + if (m_sortCol != -1) + { + SetColumnImage(m_cpList, m_sortCol, m_sortAscending ? 0 : 1); + }; + + // creating bitmaps for indicating sorting order + wxMemoryDC memDC; + memDC.SetFont(GetFont()); + wxSize fontSize = memDC.GetTextExtent(wxT("\u25b3")); + wxCoord charSize = std::max(fontSize.GetWidth(), fontSize.GetHeight()); + wxImageList* sortIcons = new wxImageList(charSize, charSize, true, 0); + { + wxBitmap bmp(charSize, charSize); + wxMemoryDC dc(bmp); + dc.SetBackgroundMode(wxPENSTYLE_TRANSPARENT); + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); + dc.SetFont(GetFont()); + dc.DrawText(wxT("\u25b3"), (charSize - fontSize.GetWidth()) / 2, (charSize - fontSize.GetHeight()) / 2); + dc.SelectObject(wxNullBitmap); + sortIcons->Add(bmp, GetBackgroundColour()); + }; + { + wxBitmap bmp(charSize, charSize); + wxMemoryDC dc(bmp); + dc.SetBackgroundMode(wxPENSTYLE_TRANSPARENT); + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); + dc.SetFont(GetFont()); + dc.DrawText(wxT("\u25bd"), (charSize - fontSize.GetWidth()) / 2, (charSize - fontSize.GetHeight()) / 2); + dc.SelectObject(wxNullBitmap); + sortIcons->Add(bmp, GetBackgroundColour()); + }; + m_cpList->AssignImageList(sortIcons, wxIMAGE_LIST_SMALL); // other controls m_x1Text = XRCCTRL(*this,"cp_editor_x1", wxTextCtrl); @@ -258,9 +302,13 @@ m_x2Text->PopEventHandler(true); m_y2Text->PopEventHandler(true); - wxConfigBase::Get()->Write(wxT("/CPEditorPanel/autoAdd"), m_autoAddCB->IsChecked() ? 1 : 0); - wxConfigBase::Get()->Write(wxT("/CPEditorPanel/autoFineTune"), m_fineTuneCB->IsChecked() ? 1 : 0); - wxConfigBase::Get()->Write(wxT("/CPEditorPanel/autoEstimate"), m_estimateCB->IsChecked() ? 1 : 0); + wxConfigBase* config = wxConfig::Get(); + config->Write(wxT("/CPEditorPanel/autoAdd"), m_autoAddCB->IsChecked() ? 1 : 0); + config->Write(wxT("/CPEditorPanel/autoFineTune"), m_fineTuneCB->IsChecked() ? 1 : 0); + config->Write(wxT("/CPEditorPanel/autoEstimate"), m_estimateCB->IsChecked() ? 1 : 0); + config->Write(wxT("/CPEditorPanel/SortColumn"), m_sortCol); + config->Write(wxT("/CPEditorPanel/SortAscending"), m_sortAscending ? 1 : 0); + config->Flush(); m_pano->removeObserver(this); DEBUG_TRACE("dtor end"); @@ -346,7 +394,144 @@ m_rightTransform.createTransform(m_pano->getImage(m_rightImageNr), m_pano->getOptions()); m_rightInvTransform.createInvTransform(m_pano->getImage(m_rightImageNr), m_pano->getOptions()); }; -}; +} + +// define sorting callbacks +int wxCALLBACK SortIndexDescending(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData)) +{ + if (item1 < item2) + return 1; + if (item1 > item2) + return -1; + return 0; +} + +int wxCALLBACK SortIndexAscending(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData)) +{ + if (item1 > item2) + return 1; + if (item1 < item2) + return -1; + return 0; +} + +#define SORTASCENDING(functionName, var) \ +int wxCALLBACK functionName(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)\ +{\ + HuginBase::CPointVector* data = (HuginBase::CPointVector*)(sortData);\ + if (data->at(item1).second.var > data->at(item2).second.var)\ + return 1;\ + if (data->at(item1).second.var < data->at(item2).second.var)\ + return -1;\ + return 0;\ +} + +#define SORTDESCENDING(functionName, var) \ +int wxCALLBACK functionName(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)\ +{\ + HuginBase::CPointVector* data = (HuginBase::CPointVector*)(sortData); \ + if (data->at(item1).second.var < data->at(item2).second.var)\ + return 1; \ + if (data->at(item1).second.var > data->at(item2).second.var)\ + return -1; \ + return 0; \ +} + +SORTASCENDING(SortX1Ascending, x1) +SORTDESCENDING(SortX1Descending, x1) +SORTASCENDING(SortY1Ascending, y1) +SORTDESCENDING(SortY1Descending, y1) +SORTASCENDING(SortX2Ascending, x2) +SORTDESCENDING(SortX2Descending, x2) +SORTASCENDING(SortY2Ascending, y2) +SORTDESCENDING(SortY2Descending, y2) +SORTASCENDING(SortModeAscending, mode) +SORTDESCENDING(SortModeDescending, mode) +SORTASCENDING(SortErrorAscending, error) +SORTDESCENDING(SortErrorDescending, error) + +#undef SORTASCENDING +#undef SORTDESCENDING + +void CPEditorPanel::SortList() +{ + if (m_sortCol > -1) + { + switch (m_sortCol) + { + case 0: // index + if (m_sortAscending) + { + m_cpList->SortItems(SortIndexAscending, 0); + } + else + { + m_cpList->SortItems(SortIndexDescending, 0); + }; + break; + case 1: // x1 + if (m_sortAscending) + { + m_cpList->SortItems(SortX1Ascending, wxIntPtr(¤tPoints)); + } + else + { + m_cpList->SortItems(SortX1Descending, wxIntPtr(¤tPoints)); + }; + break; + case 2: // y1 + if (m_sortAscending) + { + m_cpList->SortItems(SortY1Ascending, wxIntPtr(¤tPoints)); + } + else + { + m_cpList->SortItems(SortY1Descending, wxIntPtr(¤tPoints)); + }; + break; + case 3: // x2 + if (m_sortAscending) + { + m_cpList->SortItems(SortX2Ascending, wxIntPtr(¤tPoints)); + } + else + { + m_cpList->SortItems(SortX2Descending, wxIntPtr(¤tPoints)); + }; + break; + case 4: // y2 + if (m_sortAscending) + { + m_cpList->SortItems(SortY2Ascending, wxIntPtr(¤tPoints)); + } + else + { + m_cpList->SortItems(SortY2Descending, wxIntPtr(¤tPoints)); + }; + break; + case 5: // mode + if (m_sortAscending) + { + m_cpList->SortItems(SortModeAscending, wxIntPtr(¤tPoints)); + } + else + { + m_cpList->SortItems(SortModeDescending, wxIntPtr(¤tPoints)); + }; + break; + case 6: // error + if (m_sortAscending) + { + m_cpList->SortItems(SortErrorAscending, wxIntPtr(¤tPoints)); + } + else + { + m_cpList->SortItems(SortErrorDescending, wxIntPtr(¤tPoints)); + }; + break; + }; + }; +} void CPEditorPanel::OnCPEvent( CPEvent& ev) { @@ -487,7 +672,7 @@ }; }; changeState(NO_POINT); - if(cpToRemove.size()>0) + if(!cpToRemove.empty()) { PanoCommand::GlobalCmdHist::getInstance().addCommand(new PanoCommand::RemoveCtrlPointsCmd(*m_pano, cpToRemove)); }; @@ -582,7 +767,11 @@ // no point selected, no need to select one. return; } - m_cpList->SetItemState(m_selectedPoint, 0, wxLIST_STATE_SELECTED); + const long selectedPoint = m_cpList->FindItem(-1, m_selectedPoint); + if (selectedPoint != wxNOT_FOUND) + { + m_cpList->SetItemState(selectedPoint, 0, wxLIST_STATE_SELECTED); + }; m_selectedPoint=UINT_MAX; changeState(NO_POINT); @@ -611,8 +800,9 @@ m_cpModeChoice->SetSelection(p.mode); m_leftImg->selectPoint(LVpointNr); m_rightImg->selectPoint(LVpointNr); - m_cpList->SetItemState(LVpointNr, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - m_cpList->EnsureVisible(LVpointNr); + const long selectedPoint = m_cpList->FindItem(-1, LVpointNr); + m_cpList->SetItemState(selectedPoint, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_cpList->EnsureVisible(selectedPoint); EnablePointEdit(true); } @@ -842,9 +1032,9 @@ if (corrRes.corrPos.x >= 0 && corrRes.corrPos.y >= 0 && corrRes.maxpos.x >= 0 && corrRes.maxpos.y >= 0) { thisImg->setScale(m_detailZoomFactor); - thisImg->setNewPoint(corrRes.maxpos); + thisImg->setNewPoint(corrRes.maxi > -1 ? corrRes.maxpos : p); thisImg->update(); - otherImg->setNewPoint(corrRes.corrPos); + otherImg->setNewPoint(corrRes.maxi > -1 ? corrRes.corrPos : newPoint); changeState(BOTH_POINTS_SELECTED); }; } else { @@ -1106,7 +1296,23 @@ { DEBUG_TRACE("tmpl img nr: " << tmplImgNr << " corr src: " << subjImgNr); - + if (tmplImgNr == subjImgNr) + { + // for line control points (assumed when both points are in the same image) + // check the distance before running fine-tune + // if both points are in the search area decrease search area + const double distance = (tmplPoint - o_subjPoint.toDiff2D()).magnitude(); + if (distance < sWidth) + { + sWidth = 0.9 * distance; + }; + if (sWidth < 1.1 * templSize) + { + MainFrame::Get()->SetStatusText(_("Distance between line control points too short, skipping fine-tune.")); + wxBell(); + return false; + }; + }; MainFrame::Get()->SetStatusText(_("searching similar points..."),0); double corrThresh=HUGIN_FT_CORR_THRESHOLD; @@ -1202,6 +1408,21 @@ m_countCP = pano.getNrOfCtrlPoints(); UpdateDisplay(false); }; + // update header if necessary + wxListItem item; + if (m_cpList->GetColumn(6, item)) + { + if (MainFrame::Get()->IsShowingCorrelation()) + { + item.SetText(_("Correlation")); + } + else + { + item.SetText(_("Distance")); + } + m_cpList->SetColumn(6, item); + }; + DEBUG_TRACE(""); } @@ -1394,6 +1615,7 @@ // update control points const HuginBase::CPVector & controlPoints = m_pano->getCtrlPoints(); + const size_t oldCurrentPointSize = currentPoints.size(); currentPoints.clear(); mirroredPoints.clear(); @@ -1422,10 +1644,15 @@ m_rightImg->update(); // put these control points into our listview. - unsigned int selectedCP = UINT_MAX; - for ( int i=0; i < m_cpList->GetItemCount() ; i++ ) { - if ( m_cpList->GetItemState( i, wxLIST_STATE_SELECTED ) ) { - selectedCP = i; // remembers the old selection + unsigned int selectedItem = UINT_MAX; + long selectedCP = -1; + for (int i = 0; i < m_cpList->GetItemCount(); i++) + { + if ( m_cpList->GetItemState( i, wxLIST_STATE_SELECTED)) + { + selectedItem = (unsigned int) i; // remembers the old selection, only one can be selected + selectedCP = m_cpList->GetItemData(i); + break; } } m_cpList->Freeze(); @@ -1434,7 +1661,9 @@ for (unsigned int i=0; i < currentPoints.size(); ++i) { const HuginBase::ControlPoint & p(currentPoints[i].second); DEBUG_DEBUG("inserting LVItem " << i); - m_cpList->InsertItem(i,wxString::Format(wxT("%d"),i)); + long item = m_cpList->InsertItem(i, wxString::Format(wxT("%d"), i), -1); + // store index in list data field + m_cpList->SetItemData(item, i); m_cpList->SetItem(i,1,wxString::Format(wxT("%.2f"),p.x1)); m_cpList->SetItem(i,2,wxString::Format(wxT("%.2f"),p.y1)); m_cpList->SetItem(i,3,wxString::Format(wxT("%.2f"),p.x2)); @@ -1457,13 +1686,32 @@ m_cpList->SetItem(i,5,mode); m_cpList->SetItem(i,6,wxString::Format(wxT("%.2f"),p.error)); } + SortList(); - if ( selectedCP < (unsigned int) m_cpList->GetItemCount() && ! newPair) { + if (selectedItem <= (unsigned int)m_cpList->GetItemCount() && !newPair && m_cpList->GetItemCount() > 0) + { // sets an old selection again, only if the images have not changed - m_cpList->SetItemState( selectedCP, - wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); - m_cpList->EnsureVisible(selectedCP); - m_selectedPoint = selectedCP; + if (oldCurrentPointSize == currentPoints.size()) + { + // number of control points is not changed, so select the same cp + // as before + long selected = m_cpList->FindItem(-1, selectedCP); + m_cpList->SetItemState(selected, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_cpList->EnsureVisible(selected); + m_selectedPoint = selectedCP; + } + else + { + // number of cp has change, so keep the next item seleteced + if (selectedItem == (unsigned int)m_cpList->GetItemCount()) + { + // previously last item was selected, move selected to now last item + selectedItem = m_cpList->GetItemCount() - 1; + }; + m_cpList->SetItemState(selectedItem, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_cpList->EnsureVisible(selectedItem); + m_selectedPoint = m_cpList->GetItemData(selectedItem); + }; EnablePointEdit(true); const HuginBase::ControlPoint & p = currentPoints[m_selectedPoint].second; @@ -1515,7 +1763,7 @@ if (item == -1) { return; } - unsigned int nr = (unsigned int) item; + const unsigned int nr = m_cpList->GetItemData(item); assert(nr < currentPoints.size()); HuginBase::ControlPoint cp = currentPoints[nr].second; @@ -1588,7 +1836,7 @@ int t = ev.GetIndex(); DEBUG_TRACE("selected: " << t); if (t >=0) { - SelectLocalPoint((unsigned int) t); + SelectLocalPoint(m_cpList->GetItemData(t)); changeState(NO_POINT); } EnablePointEdit(true); @@ -1693,7 +1941,7 @@ wxBell(); return; } - unsigned int pNr = localPNr2GlobalPNr((unsigned int) item); + unsigned int pNr = localPNr2GlobalPNr(m_cpList->GetItemData(item)); DEBUG_DEBUG("about to delete point " << pNr); PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::RemoveCtrlPointCmd(*m_pano,pNr) @@ -1780,7 +2028,7 @@ return; } // get the global point number - unsigned int pNr = localPNr2GlobalPNr((unsigned int) item); + unsigned int pNr = localPNr2GlobalPNr(m_cpList->GetItemData(item)); PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::RemoveCtrlPointCmd(*m_pano,pNr ) @@ -2043,7 +2291,7 @@ return; } - if(cloudCP.size()>0) + if(!cloudCP.empty()) { PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::RemoveCtrlPointsCmd(*m_pano,cloudCP) @@ -2138,13 +2386,10 @@ long templWidth = wxConfigBase::Get()->Read(wxT("/Finetune/TemplateSize"),HUGIN_FT_TEMPLATE_SIZE); long sWidth = templWidth + wxConfigBase::Get()->Read(wxT("/Finetune/LocalSearchWidth"),HUGIN_FT_LOCAL_SEARCH_WIDTH); vigra_ext::CorrelationResult result; - PointFineTune(srcNr, - srcPnt, - templWidth, - moveNr, - movePnt, - sWidth, - result); + if (!PointFineTune(srcNr, srcPnt, templWidth, moveNr, movePnt, sWidth, result)) + { + return hugin_utils::FDiff2D(-1, -1); + }; movedSrcPnt = result.corrPos; if (result.corrPos.x < 0 || result.corrPos.y < 0 || result.maxpos.x < 0 || result.maxpos.y < 0) { @@ -2341,6 +2586,28 @@ wxConfigBase::Get()->Write( wxString::Format(wxT("/CPEditorPanel/ColumnWidth%d"),colNum), m_cpList->GetColumnWidth(colNum) ); } +void CPEditorPanel::OnColumnHeaderClick(wxListEvent & e) +{ + const int newCol = e.GetColumn(); + if (m_sortCol == newCol) + { + m_sortAscending = !m_sortAscending; + SetColumnImage(m_cpList, m_sortCol, m_sortAscending ? 0 : 1); + } + else + { + if (m_sortCol != -1) + { + SetColumnImage(m_cpList, m_sortCol, -1); + }; + m_sortCol = newCol; + SetColumnImage(m_cpList, m_sortCol, 0); + m_sortAscending = true; + } + SortList(); + Refresh(); +} + CPImageCtrl::ImageRotation CPEditorPanel::GetRot(double yaw, double pitch, double roll) { CPImageCtrl::ImageRotation rot = CPImageCtrl::ROT0; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.h hugin-2019.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.h 2015-10-23 23:20:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPEditorPanel.h 2018-12-16 09:56:34.000000000 +0000 @@ -165,6 +165,7 @@ void OnNextImg(wxCommandEvent & e); void OnColumnWidthChange( wxListEvent & e ); + void OnColumnHeaderClick(wxListEvent & e); void OnFineTuneButton(wxCommandEvent & e); void OnActionButton(wxCommandEvent& e); @@ -223,6 +224,8 @@ CPImageCtrl::ImageRotation GetRot(double yaw, double roll, double pitch); /** updated the internal transform object for drawing line in controls */ void UpdateTransforms(); + /** sorting functions*/ + void SortList(); CPCreationState cpCreationState; @@ -274,6 +277,9 @@ // point 2 in left window), in local point numbers std::set mirroredPoints; size_t m_countCP; + // store current sorting column + long m_sortCol = -1; + bool m_sortAscending = true; CPImageCtrl::ImageRotation m_leftRot; CPImageCtrl::ImageRotation m_rightRot; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPImageCtrl.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/CPImageCtrl.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPImageCtrl.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPImageCtrl.cpp 2018-12-16 15:10:45.000000000 +0000 @@ -290,7 +290,7 @@ wxCoord tw, th; dc.GetTextExtent(m_label, &tw, &th); - if (drawMag) + if (drawMag && m_control->getScale() < 2) { wxBitmap magBitmap = m_control->generateMagBitmap(pointInput, p); // TODO: select position depending on visible part of canvas @@ -839,7 +839,7 @@ // apply the transform AppBase::DummyProgressDisplay progDisp; - vigra_ext::transformImageIntern(vigra::srcImageRange(*(m_img->image8)), + vigra_ext::transformImageIntern(vigra::srcImageRange(*m_img->get8BitImage()), vigra::destImageRange(magImg), vigra::destImage(maskImg), transform, @@ -1096,7 +1096,7 @@ CPImageCtrl::EditorState CPImageCtrl::isOccupied(wxPoint mousePos, const hugin_utils::FDiff2D &p, unsigned int & pointNr) const { // check if mouse is hovering over a label - if(m_points.size()>0) + if(!m_points.empty()) { for(int i=m_points.size()-1; i>=0; i--) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPImagesComboBox.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/CPImagesComboBox.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPImagesComboBox.cpp 2016-10-03 07:51:44.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPImagesComboBox.cpp 2019-01-11 15:12:18.000000000 +0000 @@ -26,6 +26,11 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" + // Mingw define still DIFFERENCE, which conflicts with vigra, so disable it +#undef DIFFERENCE +#endif #include "hugin/CPImagesComboBox.h" BEGIN_EVENT_TABLE(CPImagesComboBox,wxOwnerDrawnComboBox) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPListFrame.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/CPListFrame.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPListFrame.cpp 2017-04-22 17:02:44.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPListFrame.cpp 2018-12-17 17:56:34.000000000 +0000 @@ -76,6 +76,10 @@ CPListCtrl::~CPListCtrl() { + wxConfigBase* config = wxConfig::Get(); + config->Write(wxT("/CPListFrame/SortColumn"), m_sortCol); + config->Write(wxT("/CPListFrame/SortAscending"), m_sortAscend ? 1 : 0); + config->Flush(); if (m_pano) { m_pano->removeObserver(this); @@ -94,7 +98,7 @@ InsertColumn(2, _("Right Img."), wxLIST_FORMAT_RIGHT, 65); InsertColumn(3, _("P CP#"), wxLIST_FORMAT_RIGHT, 25); InsertColumn(4, _("Alignment"), wxLIST_FORMAT_LEFT, 80); - InsertColumn(5, _("Distance"), wxLIST_FORMAT_RIGHT, 80); + InsertColumn(5, MainFrame::Get()->IsShowingCorrelation() ? _("Correlation") : _("Distance"), wxLIST_FORMAT_RIGHT, 80); //get saved width for (int j = 0; j < GetColumnCount(); j++) @@ -107,6 +111,40 @@ }; }; EnableAlternateRowColours(true); + + wxMemoryDC memDC; + memDC.SetFont(GetFont()); + wxSize fontSize = memDC.GetTextExtent(wxT("\u25b3")); + wxCoord charSize = std::max(fontSize.GetWidth(), fontSize.GetHeight()); + wxImageList* sortIcons = new wxImageList(charSize, charSize, true, 0); + { + wxBitmap bmp(charSize, charSize); + wxMemoryDC dc(bmp); + dc.SetBackgroundMode(wxPENSTYLE_TRANSPARENT); + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); + dc.SetFont(GetFont()); + dc.DrawText(wxT("\u25b3"), (charSize - fontSize.GetWidth()) / 2, (charSize - fontSize.GetHeight()) / 2); + dc.SelectObject(wxNullBitmap); + sortIcons->Add(bmp, GetBackgroundColour()); + }; + { + wxBitmap bmp(charSize, charSize); + wxMemoryDC dc(bmp); + dc.SetBackgroundMode(wxPENSTYLE_TRANSPARENT); + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); + dc.SetFont(GetFont()); + dc.DrawText(wxT("\u25bd"), (charSize - fontSize.GetWidth()) / 2, (charSize - fontSize.GetHeight()) / 2); + dc.SelectObject(wxNullBitmap); + sortIcons->Add(bmp, GetBackgroundColour()); + }; + AssignImageList(sortIcons, wxIMAGE_LIST_SMALL); + wxConfigBase* config = wxConfig::Get(); + m_sortCol=config->Read(wxT("/CPListFrame/SortColumn"), 0l); + m_sortAscend = config->Read(wxT("/CPListFrame/SortAscending"), 1l) == 1; + config->Flush(); + SetColumnImage(m_sortCol, m_sortAscend ? 0 : 1); return true; }; @@ -164,9 +202,27 @@ return wxEmptyString; }; +int CPListCtrl::OnGetItemImage(long item) const +{ + return -1; +}; + void CPListCtrl::panoramaChanged(HuginBase::Panorama &pano) { m_onlyActiveImages = MainFrame::Get()->GetOptimizeOnlyActiveImages(); + wxListItem item; + if (GetColumn(5, item)) + { + if (MainFrame::Get()->IsShowingCorrelation()) + { + item.SetText(_("Correlation")); + } + else + { + item.SetText(_("Distance")); + } + SetColumn(5, item); + }; UpdateInternalCPList(); SetItemCount(m_internalCPList.size()); Refresh(); @@ -358,10 +414,13 @@ if (m_sortCol == newCol) { m_sortAscend = !m_sortAscend; + SetColumnImage(m_sortCol, m_sortAscend ? 0 : 1); } else { + ClearColumnImage(m_sortCol); m_sortCol = newCol; + SetColumnImage(m_sortCol, 0); m_sortAscend = true; } SortInternalList(false); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/CPListFrame.h hugin-2019.0.0+dfsg/src/hugin1/hugin/CPListFrame.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/CPListFrame.h 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/CPListFrame.h 2018-12-17 17:26:08.000000000 +0000 @@ -65,6 +65,8 @@ protected: /** create labels for virtual list control */ virtual wxString OnGetItemText(long item, long column) const; + /** show no images */ + virtual int OnGetItemImage(long item) const; /** selection event handler */ void OnCPListSelectionChanged(wxListEvent & e); /** sort criterium changed */ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.cpp 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.cpp 2019-02-02 10:11:00.000000000 +0000 @@ -150,6 +150,9 @@ EVT_BUTTON(XRCID("exposure_default_button"), GLPreviewFrame::OnDefaultExposure) EVT_SPIN_DOWN(XRCID("exposure_spin"), GLPreviewFrame::OnDecreaseExposure) EVT_SPIN_UP(XRCID("exposure_spin"), GLPreviewFrame::OnIncreaseExposure) + EVT_SPIN_DOWN(XRCID("range_compression_spin"), GLPreviewFrame::OnRangeCompressionDecrease) + EVT_SPIN_UP(XRCID("range_compression_spin"), GLPreviewFrame::OnRangeCompressionIncrease) + EVT_TEXT_ENTER(XRCID("range_compression_text"), GLPreviewFrame::OnRangeCompressionChanged) EVT_CHOICE(XRCID("blend_mode_choice"), GLPreviewFrame::OnBlendChoice) EVT_CHOICE(XRCID("drag_mode_choice"), GLPreviewFrame::OnDragChoice) EVT_CHOICE(XRCID("projection_choice"), GLPreviewFrame::OnProjectionChoice) @@ -480,9 +483,6 @@ m_HFOVSlider->SetToolTip(_("drag to change the horizontal field of view")); - m_exposureText = XRCCTRL(*this, "exposure_text", wxTextCtrl); - DEBUG_ASSERT(m_exposureText); - m_exposureText->PushEventHandler(new TextKillFocusHandler(this)); m_HFOVText = XRCCTRL(*this, "pano_text_hfov" ,wxTextCtrl); DEBUG_ASSERT(m_HFOVText); m_HFOVText->PushEventHandler(new TextKillFocusHandler(this)); @@ -652,8 +652,18 @@ m_defaultExposureBut = XRCCTRL(*this, "exposure_default_button", wxBitmapButton); m_exposureTextCtrl = XRCCTRL(*this, "exposure_text", wxTextCtrl); + m_exposureTextCtrl->PushEventHandler(new TextKillFocusHandler(this)); + m_exposureSpinBut = XRCCTRL(*this, "exposure_spin", wxSpinButton); m_exposureSpinBut->SetValue(0); + m_exposureSpinBut->SetMaxSize(wxSize(-1, m_exposureTextCtrl->GetSize().GetHeight())); + + m_rangeCompressionTextCtrl = XRCCTRL(*this, "range_compression_text", wxTextCtrl); + m_rangeCompressionTextCtrl->PushEventHandler(new TextKillFocusHandler(this)); + + m_rangeCompressionSpinBut = XRCCTRL(*this, "range_compression_spin", wxSpinButton); + m_rangeCompressionSpinBut->SetValue(0); + m_rangeCompressionSpinBut->SetMaxSize(wxSize(-1, m_rangeCompressionTextCtrl->GetSize().GetHeight())); m_projection_panel = XRCCTRL(*this, "projection_panel", wxPanel); m_projParamSizer = new wxBoxSizer(wxHORIZONTAL); @@ -772,9 +782,8 @@ FillBlendChoice(); }; -GLPreviewFrame::~GLPreviewFrame() +void GLPreviewFrame::StorePositionAndSize() { - DEBUG_TRACE("dtor writing config"); wxConfigBase * cfg = wxConfigBase::Get(); StoreFramePosition(this, wxT("GLPreviewFrame")); @@ -791,7 +800,13 @@ cfg->Write(wxT("/GLPreviewFrame/showPreviewGrid"), GetMenuBar()->FindItem(XRCID("action_show_grid"))->IsChecked()); cfg->Write(wxT("/GLPreviewFrame/individualDragMode"), individualDragging()); cfg->Write(wxT("/GLPreviewFrame/guide"),m_GuideChoiceProj->GetSelection()); - +}; + +GLPreviewFrame::~GLPreviewFrame() +{ + DEBUG_TRACE("dtor writing config"); + StorePositionAndSize(); + // delete all of the tools. When the preview is never used we never get an // OpenGL context and therefore don't create the tools. if (crop_tool) @@ -829,8 +844,9 @@ } m_focalLengthText->PopEventHandler(true); m_cropFactorText->PopEventHandler(true); - m_exposureText->PopEventHandler(true); + m_exposureTextCtrl->PopEventHandler(true); m_HFOVText->PopEventHandler(true); + m_rangeCompressionTextCtrl->PopEventHandler(true); m_VFOVText->PopEventHandler(true); m_ROILeftTxt->PopEventHandler(true); m_ROIRightTxt->PopEventHandler(true); @@ -1054,7 +1070,9 @@ } } } - XRCCTRL(*this, "ass_status_text", wxStaticText)->SetLabel(alignMsg); + wxStaticText* statusCtrl = XRCCTRL(*this, "ass_status_text", wxStaticText); + statusCtrl->SetLabel(alignMsg); + statusCtrl->InvalidateBestSize(); m_tool_notebook->GetPage(0)->Layout(); Refresh(); } @@ -1089,8 +1107,9 @@ m_incExposureBut->Show(); }*/ m_exposureTextCtrl->ChangeValue(wxString(hugin_utils::doubleToString(opts.outputExposureValue,2).c_str(), wxConvLocal)); + m_rangeCompressionTextCtrl->ChangeValue(wxString(hugin_utils::doubleToString(opts.outputRangeCompression, 1).c_str(), wxConvLocal)); - bool activeImgs = pano.getActiveImages().size() > 0; + const bool activeImgs = !pano.getActiveImages().empty(); // TODO: enable display of parameters and set their limits, if projection has some. @@ -1287,7 +1306,8 @@ if (dirty) { m_ButtonSizer->FitInside(m_ButtonPanel); - Layout(); + Layout(); + SendSizeEvent(); DEBUG_INFO("New m_ButtonPanel width: " << (m_ButtonPanel->GetSize()).GetWidth()); DEBUG_INFO("New m_ButtonPanel Height: " << (m_ButtonPanel->GetSize()).GetHeight()); } @@ -1473,7 +1493,7 @@ void GLPreviewFrame::OnCenterHorizontally(wxCommandEvent & e) { - if (m_pano.getActiveImages().size() == 0) return; + if (m_pano.getActiveImages().empty()) return; PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::CenterPanoCmd(m_pano) @@ -1491,7 +1511,7 @@ void GLPreviewFrame::OnFitPano(wxCommandEvent & e) { - if (m_pano.getActiveImages().size() == 0) return; + if (m_pano.getActiveImages().empty()) return; DEBUG_TRACE(""); HuginBase::PanoramaOptions opt = m_pano.getOptions(); @@ -1650,6 +1670,53 @@ ); } +void GLPreviewFrame::OnRangeCompressionIncrease(wxSpinEvent & e) +{ + HuginBase::PanoramaOptions opt = m_pano.getOptions(); + opt.outputRangeCompression = std::min(opt.outputRangeCompression + 1.0, 20.0); + PanoCommand::GlobalCmdHist::getInstance().addCommand( + new PanoCommand::SetPanoOptionsCmd(m_pano, opt) + ); +} + +void GLPreviewFrame::OnRangeCompressionDecrease(wxSpinEvent & e) +{ + HuginBase::PanoramaOptions opt = m_pano.getOptions(); + opt.outputRangeCompression = std::max(opt.outputRangeCompression - 1.0, 0.0); + PanoCommand::GlobalCmdHist::getInstance().addCommand( + new PanoCommand::SetPanoOptionsCmd(m_pano, opt) + ); +} + +void GLPreviewFrame::OnRangeCompressionChanged(wxCommandEvent & e) +{ + HuginBase::PanoramaOptions opts = m_pano.getOptions(); + // range compression + const wxString text = m_rangeCompressionTextCtrl->GetValue(); + if (!text.IsEmpty()) + { + double p = 0; + if (!hugin_utils::str2double(text, p)) + { + wxLogError(_("Value must be numeric.")); + return; + }; + if (p < 0 || p>20) + { + wxLogError(_("Value for range compression is outside of valid range.")); + return; + }; + if (p != opts.outputRangeCompression) + { + opts.outputRangeCompression = p; + PanoCommand::GlobalCmdHist::getInstance().addCommand( + new PanoCommand::SetPanoOptionsCmd(m_pano, opts) + ); + }; + }; +} + + void GLPreviewFrame::OnProjParameterChanged(wxCommandEvent & e) { HuginBase::PanoramaOptions opts = m_pano.getOptions(); @@ -1706,6 +1773,7 @@ if (e.GetEventObject() == m_projParamSlider[i]) { // update para[i] = e.GetInt(); + break; } } opt.setProjectionParameters(para); @@ -1735,6 +1803,8 @@ if (e.GetEventObject() == m_projParamSlider[i]) { // update para[i] = e.GetInt(); + m_projParamTextCtrl[i]->ChangeValue(wxString::Format("%d", e.GetInt())); + break; } } opt.setProjectionParameters(para); @@ -2493,7 +2563,7 @@ void GLPreviewFrame::OnAutocrop(wxCommandEvent &e) { DEBUG_INFO("Dirty ROI Calc\n"); - if (m_pano.getActiveImages().size() == 0) + if (m_pano.getActiveImages().empty()) { return; }; @@ -2523,7 +2593,7 @@ void GLPreviewFrame::OnStackAutocrop(wxCommandEvent &e) { DEBUG_INFO("Dirty ROI Calc\n"); - if (m_pano.getActiveImages().size() == 0) + if (m_pano.getActiveImages().empty()) { return; }; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.h hugin-2019.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.h 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/GLPreviewFrame.h 2019-01-26 18:45:42.000000000 +0000 @@ -193,6 +193,8 @@ /** dtor. */ virtual ~GLPreviewFrame(); + /** store position and size of window in wxConfig */ + void StorePositionAndSize(); virtual void panoramaChanged(HuginBase::Panorama &pano); virtual void panoramaImagesChanged(HuginBase::Panorama &pano, const HuginBase::UIntSet &changed); @@ -282,6 +284,9 @@ void OnDefaultExposure( wxCommandEvent & e ); void OnDecreaseExposure( wxSpinEvent & e ); void OnIncreaseExposure( wxSpinEvent & e ); + void OnRangeCompressionIncrease(wxSpinEvent & e); + void OnRangeCompressionDecrease(wxSpinEvent & e); + void OnRangeCompressionChanged(wxCommandEvent& e); void OnBlendChoice(wxCommandEvent & e); void OnDragChoice(wxCommandEvent & e); @@ -396,8 +401,9 @@ // wxChoice * m_outputModeChoice; wxTextCtrl * m_exposureTextCtrl; wxBitmapButton * m_defaultExposureBut; - wxTextCtrl* m_exposureText; wxSpinButton * m_exposureSpinBut; + wxTextCtrl* m_rangeCompressionTextCtrl; + wxSpinButton* m_rangeCompressionSpinBut; /// Bar for context sensitive projection information. wxInfoBar * m_infoBar; //assistant related controls diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/GLViewer.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/GLViewer.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/GLViewer.cpp 2017-04-22 17:02:45.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/GLViewer.cpp 2018-12-22 12:29:42.000000000 +0000 @@ -20,10 +20,7 @@ * */ -#ifdef __APPLE__ #include "panoinc_WX.h" -#endif - #include "base_wx/wxutils.h" #include "panoinc.h" @@ -370,7 +367,7 @@ #if defined __WXMAC__ && wxCHECK_VERSION(3,1,0) wxColour col(128,128,128); #else - wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); + wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); #endif m_renderer->SetBackground(col.Red(), col.Green(), col.Blue()); if (m_visualization_state->RequireRecalculateViewport()) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/GreatCircles.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/GreatCircles.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/GreatCircles.cpp 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/GreatCircles.cpp 2018-06-30 09:37:29.000000000 +0000 @@ -47,7 +47,8 @@ // The number of segments to use in subdivision of the line. // Higher numbers increase the accuracy of the line, but it is slower. // Must be at least two. More is much better. -const unsigned int segments = 48; +const unsigned int max_segments = 48; +const double min_segment_angle = 1.0 / 180.0 * M_PI; GreatCircles::GreatCircles() : m_visualizationState(NULL) { @@ -78,11 +79,7 @@ // get the output projection const HuginBase::PanoramaOptions & options = *(visualizationState.GetOptions()); // make an image to transform spherical coordinates into the output projection - HuginBase::SrcPanoImage equirectangularImage; - equirectangularImage.setProjection(HuginBase::SrcPanoImage::EQUIRECTANGULAR); - equirectangularImage.setHFOV(360.0); - equirectangularImage.setSize(vigra::Size2D(360.0, 180.0)); - + static const HuginBase::SrcPanoImage equirectangularImage(HuginBase::SrcPanoImage::EQUIRECTANGULAR, 360.0, vigra::Size2D(360.0, 180.0)); // make a transformation from spherical coordinates to the output projection HuginBase::PTools::Transform transform; transform.createInvTransform(equirectangularImage, options); @@ -149,6 +146,11 @@ // draw a line strip and transform the coordinates as we go. double b1 = 0.0; double b2 = 1.0; + + const double line_v[3] = {p2[0] - p1[0], p2[1] - p1[1], p2[2] - p1[2]}; + const double line_length = sqrt(line_v[0] * line_v[0] + line_v[1] * line_v[1] + line_v[2] * line_v[2]); + unsigned int segments = hugin_utils::roundi(line_length / min_segment_angle); + segments = std::max(2u, std::min(max_segments, segments)); const double bDifference = 1.0 / double(segments); // for discontinuity detection. int lastSegment = 1; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/HtmlWindow.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/HtmlWindow.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/HtmlWindow.cpp 2015-05-10 06:52:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/HtmlWindow.cpp 2019-01-11 15:12:17.000000000 +0000 @@ -24,6 +24,11 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" + // Mingw define still DIFFERENCE, which conflicts with vigra, so disable it +#undef DIFFERENCE +#endif #include "hugin/HtmlWindow.h" IMPLEMENT_DYNAMIC_CLASS(HtmlWindow, wxHtmlWindow) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/huginApp.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/huginApp.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/huginApp.cpp 2018-01-26 16:28:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/huginApp.cpp 2019-02-02 10:11:01.000000000 +0000 @@ -46,6 +46,7 @@ #include "hugin/CPListFrame.h" #include "hugin/PreviewPanel.h" #include "hugin/GLPreviewFrame.h" +#include "hugin/RawImport.h" #include "base_wx/PTWXDlg.h" #include "base_wx/CommandHistory.h" #include "base_wx/wxcms.h" @@ -57,13 +58,16 @@ #include "base_wx/platform.h" #include "base_wx/huginConfig.h" #include +#include #ifdef __WXMSW__ #include -#include #if wxCHECK_VERSION(3,1,0) #include #endif #endif +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) +#include "base_wx/wxPlatform.h" +#endif #include @@ -185,7 +189,10 @@ { DEBUG_TRACE("=========================== huginApp::OnInit() begin ==================="); SetAppName(wxT("hugin")); - +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) + CheckConfigFilename(); +#endif + // Connect to ImageCache: we need to tell it when it is safe to handle UI events. ImageCache::getInstance().asyncLoadCompleteSignal = &huginApp::imageLoadedAsync; @@ -244,7 +251,20 @@ } #endif - +#elif defined UNIX_SELF_CONTAINED_BUNDLE + // initialize paths + { + wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); + m_utilsBinDir = exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); + exePath.RemoveLastDir(); + const wxString huginRoot=exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); + m_xrcPrefix = huginRoot + wxT("share/hugin/xrc/"); + m_DataDir = huginRoot + wxT("share/hugin/data/"); + + // locale setup + locale.AddCatalogLookupPathPrefix(huginRoot + wxT("share/locale")); + } + #else // add the locale directory specified during configure m_xrcPrefix = wxT(INSTALL_XRC_DIR); @@ -332,6 +352,7 @@ wxXmlResource::Get()->Load(m_xrcPrefix + wxT("lensdb_dialogs.xrc")); wxXmlResource::Get()->Load(m_xrcPrefix + wxT("image_variable_dlg.xrc")); wxXmlResource::Get()->Load(m_xrcPrefix + wxT("dlg_warning.xrc")); + wxXmlResource::Get()->Load(m_xrcPrefix + wxT("import_raw_dialog.xrc")); #endif #ifdef __WXMAC__ @@ -479,6 +500,7 @@ frame->LoadProjectFile(file.GetFullPath()); } else { std::vector filesv; + std::vector rawFilesv; bool actualPathSet = false; for (int i=1; i< argc; i++) { @@ -500,45 +522,81 @@ #else wxFileName file(argv[i]); #endif - if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 || - file.GetExt().CmpNoCase(wxT("jpeg")) == 0 || - file.GetExt().CmpNoCase(wxT("tif")) == 0 || - file.GetExt().CmpNoCase(wxT("tiff")) == 0 || - file.GetExt().CmpNoCase(wxT("png")) == 0 || - file.GetExt().CmpNoCase(wxT("bmp")) == 0 || - file.GetExt().CmpNoCase(wxT("gif")) == 0 || - file.GetExt().CmpNoCase(wxT("pnm")) == 0 || - file.GetExt().CmpNoCase(wxT("sun")) == 0 || - file.GetExt().CmpNoCase(wxT("hdr")) == 0 || - file.GetExt().CmpNoCase(wxT("viff")) == 0 ) + if (file.IsRelative()) { - if(file.IsRelative()) - file.MakeAbsolute(cwd); - if(!containsInvalidCharacters(file.GetFullPath())) + file.MakeAbsolute(cwd); + }; + if (IsRawExtension(file.GetExt())) + { + // we got a raw file from command line + if (!containsInvalidCharacters(file.GetFullPath())) { - filesv.push_back((const char *)(file.GetFullPath().mb_str(HUGIN_CONV_FILENAME))); + rawFilesv.push_back((const char*)file.GetFullPath().mb_str(HUGIN_CONV_FILENAME)); + // Use the first filename to set actualPath. + if (!actualPathSet) + { + config->Write(wxT("/actualPath"), file.GetPath()); + actualPathSet = true; + }; }; - - // Use the first filename to set actualPath. - if (! actualPathSet) - { - config->Write(wxT("/actualPath"), file.GetPath()); - actualPathSet = true; - } } + else + { + if (vigra::isImage(file.GetFullPath().mb_str(HUGIN_CONV_FILENAME))) + { + if (!containsInvalidCharacters(file.GetFullPath())) + { + filesv.push_back((const char *)(file.GetFullPath().mb_str(HUGIN_CONV_FILENAME))); + // Use the first filename to set actualPath. + if (!actualPathSet) + { + config->Write(wxT("/actualPath"), file.GetPath()); + actualPathSet = true; + }; + }; + }; + }; #if defined __WXMSW__ } while (dir.GetNext(&foundFile)); #endif } - if(filesv.size()>0) + if(!filesv.empty()) { std::vector cmds; cmds.push_back(new PanoCommand::wxAddImagesCmd(pano,filesv)); cmds.push_back(new PanoCommand::DistributeImagesCmd(pano)); cmds.push_back(new PanoCommand::CenterPanoCmd(pano)); PanoCommand::GlobalCmdHist::getInstance().addCommand(new PanoCommand::CombinedPanoCommand(pano, cmds)); - } - } + }; + if (!rawFilesv.empty()) + { + if (rawFilesv.size() == 1) + { + wxMessageDialog message(GetTopWindow(), _("You selected only one raw file. This is not recommended.\nAll raw files should be converted at once."), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxICON_EXCLAMATION | wxOK | wxCANCEL); + message.SetOKLabel(_("Convert anyway.")); + if (message.ShowModal() != wxID_OK) + { + return true; + }; + }; + RawImportDialog dlg(GetTopWindow(), &pano, rawFilesv); + // check that raw files are from same camera and that all can be read + if (dlg.CheckRawFiles()) + { + // now show dialog + if (dlg.ShowModal() == wxID_OK) + { + PanoCommand::GlobalCmdHist::getInstance().addCommand(dlg.GetPanoCommand()); + }; + }; + }; + }; } #ifdef __WXMAC__ m_macInitDone = true; Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/hugin_rc.aps and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/hugin_rc.aps differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/hugin_rc.rc hugin-2019.0.0+dfsg/src/hugin1/hugin/hugin_rc.rc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/hugin_rc.rc 2011-07-17 08:39:22.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/hugin_rc.rc 2018-02-23 16:15:35.000000000 +0000 @@ -7,9 +7,4 @@ AppIcon ICON "../hugin/xrc/data/hugin.ico" IDI_ICON1 ICON "../hugin/xrc/data/hugin.ico" -// set this to 1 if you don't want to use manifest resource (manifest resource -// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt -// for more information) -#define wxUSE_NO_MANIFEST 1 - #include "wx/msw/wx.rc" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/hugin_rt.pp3 hugin-2019.0.0+dfsg/src/hugin1/hugin/hugin_rt.pp3 --- hugin-2018.0.0+dfsg/src/hugin1/hugin/hugin_rt.pp3 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/hugin_rt.pp3 2018-07-14 17:34:41.000000000 +0000 @@ -0,0 +1,20 @@ +[Crop] +Enabled=false + +[Coarse Transformation] +Rotate=0 +HorizontalFlip=false +VerticalFlip=false + +[Resize] +Enabled=false + +[Rotation] +Degree=0 + +[Perspective] +Horizontal=0 +Vertical=0 + +[MetaData] +Mode=0 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ImagesPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ImagesPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ImagesPanel.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ImagesPanel.cpp 2018-12-16 14:29:22.000000000 +0000 @@ -292,7 +292,7 @@ HuginBase::UIntSet selImg = m_images_tree->GetSelectedImages(); //if only one image is selected, run detector on all images, except for linefind wxString progName = cpdetector_config.settings[m_CPDetectorChoice->GetSelection()].GetProg().Lower(); - if ((selImg.size() == 0) || (selImg.size() == 1 && progName.Find(wxT("linefind")) == wxNOT_FOUND)) + if ((selImg.empty()) || (selImg.size() == 1 && progName.Find(wxT("linefind")) == wxNOT_FOUND)) { // add all images. selImg.clear(); @@ -354,7 +354,7 @@ { const HuginBase::UIntSet & sel = m_images_tree->GetSelectedImages(); DEBUG_DEBUG("selected Images: " << sel.size()); - if (sel.size() == 0) + if (sel.empty()) { // nothing to edit DisableImageCtrls(); @@ -519,7 +519,7 @@ { size_t var = GetSelectedValue(m_lenstype); HuginBase::UIntSet images = m_images_tree->GetSelectedImages(); - if(images.size()>0) + if(!images.empty()) { const HuginBase::SrcPanoImage & img = m_pano->getImage(*(images.begin())); double focal_length = HuginBase::SrcPanoImage::calcFocalLength(img.getProjection(), img.getHFOV(), img.getCropFactor(), img.getSize()); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ImagesTree.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ImagesTree.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ImagesTree.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ImagesTree.cpp 2019-02-23 07:50:16.000000000 +0000 @@ -408,86 +408,11 @@ SetItemText(item, m_columnMap["maker"], wxString(img.getExifMake().c_str(), wxConvLocal)); SetItemText(item, m_columnMap["model"], wxString(img.getExifModel().c_str(), wxConvLocal)); SetItemText(item, m_columnMap["lens"], wxString(img.getExifLens().c_str(), wxConvLocal)); - struct tm exifdatetime; - if(img.getExifDateTime(&exifdatetime)==0) - { - wxDateTime s_datetime=wxDateTime(exifdatetime); - s=s_datetime.Format(); - } - else - { - s = wxString(img.getExifDate().c_str(),wxConvLocal); - } - SetItemText(item, m_columnMap["date"], s); - - if(img.getExifFocalLength()>0.0) - { - if(img.getExifFocalLength35()>0.0) - { - s = wxString::Format(wxT("%0.1f mm (%0.0f mm)"),img.getExifFocalLength(),img.getExifFocalLength35()); - } - else - { - s = wxString::Format(wxT("%0.1f mm"),img.getExifFocalLength()); - }; - } - else - { - s = wxEmptyString; - }; - SetItemText(item, m_columnMap["focallength"], s); - - if(img.getExifAperture()>0) - { - s=wxString::Format(wxT("F%.1f"),img.getExifAperture()); - } - else - { - s=wxEmptyString; - }; - SetItemText(item, m_columnMap["aperture"], s); - - if(img.getExifExposureTime()>0.5) - { - if(img.getExifExposureTime()>=1.0) - { - if(img.getExifExposureTime()>=10.0) - { - s=wxString::Format(wxT("%3.0f s"),img.getExifExposureTime()); - } - else - { - s=wxString::Format(wxT("%1.1f s"),img.getExifExposureTime()); - } - } - else - { - s=wxString::Format(wxT("%1.2f s"),img.getExifExposureTime()); - } - } - else - { - if (img.getExifExposureTime() > 1e-9) - { - s=wxString::Format(wxT("1/%0.0f s"),1.0/img.getExifExposureTime()); - } - else - { - //Sanity - s=wxT(""); - } - } - SetItemText(item, m_columnMap["time"], s); - - if(img.getExifISO()>0) - { - s=wxString::Format(wxT("%0.0f"),img.getExifISO()); - } - else - { - s=wxEmptyString; - }; - SetItemText(item, m_columnMap["iso"], s); + SetItemText(item, m_columnMap["date"], FormatString::GetExifDateTime(&img)); + SetItemText(item, m_columnMap["focallength"], FormatString::GetFocalLength(&img)); + SetItemText(item, m_columnMap["aperture"], FormatString::GetAperture(&img)); + SetItemText(item, m_columnMap["time"], FormatString::GetExposureTime(&img)); + SetItemText(item, m_columnMap["iso"], FormatString::GetIso(&img)); if (m_groupMode == GROUP_STACK && (img.YawisLinked() || isSingleImage)) { @@ -927,7 +852,7 @@ { imgNrs.insert(data->GetImgNr()); }; - if(imgNrs.size()>0) + if(!imgNrs.empty()) { for(size_t i=0;igetNrOfImages()-1); }; panoramaImagesChanged(*m_pano,imgs); + // reset already modified tag + m_needsUpdate = true; ExpandAll(m_root); }; }; @@ -1158,8 +1085,20 @@ { bool emptyText=GetItemText(e.GetItem(),m_selectedColumn).IsEmpty(); ImagesTreeData* data=static_cast(GetItemData(e.GetItem())); - if((m_groupMode==GROUP_LENS && m_variableVector[m_selectedColumn]!=HuginBase::ImageVariableGroup::IVE_Yaw) || - (m_groupMode==GROUP_STACK && m_variableVector[m_selectedColumn]==HuginBase::ImageVariableGroup::IVE_Yaw) ) + bool varIsLinkable = false; + if (m_groupMode == GROUP_LENS) + { + varIsLinkable = m_variableVector[m_selectedColumn] != HuginBase::ImageVariableGroup::IVE_Yaw && + set_contains(HuginBase::ConstStandardImageVariableGroups::getLensVariables(), m_variableVector[m_selectedColumn]); + } + else + { + if (m_groupMode == GROUP_STACK) + { + varIsLinkable = m_variableVector[m_selectedColumn] == HuginBase::ImageVariableGroup::IVE_Yaw; + } + }; + if(varIsLinkable) { if(data->IsGroup()) { @@ -1435,7 +1374,7 @@ void ImagesTreeCtrl::UnLinkImageVariables(bool linked) { HuginBase::UIntSet images=GetSelectedImages(); - if(images.size()>0 && m_variableVector[m_selectedColumn]!=HuginBase::ImageVariableGroup::IVE_Filename) + if(!images.empty() && m_variableVector[m_selectedColumn]!=HuginBase::ImageVariableGroup::IVE_Filename) { std::set variables; variables.insert(m_variableVector[m_selectedColumn]); @@ -1477,7 +1416,7 @@ void ImagesTreeCtrl::OnEditImageVariables(wxCommandEvent &e) { HuginBase::UIntSet imgs=GetSelectedImages(); - if(imgs.size()>0) + if(!imgs.empty()) { ImageVariableDialog dlg(this, m_pano, imgs); dlg.SetGuiLevel(m_guiLevel); @@ -1516,7 +1455,7 @@ if(m_pano->getNrOfImages()>0 && !m_dragging) { m_draggingImages=GetSelectedImages(); - if(m_draggingImages.size()>0) + if(!m_draggingImages.empty()) { if((m_groupMode==GROUP_NONE && m_draggingImages.size()==1 && !ctrlPressed) || m_groupMode==GROUP_LENS || m_groupMode==GROUP_STACK) @@ -1934,12 +1873,22 @@ if(select) { if((*it=="y" || *it=="p" || *it=="r" || *it=="TrX" || *it=="TrY" || *it=="TrZ" || *it=="Tpy" || *it=="Tpp") && - *img==m_pano->getOptions().optimizeReferenceImage) + (*img==m_pano->getOptions().optimizeReferenceImage || m_pano->getImage(*img).YawisLinkedWith(m_pano->getImage(m_pano->getOptions().optimizeReferenceImage)))) + { + optVec[*img].erase(*it); + continue; + }; + if(*it=="Eev" && (*img==m_pano->getOptions().colorReferenceImage || m_pano->getImage(*img).ExposureValueisLinkedWith(m_pano->getImage(m_pano->getOptions().colorReferenceImage)))) + { + optVec[*img].erase(*it); + continue; + }; + if (*it == "Er" && (*img == m_pano->getOptions().colorReferenceImage || m_pano->getImage(*img).WhiteBalanceRedisLinkedWith(m_pano->getImage(m_pano->getOptions().colorReferenceImage)))) { optVec[*img].erase(*it); continue; }; - if((*it=="Eev" || *it=="Er" || *it=="Eb") && *img==m_pano->getOptions().colorReferenceImage) + if (*it == "Eb" && (*img == m_pano->getOptions().colorReferenceImage || m_pano->getImage(*img).WhiteBalanceBlueisLinkedWith(m_pano->getImage(m_pano->getOptions().colorReferenceImage)))) { optVec[*img].erase(*it); continue; @@ -1990,7 +1939,7 @@ case WXK_DELETE: { HuginBase::UIntSet imgs=GetSelectedImages(); - if(imgs.size()>0) + if(!imgs.empty()) { PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::RemoveImagesCmd(*m_pano, imgs) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ImageVariableDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ImageVariableDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ImageVariableDialog.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ImageVariableDialog.cpp 2018-02-03 14:34:24.000000000 +0000 @@ -101,7 +101,7 @@ void ImageVariableDialog::InitValues() { - if(m_images.size()==0) + if(m_images.empty()) { return; }; @@ -236,7 +236,7 @@ } commands.push_back(new PanoCommand::UpdateSrcImagesCmd( *m_pano, m_images, SrcImgs )); } - if(varMap.size()>0) + if(!varMap.empty()) { for(HuginBase::UIntSet::const_iterator it=m_images.begin();it!=m_images.end();++it) { @@ -245,7 +245,7 @@ ); }; }; - if(commands.size()>0) + if(!commands.empty()) { PanoCommand::GlobalCmdHist::getInstance().addCommand(new PanoCommand::CombinedPanoCommand(*m_pano, commands)); return true; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/LocalizedFileTipProvider.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/LocalizedFileTipProvider.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/LocalizedFileTipProvider.cpp 2017-04-22 17:02:46.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/LocalizedFileTipProvider.cpp 2018-12-22 12:29:00.000000000 +0000 @@ -27,8 +27,8 @@ */ #include "hugin_config.h" -#include "base_wx/wxutils.h" #include "panoinc_WX.h" +#include "base_wx/wxutils.h" #include "hugin/LocalizedFileTipProvider.h" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/MainFrame.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/MainFrame.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/MainFrame.cpp 2018-01-26 16:28:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/MainFrame.cpp 2019-03-16 09:59:44.000000000 +0000 @@ -68,6 +68,7 @@ #include "base_wx/huginConfig.h" #include "hugin/AboutDialog.h" +#include "hugin/RawImport.h" #if HUGIN_HSI #include "PluginItems.h" @@ -140,34 +141,47 @@ // try to add as images std::vector filesv; + std::vector rawFilesv; wxArrayString invalidFiles; for (unsigned int i=0; i< filenames.GetCount(); i++) { wxFileName file(filenames[i]); - - if (file.GetExt().CmpNoCase(wxT("jpg")) == 0 || - file.GetExt().CmpNoCase(wxT("jpeg")) == 0 || - file.GetExt().CmpNoCase(wxT("tif")) == 0 || - file.GetExt().CmpNoCase(wxT("tiff")) == 0 || - file.GetExt().CmpNoCase(wxT("png")) == 0 || - file.GetExt().CmpNoCase(wxT("bmp")) == 0 || - file.GetExt().CmpNoCase(wxT("gif")) == 0 || - file.GetExt().CmpNoCase(wxT("pnm")) == 0 || - file.GetExt().CmpNoCase(wxT("sun")) == 0 || - file.GetExt().CmpNoCase(wxT("hdr")) == 0 || - file.GetExt().CmpNoCase(wxT("viff")) == 0 ) + // first check if raw file + // vigra::isImage reports also some raw files as image because + // technical some of them are tiff files + if (IsRawExtension(file.GetExt())) { - if(containsInvalidCharacters(filenames[i])) + if (containsInvalidCharacters(filenames[i])) { invalidFiles.Add(file.GetFullPath()); } else { - filesv.push_back((const char *)filenames[i].mb_str(HUGIN_CONV_FILENAME)); + rawFilesv.push_back((const char *)file.GetFullPath().mb_str(HUGIN_CONV_FILENAME)); }; } + else + { + // now check if drop file is a image + if (vigra::isImage(file.GetFullPath().mb_str(HUGIN_CONV_FILENAME))) + { + if (containsInvalidCharacters(filenames[i])) + { + invalidFiles.Add(file.GetFullPath()); + } + else + { + filesv.push_back((const char *)filenames[i].mb_str(HUGIN_CONV_FILENAME)); + }; + }; + }; + } + // show warning about invalid file names + if (!invalidFiles.empty()) + { + ShowFilenameWarning(mf, invalidFiles); } // we got some images to add. - if (filesv.size() > 0) + if (!filesv.empty()) { // use a Command to ensure proper undo and updating of GUI parts wxBusyCursor(); @@ -183,13 +197,35 @@ cmds.push_back(new PanoCommand::CenterPanoCmd(pano)); PanoCommand::GlobalCmdHist::getInstance().addCommand(new PanoCommand::CombinedPanoCommand(pano, cmds)); }; - - } - if(invalidFiles.size()>0) + }; + if (!rawFilesv.empty()) { - ShowFilenameWarning(mf, invalidFiles); - } - + if (rawFilesv.size() == 1) + { + wxMessageDialog message(mf, _("You selected only one raw file. This is not recommended.\nAll raw files should be converted at once."), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxICON_EXCLAMATION | wxOK | wxCANCEL); + message.SetOKLabel(_("Convert anyway.")); + if (message.ShowModal() != wxID_OK) + { + return true; + }; + }; + RawImportDialog dlg(mf, &pano, rawFilesv); + // check that raw files are from same camera and that all can be read + if (dlg.CheckRawFiles()) + { + // now show dialog + if (dlg.ShowModal() == wxID_OK) + { + PanoCommand::GlobalCmdHist::getInstance().addCommand(dlg.GetPanoCommand()); + }; + }; + }; return true; } @@ -373,6 +409,8 @@ SetMenuBar(mainMenu); m_optOnlyActiveImages = (wxConfigBase::Get()->Read(wxT("/OptimizePanel/OnlyActiveImages"), 1l) != 0); m_optIgnoreLineCp = false; + // observe the panorama, this should be the first observer + pano.addObserver(this); #ifdef HUGIN_HSI wxMenuBar* menubar=GetMenuBar(); @@ -633,9 +671,6 @@ wxYield(); DEBUG_TRACE(""); - // observe the panorama - pano.addObserver(this); - // Set sizing characteristics //set minumum size #if defined __WXMAC__ || defined __WXMSW__ @@ -755,6 +790,15 @@ void MainFrame::panoramaChanged(HuginBase::Panorama &pano) { + // set flag to indicate list should show correlation instead of error + if (m_showCorrelation == 2) + { + m_showCorrelation = 0; + }; + if (m_showCorrelation == 1) + { + ++m_showCorrelation; + }; wxToolBar* theToolBar = GetToolBar(); wxMenuBar* theMenuBar = GetMenuBar(); bool can_undo = PanoCommand::GlobalCmdHist::getInstance().canUndo(); @@ -906,6 +950,17 @@ { preview_frame->Close(true); } + if(gl_preview_frame) + { + if(m_guiLevel==GUI_SIMPLE) + { + gl_preview_frame->StorePositionAndSize(); + } + else + { + gl_preview_frame->Close(true); + }; + } ImageCache::getInstance().flush(); Destroy(); @@ -1200,12 +1255,7 @@ if(cmd!=NULL) { PanoCommand::GlobalCmdHist::getInstance().addCommand(cmd); - } - else - { - // nothing to open - SetStatusText( _("Add Image: cancel")); - } + }; DEBUG_TRACE(""); } @@ -1220,7 +1270,7 @@ invalidFiles.Add(filenameArray[i]); }; }; - if(invalidFiles.size()>0) + if(!invalidFiles.empty()) { ShowFilenameWarning(this, invalidFiles); } @@ -1232,7 +1282,7 @@ } // we got some images to add. - if (filesv.size() > 0) { + if (!filesv.empty()) { // use a Command to ensure proper undo and updating of GUI // parts wxBusyCursor(); @@ -1254,7 +1304,6 @@ }; }; - void MainFrame::OnShowPanel(wxCommandEvent & e) { if(e.GetId()==XRCID("ID_SHOW_PANEL_MASK")) @@ -1472,12 +1521,6 @@ }; } -void MainFrame::UpdatePanels( wxCommandEvent& WXUNUSED(event) ) -{ // Maybe this can be invoced by the Panorama::Changed() or - // something like this. So no everytime update would be needed. - DEBUG_TRACE(""); -} - void MainFrame::OnTogglePreviewFrame(wxCommandEvent & e) { DEBUG_TRACE(""); @@ -1838,6 +1881,7 @@ } } } + m_showCorrelation = 1; wxString result; result.Printf(_("%d points fine-tuned, %d points not updated due to low correlation\n\nHint: The errors of the fine-tuned points have been set to the correlation coefficient\nProblematic points can be spotted (just after fine-tune, before optimizing)\nby an error <= %.3f.\nThe error of points without a well defined peak (typically in regions with uniform color)\nwill be set to 0\n\nUse the Control Point list (F3) to see all points of the current project\n"), nGood, nBad, corrThresh); @@ -1853,7 +1897,7 @@ if(pano.getCtrlPoints().size()<2) return; HuginBase::UIntSet cps=getCPinMasks(pano); - if(cps.size()>0) + if(!cps.empty()) { PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::RemoveCtrlPointsCmd(pano,cps) @@ -2085,6 +2129,11 @@ return m_filename; } +bool MainFrame::IsShowingCorrelation() const +{ + return m_showCorrelation > 0; +} + void MainFrame::OnMRUFiles(wxCommandEvent &e) { size_t index = e.GetId() - wxID_FILE1; @@ -2347,6 +2396,7 @@ // get assistant queue const wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); + wxArrayString tempfiles; HuginQueue::CommandQueue* commands; if (userdefinedAssistant.IsEmpty()) { @@ -2354,10 +2404,11 @@ } else { - commands = HuginQueue::GetAssistantCommandQueueUserDefined(pano, exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR), scriptFileName.GetFullPath(), userdefinedAssistant); + std::stringstream errors; + commands = HuginQueue::GetAssistantCommandQueueUserDefined(pano, exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR), scriptFileName.GetFullPath(), userdefinedAssistant, tempfiles, errors); if (commands->empty()) { - wxMessageBox(_("The assistant queue is empty. This indicates an error in the user defined assistant file."), + wxMessageBox(_("The assistant queue is empty. This indicates an error in the user defined assistant file.") + "\n\n" + wxString(errors.str()), _("Error"), wxOK | wxICON_ERROR, mainWin); //delete temporary files wxRemoveFile(scriptFileName.GetFullPath()); @@ -2375,6 +2426,20 @@ //delete temporary files wxRemoveFile(scriptFileName.GetFullPath()); + if (!tempfiles.IsEmpty()) + { + for (auto& f : tempfiles) + { + wxRemoveFile(f); + }; + }; + // check that GUI level is still approbiate + const GuiLevel reqGuiLevel = GetMinimumGuiLevel(pano); + if (reqGuiLevel > m_guiLevel) + { + // output of assistant requires higher GUI level + SetGuiLevel(reqGuiLevel); + }; //if return value is non-zero, an error occurred in the assistant if(ret!=0) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/MainFrame.h hugin-2019.0.0+dfsg/src/hugin1/hugin/MainFrame.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/MainFrame.h 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/MainFrame.h 2019-02-02 10:11:01.000000000 +0000 @@ -81,7 +81,7 @@ * It contains the menu & statusbar and a big notebook with * the different tabs. It also holds the Panorama model. * - * it therefor also hold operations that determine the lifecycle + * it therefore also hold operations that determine the lifecycle * of the panorama object (new, open, save, quit). */ class MainFrame : public wxFrame, public HuginBase::PanoramaObserver, public AppBase::ProgressDisplay @@ -179,6 +179,7 @@ const wxString GetSelectedCPGenerator(); wxString getProjectName(); + bool IsShowingCorrelation() const; struct celeste::svm_model* GetSVMModel(); @@ -238,7 +239,6 @@ void OnMRUFiles(wxCommandEvent &e); /** event handler for full screen */ void OnFullScreen(wxCommandEvent &e); - void UpdatePanels(wxCommandEvent & e); void OnSize(wxSizeEvent &e); void enableTools(bool option); /** adds the given files to the projects, with checking for invalid filenames */ @@ -278,6 +278,8 @@ // filename of the current project wxString m_filename; + // true, if cp errors contains correlation instead of error + int m_showCorrelation=0; // self static MainFrame* m_this; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/MaskEditorPanel.cpp 2018-12-22 12:29:29.000000000 +0000 @@ -24,11 +24,7 @@ * */ -// often necessary before panoinc.h -#ifdef __APPLE__ #include "panoinc_WX.h" -#endif - #include "panoinc.h" #include @@ -222,7 +218,8 @@ config->Write(wxT("/MaskEditorPanel/ShowActiveMasks"),XRCCTRL(*this,"mask_editor_show_active_masks",wxCheckBox)->GetValue()); config->Write(wxT("/MaskEditorPanel/DefaultMaskType"),(long)m_defaultMaskType); config->Write(wxT("/MaskEditorPanel/CropImagesLens"), m_cropLens->GetValue()); - + config->Flush(); + DEBUG_TRACE("dtor"); if (m_imageGroups) { @@ -233,7 +230,7 @@ size_t MaskEditorPanel::GetImgNr() { - if(m_selectedImages.size()==0) + if(m_selectedImages.empty()) { return UINT_MAX; } @@ -395,7 +392,7 @@ }; }; - if (m_selectedImages.size() > 0) + if (!m_selectedImages.empty()) { if (set_contains(changed, GetImgNr())) { @@ -416,7 +413,7 @@ setMask(UINT_MAX); setImage(GetImgNr()); - bool hasImage = (m_selectedImages.size() > 0); + const bool hasImage = !m_selectedImages.empty(); m_left_textctrl->Enable(hasImage); m_top_textctrl->Enable(hasImage); m_bottom_textctrl->Enable(hasImage); @@ -507,7 +504,7 @@ HuginBase::MaskPolygonVector loadedMasks; LoadMaskFromStream(in, maskImageSize, loadedMasks, GetImgNr()); in.close(); - if(maskImageSize.area()==0 || loadedMasks.size()==0) + if(maskImageSize.area()==0 || loadedMasks.empty()) { wxMessageBox(wxString::Format(_("Could not parse mask from file %s."),dlg.GetPath().c_str()),_("Warning"),wxOK | wxICON_EXCLAMATION,this); return; @@ -564,7 +561,7 @@ LoadMaskFromStream(stream, maskImageSize, loadedMasks, GetImgNr()); } wxTheClipboard->Close(); - if(maskImageSize.area()==0 || loadedMasks.size()==0) + if(maskImageSize.area()==0 || loadedMasks.empty()) { wxBell(); return; @@ -646,6 +643,10 @@ { m_editImg->Scroll(posX*factor - ctrlSize.GetWidth() / 2, posY*factor - ctrlSize.GetHeight() / 2); }; + if (e.GetString() == "update_selection") + { + XRCCTRL(*this, "mask_editor_choice_zoom", wxChoice)->SetSelection(e.GetSelection()); + }; } void MaskEditorPanel::OnColourChanged(wxColourPickerEvent &e) @@ -681,7 +682,7 @@ m_maskList->Freeze(); if(GetImgNr()0) + if(!m_currentMasks.empty()) { if(m_maskList->GetItemCount()!=m_currentMasks.size()) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/MaskImageCtrl.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/MaskImageCtrl.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/MaskImageCtrl.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/MaskImageCtrl.cpp 2018-02-24 07:52:42.000000000 +0000 @@ -921,7 +921,7 @@ for(HuginBase::UIntSet::const_reverse_iterator it=points.rbegin();it!=points.rend();++it) m_editingMask.removePoint(*it); // now update set of selected points - if(m_selectedPoints.size()>0) + if(!m_selectedPoints.empty()) { std::vector mappedSelectedPoints(m_imageMask[m_activeMask].getMaskPolygon().size()); for(unsigned int i=0;i0) && (m_editingMask.getMaskPolygon().size() - m_selectedPoints.size() > 2)) + if ((!m_selectedPoints.empty()) && (m_editingMask.getMaskPolygon().size() - m_selectedPoints.size() > 2)) { for (HuginBase::UIntSet::const_reverse_iterator it = m_selectedPoints.rbegin(); it != m_selectedPoints.rend(); ++it) m_editingMask.removePoint(*it); @@ -1013,6 +1013,41 @@ }; }; }; + } + else + { + // handle key 0|1|2 only when editor state allows it + if (m_maskEditState == NO_MASK || m_maskEditState == NO_SELECTION || + m_maskEditState == POINTS_SELECTED || m_maskEditState == CROP_SHOWING) + { + if (key == '1') + { + wxCommandEvent zoomEvent(wxEVT_CHOICE, XRCID("mask_editor_choice_zoom")); + zoomEvent.SetInt(0); + zoomEvent.SetString("update_selection"); + GetParent()->GetEventHandler()->AddPendingEvent(zoomEvent); + } + else + { + if (key == '2') + { + wxCommandEvent zoomEvent(wxEVT_CHOICE, XRCID("mask_editor_choice_zoom")); + zoomEvent.SetInt(2); + zoomEvent.SetString("update_selection"); + GetParent()->GetEventHandler()->AddPendingEvent(zoomEvent); + } + else + { + if (key == '0') + { + wxCommandEvent zoomEvent(wxEVT_CHOICE, XRCID("mask_editor_choice_zoom")); + zoomEvent.SetInt(1); + zoomEvent.SetString("update_selection"); + GetParent()->GetEventHandler()->AddPendingEvent(zoomEvent); + }; + }; + }; + }; }; if(!processed) e.Skip(); @@ -1177,7 +1212,7 @@ dc.DrawRectangle(0,m_bitmap.GetHeight()+2*offset,clientSize.GetWidth(),clientSize.GetHeight()-m_bitmap.GetHeight()+2*offset); }; }; - if (m_maskMode && m_showActiveMasks && (m_cropMode != HuginBase::SrcPanoImage::NO_CROP || m_masksToDraw.size()>0)) + if (m_maskMode && m_showActiveMasks && (m_cropMode != HuginBase::SrcPanoImage::NO_CROP || !m_masksToDraw.empty())) { //whole image, we need it several times wxRegion wholeImage(transform(applyRot(hugin_utils::FDiff2D(0,0))), @@ -1212,7 +1247,7 @@ break; }; }; - if(m_masksToDraw.size()>0) + if(!m_masksToDraw.empty()) { for(unsigned int i=0;i0) + if(m_maskMode && !m_imageMask.empty()) { //now draw all polygons HuginBase::MaskPolygonVector maskList=m_imageMask; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/MaskLoadDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/MaskLoadDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/MaskLoadDialog.cpp 2015-05-10 06:52:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/MaskLoadDialog.cpp 2018-02-03 14:34:24.000000000 +0000 @@ -107,7 +107,7 @@ void MaskLoadDialog::ProcessMask(wxCommandEvent &e) { m_processedMask=m_loadedMask; - if(m_processedMask.size()==0) + if(m_processedMask.empty()) { UpdatePreviewImage(); return; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/OptimizePanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/OptimizePanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/OptimizePanel.cpp 2017-12-10 09:30:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/OptimizePanel.cpp 2018-02-03 14:34:24.000000000 +0000 @@ -156,7 +156,7 @@ { // use only selected images. imgs = m_pano->getActiveImages(); - if (imgs.size() == 0) + if (imgs.empty()) { wxMessageBox(_("The project does not contain any active images.\nPlease activate at least one image in the (fast) preview window.\nOptimization canceled."), #ifdef _WIN32 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/OptimizePhotometricPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/OptimizePhotometricPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/OptimizePhotometricPanel.cpp 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/OptimizePhotometricPanel.cpp 2019-02-17 14:59:52.000000000 +0000 @@ -213,11 +213,9 @@ int ok = wxMessageBox(_("The same vignetting and response parameters should\nbe applied for all images of a lens.\nCurrently each image can have different parameters.\nLink parameters?"), _("Link parameters"), wxYES_NO | wxICON_INFORMATION); if (ok == wxYES) { - // perform all the commands we stocked up earilier. - for (std::vector::iterator it = commands.begin(); it != commands.end(); ++it) - { - PanoCommand::GlobalCmdHist::getInstance().addCommand(*it); - } + // perform all the commands we stocked up earilier using a CombinedPanoCommand, so only + // one command is in the history stack. + PanoCommand::GlobalCmdHist::getInstance().addCommand(new PanoCommand::CombinedPanoCommand(*m_pano, commands)); } else { @@ -328,7 +326,7 @@ { return; }; - if (points.size() == 0) + if (points.empty()) { wxMessageBox(_("Error: no overlapping points found, Photometric optimization aborted"), _("Error")); return; @@ -396,15 +394,13 @@ DEBUG_DEBUG("Applying vignetting corr"); // TODO: merge into a single update command const HuginBase::VariableMapVector & vars = optPano.getVariables(); - PanoCommand::GlobalCmdHist::getInstance().addCommand( - new PanoCommand::UpdateImagesVariablesCmd(*m_pano, imgs, vars) - ); + std::vector optCommands; + optCommands.push_back(new PanoCommand::UpdateImagesVariablesCmd(*m_pano, imgs, vars)); //now update panorama exposure value HuginBase::PanoramaOptions opts = m_pano->getOptions(); opts.outputExposureValue = HuginBase::CalculateMeanExposure::calcMeanExposure(*m_pano); - PanoCommand::GlobalCmdHist::getInstance().addCommand( - new PanoCommand::SetPanoOptionsCmd(*m_pano, opts) - ); + optCommands.push_back(new PanoCommand::SetPanoOptionsCmd(*m_pano, opts)); + PanoCommand::GlobalCmdHist::getInstance().addCommand(new PanoCommand::CombinedPanoCommand(*m_pano, optCommands)); } } diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/OverviewCameraTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/OverviewCameraTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/OverviewCameraTool.cpp 2015-07-22 18:56:42.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/OverviewCameraTool.cpp 2018-12-22 15:39:14.000000000 +0000 @@ -20,7 +20,9 @@ */ - +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "OverviewCameraTool.h" #include "GLViewer.h" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/OverviewOutlinesTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/OverviewOutlinesTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/OverviewOutlinesTool.cpp 2016-06-25 06:45:14.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/OverviewOutlinesTool.cpp 2018-12-22 15:39:23.000000000 +0000 @@ -19,6 +19,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include #ifdef __WXMAC__ #include @@ -427,7 +430,7 @@ stack.push_back(Rec(true, true, true, true)); } - while(stack.size() > 0) { + while(!stack.empty()) { Rec edge; if (outline) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PanoOperation.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PanoOperation.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PanoOperation.cpp 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PanoOperation.cpp 2019-02-02 10:11:01.000000000 +0000 @@ -32,6 +32,10 @@ #include "algorithms/optimizer/ImageGraph.h" #include "algorithms/control_points/CleanCP.h" #include "celeste/Celeste.h" +#ifdef _WIN32 +// workaround for a conflict between exiv2 and wxWidgets/CMake built +#define HAVE_PID_T 1 +#endif #include #include #include "base_wx/LensTools.h" @@ -39,6 +43,7 @@ #include "hugin/ResetDialog.h" #include "hugin/ChangeImageVariableDialog.h" #include "hugin/MainFrame.h" +#include "hugin/RawImport.h" #include #include @@ -84,14 +89,14 @@ * @param files vector, to which the selected valid filenames will be added * @returns true, if a valid image was selected, otherwise false */ -bool AddImageDialog(wxWindow* parent, std::vector& files) +bool AddImageDialog(wxWindow* parent, std::vector& files, bool& withRaws) { // get stored path wxConfigBase* config = wxConfigBase::Get(); wxString path = config->Read(wxT("/actualPath"), wxT("")); wxFileDialog dlg(parent,_("Add images"), path, wxT(""), - HUGIN_WX_FILE_IMG_FILTER, + withRaws ? GetFileDialogImageAndRawFilters() : GetFileDialogImageFilters(), wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST | wxFD_PREVIEW, wxDefaultPosition); dlg.SetDirectory(path); @@ -102,19 +107,42 @@ img_ext = config->Read(wxT("lastImageType")).c_str(); } if (img_ext == wxT("all images")) - dlg.SetFilterIndex(0); - else if (img_ext == wxT("jpg")) - dlg.SetFilterIndex(1); - else if (img_ext == wxT("tiff")) - dlg.SetFilterIndex(2); - else if (img_ext == wxT("png")) - dlg.SetFilterIndex(3); - else if (img_ext == wxT("hdr")) - dlg.SetFilterIndex(4); - else if (img_ext == wxT("exr")) - dlg.SetFilterIndex(5); - else if (img_ext == wxT("all files")) - dlg.SetFilterIndex(6); + { + dlg.SetFilterIndex(0); + } + else + { + if (!withRaws) + { + if (img_ext == wxT("jpg")) + dlg.SetFilterIndex(1); + else if (img_ext == wxT("tiff")) + dlg.SetFilterIndex(2); + else if (img_ext == wxT("png")) + dlg.SetFilterIndex(3); + else if (img_ext == wxT("hdr")) + dlg.SetFilterIndex(4); + else if (img_ext == wxT("exr")) + dlg.SetFilterIndex(5); + else if (img_ext == wxT("all files")) + dlg.SetFilterIndex(6); + } + else + { + if (img_ext == wxT("all raws")) + dlg.SetFilterIndex(1); + else if (img_ext == wxT("jpg")) + dlg.SetFilterIndex(2); + else if (img_ext == wxT("tiff")) + dlg.SetFilterIndex(3); + else if (img_ext == wxT("png")) + dlg.SetFilterIndex(4); + else if (img_ext == wxT("hdr")) + dlg.SetFilterIndex(5); + else if (img_ext == wxT("exr")) + dlg.SetFilterIndex(6); + }; + }; // call the file dialog if (dlg.ShowModal() == wxID_OK) @@ -131,16 +159,33 @@ config->Write(wxT("/actualPath"), dlg.GetDirectory()); #endif // save the image extension - switch (dlg.GetFilterIndex()) + if (!withRaws) { - case 0: config->Write(wxT("lastImageType"), wxT("all images")); break; - case 1: config->Write(wxT("lastImageType"), wxT("jpg")); break; - case 2: config->Write(wxT("lastImageType"), wxT("tiff")); break; - case 3: config->Write(wxT("lastImageType"), wxT("png")); break; - case 4: config->Write(wxT("lastImageType"), wxT("hdr")); break; - case 5: config->Write(wxT("lastImageType"), wxT("exr")); break; - case 6: config->Write(wxT("lastImageType"), wxT("all files")); break; + switch (dlg.GetFilterIndex()) + { + case 0: config->Write(wxT("lastImageType"), wxT("all images")); break; + case 1: config->Write(wxT("lastImageType"), wxT("jpg")); break; + case 2: config->Write(wxT("lastImageType"), wxT("tiff")); break; + case 3: config->Write(wxT("lastImageType"), wxT("png")); break; + case 4: config->Write(wxT("lastImageType"), wxT("hdr")); break; + case 5: config->Write(wxT("lastImageType"), wxT("exr")); break; + case 6: config->Write(wxT("lastImageType"), wxT("all files")); break; + }; } + else + { + switch (dlg.GetFilterIndex()) + { + case 0: config->Write(wxT("lastImageType"), wxT("all images")); break; + case 1: config->Write(wxT("lastImageType"), wxT("all raws")); break; + case 2: config->Write(wxT("lastImageType"), wxT("jpg")); break; + case 3: config->Write(wxT("lastImageType"), wxT("tiff")); break; + case 4: config->Write(wxT("lastImageType"), wxT("png")); break; + case 5: config->Write(wxT("lastImageType"), wxT("hdr")); break; + case 6: config->Write(wxT("lastImageType"), wxT("exr")); break; + } + withRaws = dlg.GetFilterIndex() == 1; + }; //check for forbidden/non working chars wxArrayString invalidFiles; @@ -151,7 +196,7 @@ invalidFiles.Add(Pathnames[i]); }; }; - if(invalidFiles.size()>0) + if(!invalidFiles.empty()) { ShowFilenameWarning(parent, invalidFiles); return false; @@ -173,11 +218,46 @@ PanoCommand::PanoCommand* AddImageOperation::GetInternalCommand(wxWindow* parent, HuginBase::Panorama& pano, HuginBase::UIntSet images) { std::vector files; - if(AddImageDialog(parent, files)) + bool withRaws = true; + if(AddImageDialog(parent, files, withRaws)) { - if(files.size()>0) + if(!files.empty()) { - return new PanoCommand::wxAddImagesCmd(pano,files); + if (withRaws) + { + if (files.size() == 1) + { + wxMessageDialog message(parent, _("You selected only one raw file. This is not recommended.\nAll raw files should be converted at once."), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxICON_EXCLAMATION | wxYES_NO ); + message.SetYesNoLabels(_("Convert anyway."), _("Let me select several raw files.")); + if (message.ShowModal() == wxID_NO) + { + // post new add image event to open dialog again + wxCommandEvent newAddEvent(wxEVT_COMMAND_BUTTON_CLICKED, XRCID("action_add_images")); + MainFrame::Get()->GetEventHandler()->AddPendingEvent(newAddEvent); + return NULL; + }; + }; + RawImportDialog dlg(parent, &pano, files); + // check that raw files are from same camera and that all can be read + if (dlg.CheckRawFiles()) + { + // now show dialog + if (dlg.ShowModal() == wxID_OK) + { + return dlg.GetPanoCommand(); + }; + }; + } + else + { + return new PanoCommand::wxAddImagesCmd(pano, files); + }; }; }; return NULL; @@ -265,12 +345,13 @@ std::vector files; if(pano.getNrOfImages()==0) { - if(!AddImageDialog(parent,files)) + bool withRaws = false; + if(!AddImageDialog(parent,files, withRaws)) { return NULL; }; //just in case - if(files.size()==0) + if(files.empty()) { return NULL; }; @@ -358,7 +439,7 @@ } } - if(files.size()>0) + if(!files.empty()) { // sort files by date sortbytime spred(timeMap); @@ -450,7 +531,7 @@ bool NewLensOperation::IsEnabled(HuginBase::Panorama& pano, HuginBase::UIntSet images, GuiLevel guiLevel) { - if(pano.getNrOfImages()==0 || images.size()==0) + if(pano.getNrOfImages()==0 || images.empty()) { return false; } @@ -473,7 +554,7 @@ bool ChangeLensOperation::IsEnabled(HuginBase::Panorama& pano, HuginBase::UIntSet images, GuiLevel guiLevel) { - if(pano.getNrOfImages()==0 || images.size()==0) + if(pano.getNrOfImages()==0 || images.empty()) { return false; } @@ -618,7 +699,7 @@ PanoCommand::PanoCommand* RemoveControlPointsOperation::GetInternalCommand(wxWindow* parent, HuginBase::Panorama& pano, HuginBase::UIntSet images) { HuginBase::UIntSet selImages; - if(images.size()==0) + if(images.empty()) { fill_set(selImages,0,pano.getNrOfCtrlPoints()-1); } @@ -635,7 +716,7 @@ cpsToDelete.insert(it - cps.begin()); } } - if(cpsToDelete.size()==0) + if(cpsToDelete.empty()) { wxMessageBox(_("Selected images have no control points."), #ifdef __WXMSW__ @@ -705,7 +786,7 @@ { //now run the second step HuginBase::UIntSet removedCP2=getCPoutsideLimit(newPano, 2.0); - if(removedCP2.size()>0) + if(!removedCP2.empty()) { for(HuginBase::UIntSet::const_iterator it=removedCP2.begin();it!=removedCP2.end();++it) { @@ -718,7 +799,7 @@ { return NULL; } - if (removedCPs.size()>0) + if (!removedCPs.empty()) { wxMessageBox(wxString::Format(_("Removed %lu control points"), (unsigned long int)removedCPs.size()), _("Cleaning"), wxOK | wxICON_INFORMATION, parent); return new PanoCommand::RemoveCtrlPointsCmd(pano,removedCPs); @@ -758,7 +839,7 @@ { // Image to analyse HuginBase::CPointVector cps=pano.getCtrlPointsVectorForImage(*it); - if(cps.size()==0) + if(cps.empty()) { if (!progress.updateDisplayValue()) { @@ -793,7 +874,7 @@ { return NULL; }; - if(cloudCP.size()>0) + if(!cloudCP.empty()) { for(HuginBase::UIntSet::const_iterator it2=cloudCP.begin();it2!=cloudCP.end(); ++it2) { @@ -810,7 +891,7 @@ { return NULL; } - if (cpsToRemove.size()>0) + if (!cpsToRemove.empty()) { wxMessageBox(wxString::Format(_("Removed %lu control points"), (unsigned long int) cpsToRemove.size()), _("Celeste result"),wxOK|wxICON_INFORMATION); return new PanoCommand::RemoveCtrlPointsCmd(pano,cpsToRemove); @@ -887,14 +968,10 @@ return NULL; }; }; - if(images.size()==0) + if(images.empty()) { fill_set(images,0,pano.getNrOfImages()-1); }; - // If we should unlink exposure value (to load it from EXIF) - bool needs_unlink_exposure = false; - bool needs_unlink_redbal = false; - bool needs_unlink_bluebal = false; double redBalanceAnchor = pano.getImage(pano.getOptions().colorReferenceImage).getExifRedBalance(); double blueBalanceAnchor = pano.getImage(pano.getOptions().colorReferenceImage).getExifBlueBalance(); if(fabs(redBalanceAnchor)<1e-2) @@ -958,12 +1035,6 @@ { if(m_resetExposure==1 || m_resetExposure==3) { - if (pano.getImage(imgNr).ExposureValueisLinked()) - { - /* Unlink exposure value variable so the EXIF values can be - * independant. */ - needs_unlink_exposure = true; - } //reset to exif value double eV=srcImg.calcExifExposureValue(); if ((m_resetExposure == 1 && eV != 0) || m_resetExposure == 3) @@ -981,18 +1052,6 @@ { if(m_resetColor==1) { - if (pano.getImage(imgNr).WhiteBalanceRedisLinked()) - { - /* Unlink red balance variable so the EXIF values can be - * independant. */ - needs_unlink_redbal = true; - } - if (pano.getImage(imgNr).WhiteBalanceBlueisLinked()) - { - /* Unlink red balance variable so the EXIF values can be - * independant. */ - needs_unlink_bluebal = true; - } double redBal=1; double blueBal=1; const HuginBase::SrcPanoImage& img=pano.getImage(imgNr); @@ -1041,48 +1100,6 @@ vars.push_back(ImgVars); }; std::vector reset_commands; - if (needs_unlink_exposure) - { - std::set variables; - variables.insert(HuginBase::ImageVariableGroup::IVE_ExposureValue); - - reset_commands.push_back( - new PanoCommand::ChangePartImagesLinkingCmd( - pano, - images, - variables, - false, - HuginBase::StandardImageVariableGroups::getLensVariables()) - ); - } - if (needs_unlink_redbal) - { - std::set variables; - variables.insert(HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed); - - reset_commands.push_back( - new PanoCommand::ChangePartImagesLinkingCmd( - pano, - images, - variables, - false, - HuginBase::StandardImageVariableGroups::getLensVariables()) - ); - } - if (needs_unlink_bluebal) - { - std::set variables; - variables.insert(HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue); - - reset_commands.push_back( - new PanoCommand::ChangePartImagesLinkingCmd( - pano, - images, - variables, - false, - HuginBase::StandardImageVariableGroups::getLensVariables()) - ); - } reset_commands.push_back( new PanoCommand::UpdateImagesVariablesCmd(pano, images, vars) ); @@ -1171,7 +1188,7 @@ bool NewStackOperation::IsEnabled(HuginBase::Panorama& pano, HuginBase::UIntSet images, GuiLevel guiLevel) { - if(pano.getNrOfImages()==0 || images.size()==0) + if(pano.getNrOfImages()==0 || images.empty()) { return false; } @@ -1194,7 +1211,7 @@ bool ChangeStackOperation::IsEnabled(HuginBase::Panorama& pano, HuginBase::UIntSet images, GuiLevel guiLevel) { - if(pano.getNrOfImages()==0 || images.size()==0) + if(pano.getNrOfImages()==0 || images.empty()) { return false; } diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PanoPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PanoPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PanoPanel.cpp 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PanoPanel.cpp 2019-03-13 19:22:52.000000000 +0000 @@ -271,6 +271,7 @@ { DEBUG_TRACE("dtor"); wxConfigBase::Get()->Write(wxT("Stitcher/DefaultRemapper"),m_RemapperChoice->GetSelection()); + wxConfigBase::Get()->Flush(); m_HFOVText->PopEventHandler(true); m_VFOVText->PopEventHandler(true); @@ -371,7 +372,7 @@ m_VFOVText->ChangeValue(wxString(val.c_str(), wxConvLocal)); // disable VFOV edit field, due to bugs in setHeight(), setWidth() - bool hasImages = pano->getActiveImages().size() > 0; + const bool hasImages = !pano->getActiveImages().empty(); m_VFOVText->Enable(m_keepViewOnResize); m_CalcOptWidthButton->Enable(m_keepViewOnResize && hasImages); m_CalcHFOVButton->Enable(m_keepViewOnResize && hasImages); @@ -1001,7 +1002,7 @@ void PanoPanel::DoCalcFOV(wxCommandEvent & e) { DEBUG_TRACE(""); - if (pano->getActiveImages().size() == 0) return; + if (pano->getActiveImages().empty()) return; HuginBase::PanoramaOptions opt = pano->getOptions(); HuginBase::CalculateFitPanorama fitPano(*pano); @@ -1022,7 +1023,7 @@ void PanoPanel::DoCalcOptimalWidth(wxCommandEvent & e) { - if (pano->getActiveImages().size() == 0) return; + if (pano->getActiveImages().empty()) return; HuginBase::PanoramaOptions opt = pano->getOptions(); double sizeFactor = 1.0; @@ -1046,7 +1047,7 @@ void PanoPanel::DoCalcOptimalROI(wxCommandEvent & e) { DEBUG_INFO("Dirty ROI Calc\n"); - if (pano->getActiveImages().size() == 0) + if (pano->getActiveImages().empty()) { return; }; @@ -1096,7 +1097,7 @@ if(tempDir.Last()!=wxFileName::GetPathSeparator()) tempDir.Append(wxFileName::GetPathSeparator()); wxString currentPTOfn = wxFileName::CreateTempFileName(tempDir+wxT("huginpto_")); - if(currentPTOfn.size() == 0) { + if(currentPTOfn.empty()) { wxMessageBox(_("Could not create temporary project file"),_("Error"), wxCANCEL | wxICON_ERROR,this); return; @@ -1382,7 +1383,7 @@ } }; wxString currentPTOfn = wxFileName::CreateTempFileName(tempDir + wxT("huginpto_")); - if (currentPTOfn.size() == 0) + if (currentPTOfn.empty()) { wxMessageBox(_("Could not create temporary project file"), _("Error"), wxCANCEL | wxICON_ERROR, this); @@ -1733,7 +1734,7 @@ bool PanoPanel::CheckHasImages() { HuginBase::UIntSet images=getImagesinROI(*pano, pano->getActiveImages()); - if(images.size()==0) + if(images.empty()) { wxMessageBox(_("There are no active images in the output region.\nPlease check your settings, so that at least one image is in the output region."), #ifdef _WIN32 @@ -1743,7 +1744,7 @@ #endif wxOK | wxICON_INFORMATION); }; - return images.size()>0; + return !images.empty(); }; bool PanoPanel::CheckFreeSpace(const wxString& folder) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PanosphereSphereTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PanosphereSphereTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PanosphereSphereTool.cpp 2015-09-15 15:59:23.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PanosphereSphereTool.cpp 2018-12-22 15:39:34.000000000 +0000 @@ -21,6 +21,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include #ifdef __WXMAC__ #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PapywizardImport.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PapywizardImport.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PapywizardImport.cpp 2016-03-16 18:40:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PapywizardImport.cpp 2018-12-22 15:23:05.000000000 +0000 @@ -22,9 +22,9 @@ * */ +#include "panoinc_WX.h" #include "PapywizardImport.h" -#include "panoinc_WX.h" #include "hugin_utils/utils.h" #include #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.cpp 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.cpp 2019-02-02 10:11:00.000000000 +0000 @@ -64,6 +64,9 @@ EVT_BUTTON(XRCID("prefs_defaults"), PreferencesDialog::OnRestoreDefaults) EVT_BUTTON(XRCID("prefs_enblend_select"), PreferencesDialog::OnEnblendExe) EVT_BUTTON(XRCID("prefs_enblend_enfuse_select"), PreferencesDialog::OnEnfuseExe) + EVT_BUTTON(XRCID("pref_raw_dcraw_exe_select"), PreferencesDialog::OnDcrawExe) + EVT_BUTTON(XRCID("pref_raw_rt_exe_select"), PreferencesDialog::OnRawTherapeeExe) + EVT_BUTTON(XRCID("pref_raw_darktable_exe_select"), PreferencesDialog::OnDarktableExe) EVT_BUTTON(XRCID("pref_exiftool_argfile_choose"), PreferencesDialog::OnExifArgfileChoose) EVT_BUTTON(XRCID("pref_exiftool_argfile_edit"), PreferencesDialog::OnExifArgfileEdit) EVT_BUTTON(XRCID("pref_exiftool_argfile2_choose"), PreferencesDialog::OnExifArgfile2Choose) @@ -199,6 +202,11 @@ lang_choice->Append(_("Valencian (Southern Catalan)"), lp); lang_choice->SetSelection(0); + // enable auto completion on raw converter executables + XRCCTRL(*this, "pref_raw_dcraw_exe", wxTextCtrl)->AutoCompleteFileNames(); + XRCCTRL(*this, "pref_raw_rt_exe", wxTextCtrl)->AutoCompleteFileNames(); + XRCCTRL(*this, "pref_raw_darktable_exe", wxTextCtrl)->AutoCompleteFileNames(); + // default blender settings FillBlenderList(XRCCTRL(*this, "pref_default_blender", wxChoice)); @@ -323,6 +331,55 @@ } } +void PreferencesDialog::OnDcrawExe(wxCommandEvent & e) +{ + wxTextCtrl* ctrl = XRCCTRL(*this, "pref_raw_dcraw_exe", wxTextCtrl); + wxFileDialog dlg(this, _("Select dcraw"), "", ctrl->GetValue(), +#ifdef __WXMSW__ + _("Executables (*.exe)|*.exe"), +#else + wxT("*"), +#endif + wxFD_OPEN, wxDefaultPosition); + if (dlg.ShowModal() == wxID_OK) + { + ctrl->SetValue(dlg.GetPath()); + }; +}; + +void PreferencesDialog::OnRawTherapeeExe(wxCommandEvent & e) +{ + wxTextCtrl* ctrl = XRCCTRL(*this, "pref_raw_rt_exe", wxTextCtrl); + wxFileDialog dlg(this, _("Select RawTherapee-cli"), "", ctrl->GetValue(), +#ifdef __WXMSW__ + _("Executables (*.exe)|*.exe"), +#else + wxT("*"), +#endif + wxFD_OPEN, wxDefaultPosition); + if (dlg.ShowModal() == wxID_OK) + { + ctrl->SetValue(dlg.GetPath()); + }; +}; + +void PreferencesDialog::OnDarktableExe(wxCommandEvent & e) +{ + wxTextCtrl* ctrl = XRCCTRL(*this, "pref_raw_darktable_exe", wxTextCtrl); + wxFileDialog dlg(this, _("Select Darktable-cli"), "", ctrl->GetValue(), +#ifdef __WXMSW__ + _("Executables (*.exe)|*.exe"), +#else + wxT("*"), +#endif + wxFD_OPEN, wxDefaultPosition); + if (dlg.ShowModal() == wxID_OK) + { + ctrl->SetValue(dlg.GetPath()); + }; +}; + + void PreferencesDialog::OnCustomEnblend(wxCommandEvent& e) { XRCCTRL(*this, "prefs_enblend_EnblendExe", wxTextCtrl)->Enable(e.IsChecked()); @@ -582,6 +639,11 @@ // auto-rotate t = cfg->Read("/CPEditorPanel/AutoRot", 1l) == 1; MY_BOOL_VAL("pref_autorotate", t); + + // raw converter programs paths + MY_STR_VAL("pref_raw_dcraw_exe", cfg->Read("/RawImportDialog/dcrawExe", "")); + MY_STR_VAL("pref_raw_rt_exe", cfg->Read("/RawImportDialog/RTExe", "")); + MY_STR_VAL("pref_raw_darktable_exe", cfg->Read("/RawImportDialog/DarktableExe", "")); }; // filename panel @@ -808,6 +870,10 @@ // projection hints cfg->Write(wxT("/GLPreviewFrame/ShowProjectionHints"), HUGIN_SHOW_PROJECTION_HINTS); cfg->Write("/CPEditorPanel/AutoRot", 1l); + // raw converter + cfg->Write("/RawImportDialog/dcrawExe", ""); + cfg->Write("/RawImportDialog/RTExe", ""); + cfg->Write("/RawImportDialog/DarktableExe", ""); } if(noteb->GetSelection() == 1) { @@ -969,6 +1035,10 @@ cfg->Write(wxT("/GLPreviewFrame/ShowProjectionHints"), MY_G_BOOL_VAL("pref_show_projection_hints")); //auto-rotate cfg->Write("/CPEditorPanel/AutoRot", MY_G_BOOL_VAL("pref_autorotate")); + // raw converter + cfg->Write("/RawImportDialog/dcrawExe", MY_G_STR_VAL("pref_raw_dcraw_exe")); + cfg->Write("/RawImportDialog/RTExe", MY_G_STR_VAL("pref_raw_rt_exe")); + cfg->Write("/RawImportDialog/DarktableExe", MY_G_STR_VAL("pref_raw_darktable_exe"));; // tempdir cfg->Write(wxT("tempDir"),MY_G_STR_VAL("prefs_misc_tempdir")); // filename templates diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.h hugin-2019.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.h 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreferencesDialog.h 2019-02-02 10:11:00.000000000 +0000 @@ -62,6 +62,9 @@ void OnRotationCheckBox(wxCommandEvent & e); void OnEnblendExe(wxCommandEvent & e); void OnEnfuseExe(wxCommandEvent & e); + void OnDcrawExe(wxCommandEvent & e); + void OnRawTherapeeExe(wxCommandEvent & e); + void OnDarktableExe(wxCommandEvent & e); void OnExifTool(wxCommandEvent & e); void OnExifArgfileChoose(wxCommandEvent & e); void OnExifArgfileEdit(wxCommandEvent & e); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewColorPickerTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewColorPickerTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewColorPickerTool.cpp 2015-10-24 06:59:19.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewColorPickerTool.cpp 2018-12-22 15:39:44.000000000 +0000 @@ -23,6 +23,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include #include #include "GLPreviewFrame.h" @@ -66,7 +69,7 @@ m_count=0; HuginBase::Panorama* pano=helper->GetPanoramaPtr(); HuginBase::UIntSet activeImages=pano->getActiveImages(); - if(activeImages.size()>0) + if(!activeImages.empty()) { for(HuginBase::UIntSet::iterator it=activeImages.begin();it!=activeImages.end();++it) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewControlPointTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewControlPointTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewControlPointTool.cpp 2015-05-10 06:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewControlPointTool.cpp 2018-12-22 15:39:51.000000000 +0000 @@ -21,6 +21,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewDifferenceTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewDifferenceTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewDifferenceTool.cpp 2017-04-22 17:02:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewDifferenceTool.cpp 2018-12-22 15:39:58.000000000 +0000 @@ -19,6 +19,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "PreviewDifferenceTool.h" #include "hugin_config.h" #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewEditCPTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewEditCPTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewEditCPTool.cpp 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewEditCPTool.cpp 2018-12-22 15:49:53.000000000 +0000 @@ -25,9 +25,9 @@ * */ -#include "hugin/PreviewEditCPTool.h" #include "panoinc_WX.h" #include "panoinc.h" +#include "hugin/PreviewEditCPTool.h" #include #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewFrame.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewFrame.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewFrame.cpp 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewFrame.cpp 2018-12-09 07:40:43.000000000 +0000 @@ -58,6 +58,8 @@ ID_EXPOSURE_TEXT, ID_EXPOSURE_SPIN, ID_EXPOSURE_DEFAULT, + ID_RANGE_COMPRESSION_TEXT, + ID_RANGE_COMPRESSION_SPIN, ID_TOGGLE_BUT = wxID_HIGHEST+100, PROJ_PARAM_NAMES_ID = wxID_HIGHEST+1000, PROJ_PARAM_VAL_ID = wxID_HIGHEST+1100, @@ -84,6 +86,8 @@ EVT_BUTTON(ID_EXPOSURE_DEFAULT, PreviewFrame::OnDefaultExposure) EVT_SPIN_DOWN(ID_EXPOSURE_SPIN, PreviewFrame::OnDecreaseExposure) EVT_SPIN_UP(ID_EXPOSURE_SPIN, PreviewFrame::OnIncreaseExposure) + EVT_SPIN_DOWN(ID_RANGE_COMPRESSION_SPIN, PreviewFrame::OnRangeCompressionDecrease) + EVT_SPIN_UP(ID_RANGE_COMPRESSION_SPIN, PreviewFrame::OnRangeCompressionIncrease) EVT_CHOICE(ID_BLEND_CHOICE, PreviewFrame::OnBlendChoice) EVT_CHOICE(ID_PROJECTION_CHOICE, PreviewFrame::OnProjectionChoice) EVT_CHOICE(ID_OUTPUTMODE_CHOICE, PreviewFrame::OnOutputChoice) @@ -272,8 +276,17 @@ wxDefaultSize, wxSP_VERTICAL); m_exposureSpinBut->SetRange(-0x8000, 0x7fff); m_exposureSpinBut->SetValue(0); + m_exposureSpinBut->SetMaxSize(wxSize(-1, m_exposureTextCtrl->GetSize().GetHeight())); blendModeSizer->Add(m_exposureSpinBut, 0, wxALIGN_CENTER_VERTICAL); - + blendModeSizer->Add(new wxStaticText(this, wxID_ANY, _("Range compression:")), 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5); + m_rangeCompressionTextCtrl = new wxTextCtrl(this, ID_RANGE_COMPRESSION_TEXT, wxT("0"), + wxDefaultPosition, wxSize(30, -1), wxTE_PROCESS_ENTER); + blendModeSizer->Add(m_rangeCompressionTextCtrl, 0, wxLEFT | wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5); + m_rangeCompressionSpinBut = new wxSpinButton(this, ID_RANGE_COMPRESSION_SPIN, wxDefaultPosition, wxDefaultSize, wxSP_VERTICAL); + m_rangeCompressionSpinBut->SetRange(-0x8000, 0x7fff); + m_rangeCompressionSpinBut->SetValue(0); + m_rangeCompressionSpinBut->SetMaxSize(wxSize(-1, m_rangeCompressionTextCtrl->GetSize().GetHeight())); + blendModeSizer->Add(m_rangeCompressionSpinBut, 0, wxALIGN_CENTER_VERTICAL); m_topsizer->Add(blendModeSizer, 0, wxEXPAND | wxALL, 5); m_projParamSizer = new wxStaticBoxSizer( @@ -444,8 +457,9 @@ */ } m_exposureTextCtrl->SetValue(wxString(hugin_utils::doubleToString(opts.outputExposureValue,2).c_str(), wxConvLocal)); + m_rangeCompressionTextCtrl->SetValue(wxString(hugin_utils::doubleToString(opts.outputRangeCompression,1).c_str(), wxConvLocal)); - bool activeImgs = pano.getActiveImages().size() > 0; + const bool activeImgs = !pano.getActiveImages().empty(); m_ToolBar->EnableTool(XRCID("preview_center_tool"), activeImgs); m_ToolBar->EnableTool(XRCID("preview_fit_pano_tool"), activeImgs); m_ToolBar->EnableTool(XRCID("preview_update_tool"), activeImgs); @@ -615,7 +629,7 @@ void PreviewFrame::OnCenterHorizontally(wxCommandEvent & e) { - if (m_pano.getActiveImages().size() == 0) return; + if (m_pano.getActiveImages().empty()) return; PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::CenterPanoCmd(m_pano) @@ -645,7 +659,7 @@ void PreviewFrame::OnFitPano(wxCommandEvent & e) { - if (m_pano.getActiveImages().size() == 0) return; + if (m_pano.getActiveImages().empty()) return; DEBUG_TRACE(""); HuginBase::PanoramaOptions opt = m_pano.getOptions(); @@ -743,25 +757,59 @@ } } opts.outputExposureValue = p; - } else { - int nParam = opts.m_projFeatures.numberOfParameters; - std::vector para = opts.getProjectionParameters(); - for (int i = 0; i < nParam; i++) { - if (e.GetEventObject() == m_projParamTextCtrl[i]) { - wxString text = m_projParamTextCtrl[i]->GetValue(); - DEBUG_INFO ("param " << i << ": = " << text.mb_str(wxConvLocal) ); - double p = 0; - if (text != wxT("")) { - if (!hugin_utils::str2double(text, p)) { - wxLogError(_("Value must be numeric.")); - return; + } + else + { + if (e.GetEventObject() == m_rangeCompressionTextCtrl) + { + //range compression + const wxString text = m_rangeCompressionTextCtrl->GetValue(); + if (text.IsEmpty()) + { + return; + }; + double p = 0; + if (!hugin_utils::str2double(text, p)) + { + wxLogError(_("Value must be numeric.")); + return; + }; + if (p < 0 || p>20) + { + wxLogError(_("Value for range compression is outside of valid range.")); + return; + }; + if (p == opts.outputRangeCompression) + { + return; + }; + opts.outputRangeCompression = p; + } + else + { + int nParam = opts.m_projFeatures.numberOfParameters; + std::vector para = opts.getProjectionParameters(); + for (int i = 0; i < nParam; i++) + { + if (e.GetEventObject() == m_projParamTextCtrl[i]) + { + wxString text = m_projParamTextCtrl[i]->GetValue(); + DEBUG_INFO("param " << i << ": = " << text.mb_str(wxConvLocal)); + double p = 0; + if (text != wxT("")) + { + if (!hugin_utils::str2double(text, p)) + { + wxLogError(_("Value must be numeric.")); + return; + } } + para[i] = p; } - para[i] = p; } - } - opts.setProjectionParameters(para); - } + opts.setProjectionParameters(para); + }; + }; PanoCommand::GlobalCmdHist::getInstance().addCommand( new PanoCommand::SetPanoOptionsCmd( m_pano, opts ) ); @@ -862,6 +910,26 @@ updatePano(); } +void PreviewFrame::OnRangeCompressionIncrease(wxSpinEvent & e) +{ + HuginBase::PanoramaOptions opt = m_pano.getOptions(); + opt.outputRangeCompression = std::min(opt.outputRangeCompression + 1.0, 20.0); + PanoCommand::GlobalCmdHist::getInstance().addCommand( + new PanoCommand::SetPanoOptionsCmd(m_pano, opt) + ); + updatePano(); +} + +void PreviewFrame::OnRangeCompressionDecrease(wxSpinEvent & e) +{ + HuginBase::PanoramaOptions opt = m_pano.getOptions(); + opt.outputRangeCompression = std::max(opt.outputRangeCompression - 1.0, 0.0); + PanoCommand::GlobalCmdHist::getInstance().addCommand( + new PanoCommand::SetPanoOptionsCmd(m_pano, opt) + ); + updatePano(); +} + void PreviewFrame::OnProjectionChoice( wxCommandEvent & e ) { if (e.GetEventObject() == m_ProjectionChoice) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewFrame.h hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewFrame.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewFrame.h 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewFrame.h 2018-12-07 20:58:36.000000000 +0000 @@ -71,6 +71,8 @@ void OnDefaultExposure( wxCommandEvent & e ); void OnDecreaseExposure( wxSpinEvent & e ); void OnIncreaseExposure( wxSpinEvent & e ); + void OnRangeCompressionIncrease(wxSpinEvent & e); + void OnRangeCompressionDecrease(wxSpinEvent & e); /** event handler for reset projection parameters */ void OnProjParameterReset(wxCommandEvent & e); @@ -100,6 +102,8 @@ wxTextCtrl * m_exposureTextCtrl; wxBitmapButton * m_defaultExposureBut; wxSpinButton * m_exposureSpinBut; + wxTextCtrl* m_rangeCompressionTextCtrl; + wxSpinButton* m_rangeCompressionSpinBut; wxString m_choices[3]; int m_oldProjFormat; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewGuideTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewGuideTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewGuideTool.cpp 2016-03-19 09:06:31.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewGuideTool.cpp 2018-12-22 15:37:58.000000000 +0000 @@ -24,6 +24,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "PreviewGuideTool.h" #ifdef __WXMAC__ #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewPanel.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewPanel.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewPanel.cpp 2017-04-22 17:02:48.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewPanel.cpp 2018-12-08 14:39:04.000000000 +0000 @@ -138,6 +138,11 @@ DEBUG_DEBUG("output exposure value changed"); dirty = true; }; + if (newOpts.outputRangeCompression != opts.outputRangeCompression) + { + DEBUG_DEBUG("output range compression changed"); + dirty = true; + }; opts = newOpts; if (dirty) { @@ -201,6 +206,26 @@ } }; +struct RangeCompression +{ +public: + RangeCompression(double rangeCompression) + { + m_rangeCompression = rangeCompression; + m_logM1 = std::log2(m_rangeCompression + 1); + }; + + vigra::RGBValue operator()(vigra::RGBValue const& v) const + { + return vigra::RGBValue(std::log2(m_rangeCompression * v.red() + 1) / m_logM1, + std::log2(m_rangeCompression * v.green() + 1) / m_logM1, + std::log2(m_rangeCompression * v.blue() + 1) / m_logM1 + ); + } +private: + double m_rangeCompression; + double m_logM1; +}; void PreviewPanel::updatePreview() { @@ -272,7 +297,7 @@ DEBUG_DEBUG("about to stitch images, pano size: " << m_panoImgSize); HuginBase::UIntSet displayedImages = pano->getActiveImages(); - if (displayedImages.size() > 0) { + if (!displayedImages.empty()) { if (opts.outputMode == HuginBase::PanoramaOptions::OUTPUT_HDR) { DEBUG_DEBUG("HDR output merge"); @@ -348,14 +373,19 @@ // apply the exposure double scale = 1.0/pow(2.0,opts.outputExposureValue); - vigra::transformImage(srcImageRange(panoImg), destImage(panoImg), + vigra::omp::transformImage(srcImageRange(panoImg), destImage(panoImg), vigra::functor::Arg1()*vigra::functor::Param(scale)); DEBUG_DEBUG("LDR output, with response: " << src.getResponseType()); if (src.getResponseType() == HuginBase::SrcPanoImage::RESPONSE_LINEAR) { - vigra::transformImage(srcImageRange(panoImg), destImage(panoImg8), + vigra::omp::transformImage(srcImageRange(panoImg), destImage(panoImg8), vigra::functor::Arg1()*vigra::functor::Param(255)); } else { + if (opts.outputRangeCompression > 0.0) + { + RangeCompression rangeCompression(opts.outputRangeCompression); + vigra::omp::transformImage(srcImageRange(panoImg), destImage(panoImg), rangeCompression); + } // create suitable lut for response typedef std::vector LUT; LUT lut; @@ -378,7 +408,7 @@ typedef vigra::RGBValue FRGB; vigra_ext::LUTFunctor lutf(lut); - vigra::transformImage(srcImageRange(panoImg), destImage(panoImg8), + vigra::omp::transformImage(srcImageRange(panoImg), destImage(panoImg8), lutf); } // apply color profiles diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewPanoMaskTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewPanoMaskTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/PreviewPanoMaskTool.cpp 2015-05-10 06:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/PreviewPanoMaskTool.cpp 2018-12-22 15:49:05.000000000 +0000 @@ -19,8 +19,11 @@ * */ -#include "PreviewPanoMaskTool.h" +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include +#include "PreviewPanoMaskTool.h" #ifdef __WXMAC__ #include #else diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ProjectionGridTool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ProjectionGridTool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ProjectionGridTool.cpp 2016-06-25 06:45:13.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ProjectionGridTool.cpp 2018-12-22 15:40:07.000000000 +0000 @@ -21,6 +21,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include #ifdef __WXMAC__ #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/RawImport.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/RawImport.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/RawImport.cpp 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/RawImport.cpp 2019-02-02 10:11:01.000000000 +0000 @@ -0,0 +1,912 @@ +// -*- c-basic-offset: 4 -*- + +/** @file RawImport.cpp + * + * @brief implementation of dialog and functions to import RAW images to project file + * + * @author T. Modes + * + */ + +/* This is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software. If not, see + * . + * + */ + +#include "hugin/RawImport.h" +#include "panoinc.h" +#include "base_wx/platform.h" +#include "base_wx/MyExternalCmdExecDialog.h" +#include "hugin/huginApp.h" +#include "base_wx/CommandHistory.h" +#include "base_wx/wxPanoCommand.h" +#ifdef _WIN32 +// workaround for a conflict between exiv2 and wxWidgets/CMake built +#define HAVE_PID_T 1 +#endif +#include +#include +#include +#include +#ifdef __WXMSW__ +#include +#endif + +/** base class for implementation of Raw import functions */ +class RawImport +{ +public: + RawImport(wxString ConfigExePath) { m_exe = wxConfig::Get()->Read(ConfigExePath, ""); }; + /** image extension of converted files */ + virtual wxString GetImageExtension() { return wxString("tif"); } + /** reads additional parameters from dialog into class */ + virtual bool ProcessAdditionalParameters(wxDialog* dlg) { return true; } + /** return true if program supports overwritting output, otherwise false */ + virtual bool SupportsOverwrite() { return true; } + /** checks if valid executable was given in dialog + * either absolute path or when relative path is given check PATH */ + bool CheckExe(wxDialog* dlg) + { + if (m_exe.IsEmpty()) + { + m_exe = GetDefaultExe(); + }; + const wxFileName exePath(m_exe); + if (exePath.IsAbsolute()) + { + if (exePath.FileExists()) + { + m_exe = exePath.GetFullPath(); + return true; + } + else + { + wxMessageBox(wxString::Format(_("Executable \"%s\" not found.\nPlease specify a valid executable in preferences."), exePath.GetFullPath()), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxOK | wxICON_INFORMATION, dlg); + return false; + }; + }; + wxPathList pathlist; +#ifdef __WXMSW__ + pathlist.Add(huginApp::Get()->GetUtilsBinDir()); +#endif + pathlist.AddEnvList(wxT("PATH")); + m_exe = pathlist.FindAbsoluteValidPath(exePath.GetFullPath()); + if (m_exe.IsEmpty()) + { + wxMessageBox(wxString::Format(_("Executable \"%s\" not found in PATH.\nPlease specify a valid executable in preferences."), exePath.GetFullPath()), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxOK | wxICON_INFORMATION, dlg); + return false; + }; + return true; + }; + /** return command for processing of reference image */ + virtual HuginQueue::CommandQueue* GetCmdQueueForReference(const wxString& rawFilename, const wxString& imageFilename) = 0; + /** read output of processing of reference image to read in white balance of reference image */ + virtual bool ProcessReferenceOutput(const wxArrayString& output) = 0; + /** return commands for processing of all other images with white balance read by RawImport::ProcessReferenceOutput */ + virtual HuginQueue::CommandQueue* GetCmdQueueForImport(const wxArrayString& rawFilenames, const wxArrayString& imageFilenames) = 0; + /** add additional PanoCommand::PanoCommand to vector if needed + * hint: we need to pass old and new image number because we can't guarantee that the image order + * remains unchanged by PanoCommand::wxAddImagesCmd */ + virtual void AddAdditionalPanoramaCommand(std::vector& cmds, HuginBase::Panorama* pano, const int oldImageCount, const int addedImageCount) {}; +protected: + /** returns the default name of the executable */ + virtual wxString GetDefaultExe() { return wxEmptyString; }; + wxString m_exe; +}; + + /** special class for raw import with dcraw */ +class DCRawImport :public RawImport +{ +public: + DCRawImport() : RawImport("/RawImportDialog/dcrawExe") {}; + wxString GetImageExtension() override { return wxString("tiff"); } + bool ProcessAdditionalParameters(wxDialog* dlg) override + { + m_additionalParameters = XRCCTRL(*dlg, "raw_dcraw_parameter", wxTextCtrl)->GetValue().Trim(true).Trim(false); + return true; + }; + HuginQueue::CommandQueue* GetCmdQueueForReference(const wxString& rawFilename, const wxString& imageFilename) override + { + HuginQueue::CommandQueue* queue = new HuginQueue::CommandQueue(); + wxString args(" -w -v -4 -T "); + if (!m_additionalParameters.IsEmpty()) + { + args.Append(m_additionalParameters); + args.Append(" "); + }; + args.Append(HuginQueue::wxEscapeFilename(rawFilename)); + queue->push_back(new HuginQueue::NormalCommand(m_exe, args, wxString::Format(_("Executing: %s %s"), m_exe, args))); + args.Empty(); + args.Append("-overwrite_original -tagsfromfile "); + args.Append(HuginQueue::wxEscapeFilename(rawFilename)); + args.Append(" -all:all "); + args.Append(HuginQueue::wxEscapeFilename(imageFilename)); + queue->push_back(new HuginQueue::OptionalCommand(HuginQueue::GetExternalProgram(wxConfig::Get(), huginApp::Get()->GetUtilsBinDir(), "exiftool"), args, wxString::Format(_("Updating EXIF data for %s"), imageFilename))); + return queue; + }; + bool ProcessReferenceOutput(const wxArrayString& output) override + { + for (auto& s : output) + { + int pos = s.Find("multipliers"); + if (pos >= 0) + { + m_wb = "-r " + s.Mid(pos + 12); + return true; + }; + }; + return false; + }; + HuginQueue::CommandQueue* GetCmdQueueForImport(const wxArrayString& rawFilenames, const wxArrayString& imageFilenames) override + { + HuginQueue::CommandQueue* queue = new HuginQueue::CommandQueue(); + wxConfigBase* config = wxConfig::Get(); + const wxString binDir = huginApp::Get()->GetUtilsBinDir(); + for (size_t i = 0; i < rawFilenames.size(); ++i) + { + wxString args(m_wb); + args.Append(" -v -4 -T "); + if (!m_additionalParameters.IsEmpty()) + { + args.Append(m_additionalParameters); + args.Append(" "); + }; + args.Append(HuginQueue::wxEscapeFilename(rawFilenames[i])); + queue->push_back(new HuginQueue::NormalCommand(m_exe, args,wxString::Format(_("Executing: %s %s"), m_exe, args))); + args.Empty(); + args.Append("-overwrite_original -tagsfromfile "); + args.Append(HuginQueue::wxEscapeFilename(rawFilenames[i])); + args.Append(" -all:all "); + args.Append(HuginQueue::wxEscapeFilename(imageFilenames[i])); + queue->push_back(new HuginQueue::OptionalCommand(HuginQueue::GetExternalProgram(config, binDir, "exiftool"), args, wxString::Format(_("Updating EXIF data for %s"), imageFilenames[i]))); + } + return queue; + }; + void AddAdditionalPanoramaCommand(std::vector& cmds, HuginBase::Panorama* pano, const int oldImageCount, const int addedImageCount) override + { + // set response to linear for newly added images + HuginBase::UIntSet imgs; + fill_set(imgs, oldImageCount, oldImageCount + addedImageCount - 1); + cmds.push_back(new PanoCommand::ChangeImageResponseTypeCmd(*pano, imgs, HuginBase::SrcPanoImage::RESPONSE_LINEAR)); + }; +protected: + virtual wxString GetDefaultExe() + { +#ifdef _WIN32 + return "dcraw.exe"; +#else + return "dcraw"; +#endif + }; +private: + wxString m_additionalParameters; + wxString m_wb; +}; + +/** class for RawTherapee raw import */ +class RTRawImport :public RawImport +{ +public: + RTRawImport() : RawImport("/RawImportDialog/RTExe") {}; + bool ProcessAdditionalParameters(wxDialog* dlg) override + { + m_processingProfile = XRCCTRL(*dlg, "raw_rt_processing_profile", wxTextCtrl)->GetValue().Trim(true).Trim(false); + if (!m_processingProfile.IsEmpty() && !wxFileName::FileExists(m_processingProfile)) + { + wxMessageBox(wxString::Format(_("Processing profile \"%s\" not found.\nPlease specify a valid file or leave field empty for default settings."), m_processingProfile), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxOK | wxICON_INFORMATION, dlg); + return false; + } + return true; + }; + HuginQueue::CommandQueue* GetCmdQueueForReference(const wxString& rawFilename, const wxString& imageFilename) override + { + HuginQueue::CommandQueue* queue = new HuginQueue::CommandQueue(); + wxString args("-O " + HuginQueue::wxEscapeFilename(imageFilename)); + if (m_processingProfile.IsEmpty()) + { + args.Append(" -d"); + } + else + { + args.Append(" -p " + HuginQueue::wxEscapeFilename(m_processingProfile)); + }; + // apply some special settings, especially disable all crop and rotation settings + args.Append(" -s -p " + HuginQueue::wxEscapeFilename( + wxString(std::string(hugin_utils::GetDataDir() + "hugin_rt.pp3").c_str(), HUGIN_CONV_FILENAME))); + args.Append(" -b16 -tz -Y -c "); + args.Append(HuginQueue::wxEscapeFilename(rawFilename)); + m_usedProcessingProfile = imageFilename + ".pp3"; + queue->push_back(new HuginQueue::NormalCommand(m_exe, args, wxString::Format(_("Executing: %s %s"), m_exe, args))); + return queue; + }; + bool ProcessReferenceOutput(const wxArrayString& output) override + { + // we need to change the WB setting in the processing profile so the white balance of the reference image + // is used and not the stored WB from each individual image + wxFileConfig config(wxEmptyString, wxEmptyString, m_usedProcessingProfile); + config.Write("/White Balance/Setting", "Custom"); + config.Flush(); + return true; + }; + HuginQueue::CommandQueue* GetCmdQueueForImport(const wxArrayString& rawFilenames, const wxArrayString& imageFilenames) override + { + HuginQueue::CommandQueue* queue = new HuginQueue::CommandQueue(); + for (size_t i = 0; i < rawFilenames.size(); ++i) + { + wxString args("-o " + HuginQueue::wxEscapeFilename(imageFilenames[i])); + args.Append(" -p "+HuginQueue::wxEscapeFilename(m_usedProcessingProfile)); + args.Append(" -b16 -tz -Y -c "); + args.Append(HuginQueue::wxEscapeFilename(rawFilenames[i])); + queue->push_back(new HuginQueue::NormalCommand(m_exe, args, wxString::Format(_("Executing: %s %s"), m_exe, args))); + } + return queue; + }; +protected: + virtual wxString GetDefaultExe() + { +#ifdef __WXMSW__ + // try reading installed version from registry + // works only with RT 5.5 and above + wxRegKey regkey(wxRegKey::HKLM, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\rawtherapee-cli.exe"); + wxString prog; + if (regkey.HasValue(wxT("")) && regkey.QueryRawValue(wxT(""), prog)) + { + if (wxFileName::FileExists(prog)) + { + return prog; + }; + } + else + { + // now check if installed for current user only + wxRegKey regkeyUser(wxRegKey::HKCU, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\rawtherapee-cli.exe"); + wxString prog; + if (regkeyUser.HasValue(wxT("")) && regkeyUser.QueryRawValue(wxT(""), prog)) + { + if (wxFileName::FileExists(prog)) + { + return prog; + }; + }; + }; + // nothing found in registry, return default name + return "rawtherapee-cli.exe"; +#elif defined __WXMAC__ + return "/Applications/RawTherapee.app/Contents/MacOS/rawtherapee-cli"; +#else + return "rawtherapee-cli"; +#endif + }; +private: + wxString m_processingProfile; + wxString m_usedProcessingProfile; +}; + +/** special class for Darktable raw import */ +class DarkTableRawImport : public RawImport +{ +public: + DarkTableRawImport() : RawImport("/RawImportDialog/DarktableExe") {} + ~DarkTableRawImport() + { + // destructor, clean up generated files; + if (!m_usedSettings.IsEmpty()) + { + wxRemoveFile(m_usedSettings); + }; + } + bool SupportsOverwrite() override { return false; } + HuginQueue::CommandQueue* GetCmdQueueForReference(const wxString& rawFilename, const wxString& imageFilename) override + { + HuginQueue::CommandQueue* queue = new HuginQueue::CommandQueue(); + wxString args(" --verbose "); + args.Append(HuginQueue::wxEscapeFilename(rawFilename)); + args.Append(" "); +#ifdef __WXMSW__ + // darktable has problems with Windows paths as output + // so change separator before + wxString file(imageFilename); + file.Replace("\\", "/", true); + args.Append(HuginQueue::wxEscapeFilename(file)); +#else + args.Append(HuginQueue::wxEscapeFilename(imageFilename)); +#endif + // switch --bpp does not work, so using this strange workaround + args.Append(" --core --conf plugins/imageio/format/tiff/bpp=16"); + m_refImage = imageFilename; + queue->push_back(new HuginQueue::NormalCommand(m_exe, args, wxString::Format(_("Executing: %s %s"), m_exe, args))); + return queue; + }; + bool ProcessReferenceOutput(const wxArrayString& output) override + { + // extract XMP package for converted reference image and store in temp + Exiv2::Image::AutoPtr image; + try + { + image = Exiv2::ImageFactory::open(std::string(m_refImage.mb_str(HUGIN_CONV_FILENAME))); + } + catch (const Exiv2::Error& e) + { + std::cerr << "Exiv2: Error reading metadata (" << e.what() << ")" << std::endl; + return false; + } + try + { + image->readMetadata(); + } + catch (const Exiv2::Error& e) + { + std::cerr << "Caught Exiv2 exception " << e.what() << std::endl; + return false; + }; + m_usedSettings = wxFileName::CreateTempFileName("hugdt"); + Exiv2::Image::AutoPtr image2; + try + { + image2 = Exiv2::ImageFactory::create(Exiv2::ImageType::xmp, std::string(m_usedSettings.mb_str(HUGIN_CONV_FILENAME))); + } + catch (const Exiv2::Error& e) + { + std::cerr << "Exiv2: Error creating temp xmp file (" << e.what() << ")" << std::endl; + return false; + } + image2->setXmpData(image->xmpData()); + image2->writeMetadata(); + return true; + }; + HuginQueue::CommandQueue* GetCmdQueueForImport(const wxArrayString& rawFilenames, const wxArrayString& imageFilenames) override + { + HuginQueue::CommandQueue* queue = new HuginQueue::CommandQueue(); + for (size_t i = 0; i < rawFilenames.size(); ++i) + { + wxString args("--verbose "); + args.Append(HuginQueue::wxEscapeFilename(rawFilenames[i])); + args.Append(" "); + args.Append(HuginQueue::wxEscapeFilename(m_usedSettings)); + args.Append(" "); +#ifdef __WXMSW__ + // darktable has problems with Windows paths as output + // so change separator before + wxString file(imageFilenames[i]); + file.Replace("\\", "/", true); + args.Append(HuginQueue::wxEscapeFilename(file)); +#else + args.Append(HuginQueue::wxEscapeFilename(imageFilenames[i])); +#endif + // switch --bpp does not work, so using this strange workaround + args.Append(" --core --conf plugins/imageio/format/tiff/bpp=16"); + queue->push_back(new HuginQueue::NormalCommand(m_exe, args, wxString::Format(_("Executing: %s %s"), m_exe, args))); + } + return queue; + }; +protected: + virtual wxString GetDefaultExe() + { +#ifdef __WXMSW__ + // try reading installed version from registry + wxRegKey regkey(wxRegKey::HKLM, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\darktable-cli.exe"); + wxString prog; + if (regkey.HasValue(wxT("")) && regkey.QueryRawValue(wxT(""), prog)) + { + if (wxFileName::FileExists(prog)) + { + return prog; + } + } + else + { + // now check if installed for current user only + wxRegKey regkeyUser(wxRegKey::HKCU, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\darktable-cli.exe"); + wxString prog; + if (regkeyUser.HasValue(wxT("")) && regkeyUser.QueryRawValue(wxT(""), prog)) + { + if (wxFileName::FileExists(prog)) + { + return prog; + }; + }; + }; + // nothing found in registry, return default name + return "darktable-cli.exe"; +#elif defined __WXMAC__ + return "/Applications/darktable.app/Contents/MacOS/darktable-cli"; +#else + return "darktable-cli"; +#endif + }; +private: + wxString m_refImage; + wxString m_usedSettings; +}; + + +/** dialog class for showing progress of raw import */ +class RawImportProgress :public wxDialog +{ +public: + RawImportProgress(wxWindow * parent, std::shared_ptr& converter, const wxArrayString& rawImages, const wxArrayString& images, const int refImg) : + wxDialog(parent, wxID_ANY, _("Import Raw Images"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), + m_converter(converter), m_rawImages(rawImages), m_images(images), m_refImg(refImg), m_isRunning(false) + { + DEBUG_ASSERT(m_rawImages.size() > 0); + DEBUG_ASSERT(m_rawImages.size() == m_images.size()); + if (m_refImg < 0) + { + m_refImg = 0; + }; + if (m_refImg >= m_rawImages.size()) + { + m_refImg = 0; + }; + wxBoxSizer * topsizer = new wxBoxSizer(wxVERTICAL); + m_progressPanel = new MyExecPanel(this); + topsizer->Add(m_progressPanel, 1, wxEXPAND | wxALL, 2); + + wxBoxSizer* bottomsizer = new wxBoxSizer(wxHORIZONTAL); +#if wxCHECK_VERSION(3,1,0) + m_progress = new wxGauge(this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL | wxGA_PROGRESS); +#else + m_progress = new wxGauge(this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL); +#endif + bottomsizer->Add(m_progress, 1, wxEXPAND | wxALL, 10); + m_cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel")); + bottomsizer->Add(m_cancelButton, 0, wxALL | wxALIGN_RIGHT, 10); + m_cancelButton->Bind(wxEVT_BUTTON, &RawImportProgress::OnCancel, this); + topsizer->Add(bottomsizer, 0, wxEXPAND); +#ifdef __WXMSW__ + // wxFrame does have a strange background color on Windows.. + this->SetBackgroundColour(m_progressPanel->GetBackgroundColour()); +#endif + SetSizer(topsizer); + RestoreFramePosition(this, "RawImportProgress"); + Bind(EVT_QUEUE_PROGRESS, &RawImportProgress::OnProgress, this); + Bind(wxEVT_INIT_DIALOG, &RawImportProgress::OnInitDialog, this); + }; + virtual ~RawImportProgress() + { + StoreFramePosition(this, "RawImportProgress"); + } + +protected: + void OnProcessReferenceTerminate(wxProcessEvent& e) + { + if (e.GetExitCode() == 0) + { + if (!m_converter->ProcessReferenceOutput(m_progressPanel->GetLogAsArrayString())) + { + wxMessageBox(_("Could not process of output of reference image.\nCan't process further images."), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxOK | wxICON_INFORMATION, this); + + }; + Unbind(wxEVT_END_PROCESS, &RawImportProgress::OnProcessReferenceTerminate, this); + m_progress->SetValue(hugin_utils::roundi(1.0 / m_images.size())); + wxArrayString rawFiles(m_rawImages); + rawFiles.RemoveAt(m_refImg); + if (rawFiles.IsEmpty()) + { + EndModal(wxID_OK); + }; + wxArrayString imgFiles(m_images); + imgFiles.RemoveAt(m_refImg); + Bind(wxEVT_END_PROCESS, &RawImportProgress::OnProcessTerminate, this); + m_progressPanel->ExecQueue(m_converter->GetCmdQueueForImport(rawFiles, imgFiles)); + } + else + { + m_isRunning = false; + m_cancelButton->SetLabel(_("Close")); + }; + }; + void OnProcessTerminate(wxProcessEvent& e) + { + if (e.GetExitCode() == 0) + { + EndModal(wxID_OK); + } + else + { + m_isRunning = false; + m_cancelButton->SetLabel(_("Close")); + }; + }; + void OnProgress(wxCommandEvent& event) + { + if (event.GetInt() >= 0) + { + m_progress->SetValue(hugin_utils::roundi((1 + event.GetInt() / 100.0f * (m_images.size() - 2)) * 100.0f / m_images.size())); + }; + }; + void OnCancel(wxCommandEvent & event) + { + if (m_isRunning) + { + m_progressPanel->KillProcess(); + m_isRunning = false; + } + else + { + EndModal(wxID_CANCEL); + }; + }; + void OnInitDialog(wxInitDialogEvent& e) + { + // start processing reference image + Bind(wxEVT_END_PROCESS, &RawImportProgress::OnProcessReferenceTerminate, this); + m_progressPanel->ExecQueue(m_converter->GetCmdQueueForReference(m_rawImages[m_refImg], m_images[m_refImg])); + } + +private: + std::shared_ptr m_converter; + wxArrayString m_rawImages, m_images; + int m_refImg; + bool m_isRunning; + wxGauge* m_progress; + wxButton* m_cancelButton; + MyExecPanel * m_progressPanel; +}; + +BEGIN_EVENT_TABLE(RawImportDialog, wxDialog) + EVT_BUTTON(XRCID("raw_rt_processing_profile_select"), RawImportDialog::OnSelectRTProcessingProfile) + EVT_BUTTON(wxID_OK, RawImportDialog::OnOk) + EVT_RADIOBUTTON(XRCID("raw_rb_dcraw"), RawImportDialog::OnRawConverterSelected) + EVT_RADIOBUTTON(XRCID("raw_rb_rt"), RawImportDialog::OnRawConverterSelected) + EVT_RADIOBUTTON(XRCID("raw_rb_darktable"), RawImportDialog::OnRawConverterSelected) +END_EVENT_TABLE() + +RawImportDialog::RawImportDialog(wxWindow *parent, HuginBase::Panorama* pano, std::vector& rawFiles) +{ + // load our children. some children might need special + // initialization. this will be done later. + wxXmlResource::Get()->LoadDialog(this, parent, wxT("import_raw_dialog")); + +#ifdef __WXMSW__ + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/hugin.ico"),wxBITMAP_TYPE_ICO); +#else + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/hugin.png"),wxBITMAP_TYPE_PNG); +#endif + SetIcon(myIcon); + RestoreFramePosition(this, "RawImportDialog"); + wxConfigBase* config = wxConfig::Get(); + // dcraw + wxString s = config->Read("/RawImportDialog/dcrawParameter", ""); + XRCCTRL(*this, "raw_dcraw_parameter", wxTextCtrl)->SetValue(s); + + // RT processing profile + s = config->Read("/RawImportDialog/RTProcessingProfile", ""); + wxTextCtrl* ctrl = XRCCTRL(*this, "raw_rt_processing_profile", wxTextCtrl); + ctrl->SetValue(s); + ctrl->AutoCompleteFileNames(); + // read last used converter + const long converter = config->Read("/RawImportDialog/Converter", 0l); + switch (converter) + { + default: + case 0: + XRCCTRL(*this, "raw_rb_dcraw", wxRadioButton)->SetValue(true); + break; + case 1: + XRCCTRL(*this, "raw_rb_rt", wxRadioButton)->SetValue(true); + break; + case 2: + XRCCTRL(*this, "raw_rb_darktable", wxRadioButton)->SetValue(true); + break; + }; + wxCommandEvent dummy; + OnRawConverterSelected(dummy); + + m_pano=pano; + for (auto& file : rawFiles) + { + m_rawImages.Add(wxString(file.c_str(), HUGIN_CONV_FILENAME)); + }; +}; + +RawImportDialog::~RawImportDialog() +{ + StoreFramePosition(this, "RawImportDialog"); +} + +PanoCommand::PanoCommand * RawImportDialog::GetPanoCommand() +{ + return m_cmd; +}; + +bool RawImportDialog::CheckRawFiles() +{ + wxArrayString errorReadingFile; + wxArrayString differentCam; + std::string camera; + for (auto& file : m_rawImages) + { + // check that all images are from the same camera + Exiv2::Image::AutoPtr image; + try + { + image = Exiv2::ImageFactory::open(std::string(file.mb_str(HUGIN_CONV_FILENAME))); + } + catch (const Exiv2::Error& e) + { + std::cerr << "Exiv2: Error reading metadata (" << e.what() << ")" << std::endl; + errorReadingFile.push_back(file); + continue; + } + + try + { + image->readMetadata(); + } + catch (const Exiv2::Error& e) + { + std::cerr << "Caught Exiv2 exception '" << e.what() << "' for file " << file << std::endl; + errorReadingFile.push_back(file); + }; + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) + { + errorReadingFile.push_back(file); + continue; + }; + std::string cam; + auto make = Exiv2::make(exifData); + if (make != exifData.end() && make->count()) + { + cam = make->toString(); + }; + auto model = Exiv2::model(exifData); + if (model != exifData.end() && model->count()) + { + cam += "|" + model->toString(); + }; + if (camera.empty()) + { + camera = cam; + } + else + { + if (cam != camera) + { + differentCam.push_back(file); + continue; + }; + }; + }; + if (!errorReadingFile.IsEmpty()) + { + wxDialog dlg; + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("dlg_warning_filename")); + dlg.SetLabel(_("Warning: Read error")); + XRCCTRL(dlg, "dlg_warning_text", wxStaticText)->SetLabel(_("The following files will be skipped because the metadata of these files could not read.")); + XRCCTRL(dlg, "dlg_warning_list", wxListBox)->Append(errorReadingFile); + dlg.Fit(); + dlg.CenterOnScreen(); + dlg.ShowModal(); + for (auto& file : errorReadingFile) + { + m_rawImages.Remove(file); + }; + if (m_rawImages.IsEmpty()) + { + return false; + }; + }; + if (differentCam.IsEmpty()) + { + FillImageChoice(); + return true; + } + else + { + wxDialog dlg; + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("dlg_warning_filename")); + dlg.SetLabel(_("Warning: raw images from different cameras")); + XRCCTRL(dlg, "dlg_warning_text", wxStaticText)->SetLabel(_("The following images were shot with different camera than the other one.\nThe raw import works only for images from the same cam.")); + XRCCTRL(dlg, "dlg_warning_list", wxListBox)->Append(differentCam); + dlg.Fit(); + dlg.CenterOnScreen(); + dlg.ShowModal(); + return false; + }; +}; + +void RawImportDialog::OnOk(wxCommandEvent & e) +{ + std::shared_ptr rawConverter; + long rawConverterInt; + if (XRCCTRL(*this, "raw_rb_dcraw", wxRadioButton)->GetValue()) + { + rawConverter = std::make_shared(); + rawConverterInt = 0; + } + else + { + if (XRCCTRL(*this, "raw_rb_rt", wxRadioButton)->GetValue()) + { + rawConverter = std::make_shared(); + rawConverterInt = 1; + } + else + { + rawConverter = std::make_shared(); + rawConverterInt = 2; + }; + }; + // check if given program is available + if (!rawConverter->CheckExe(this)) + { + return; + } + // check additional parameters + if (!rawConverter->ProcessAdditionalParameters(this)) + { + return; + }; + { + // check if image files already exists + m_images.clear(); + wxArrayString existingImages; + for (auto& img : m_rawImages) + { + wxFileName newImage(img); + newImage.SetExt(rawConverter->GetImageExtension()); + m_images.push_back(newImage.GetFullPath()); + if (newImage.FileExists()) + { + existingImages.push_back(newImage.GetFullPath()); + }; + }; + if (!existingImages.IsEmpty()) + { + wxDialog dlg; + wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("dlg_warning_overwrite")); + XRCCTRL(dlg, "dlg_overwrite_list", wxListBox)->Append(existingImages); + dlg.Fit(); + dlg.CenterOnScreen(); + if (dlg.ShowModal() != wxID_OK) + { + return; + }; + }; + if (!rawConverter->SupportsOverwrite()) + { + // raw converter does not support overwritting + // so delete the file explicit before + for (auto& img : existingImages) + { + wxRemoveFile(img); + }; + }; + }; + RawImportProgress dlg(this, rawConverter, m_rawImages, m_images, XRCCTRL(*this, "raw_choice_wb", wxChoice)->GetSelection()); + if (dlg.ShowModal() == wxID_OK) + { + // save settings for next call + wxConfigBase* config = wxConfig::Get(); + config->Write("/RawImportDialog/Converter", rawConverterInt); + config->Write("/RawImportDialog/dcrawParameter", XRCCTRL(*this, "raw_dcraw_parameter", wxTextCtrl)->GetValue().Trim(true).Trim(false)); + config->Write("/RawImportDialog/RTProcessingProfile", XRCCTRL(*this, "raw_rt_processing_profile", wxTextCtrl)->GetValue()); + config->Flush(); + // check if all files were generated + std::vector files; + bool missingFiles = false; + for (auto& img:m_images) + { + if (wxFileName::FileExists(img)) + { + files.push_back(std::string(img.mb_str(HUGIN_CONV_FILENAME))); + } + else + { + missingFiles = true; + }; + }; + if (missingFiles || files.empty()) + { + wxMessageBox(_("At least one raw images was not successfully converted.\nThis image(s) will be skipped"), +#ifdef _WIN32 + _("Hugin"), +#else + wxT(""), +#endif + wxOK | wxICON_INFORMATION, this); + }; + if (files.empty()) + { + return; + }; + // now build PanoCommand and store it + std::vector cmds; + cmds.push_back(new PanoCommand::wxAddImagesCmd(*m_pano, files)); + rawConverter->AddAdditionalPanoramaCommand(cmds, m_pano, m_pano->getNrOfImages(), files.size()); + m_cmd = new PanoCommand::CombinedPanoCommand(*m_pano, cmds); + m_cmd->setName("import raw images"); + // close dialog + EndModal(wxID_OK); + return; + }; + EndModal(wxID_CANCEL); +} + +void RawImportDialog::OnSelectRTProcessingProfile(wxCommandEvent& e) +{ + wxTextCtrl* input = XRCCTRL(*this, "raw_rt_processing_profile", wxTextCtrl); + wxFileDialog dlg(this, _("Select default RT processing profile"), "", input->GetValue(), _("RT processing profile|*.pp3"), wxFD_OPEN, wxDefaultPosition); + if (dlg.ShowModal() == wxID_OK) + { + input->SetValue(dlg.GetPath()); + } +} + +void RawImportDialog::OnRawConverterSelected(wxCommandEvent & e) +{ + enum Converter { + DCRAW, + RAWTHERAPEE, + DARKTABLE + } rawConverter; + if (XRCCTRL(*this, "raw_rb_dcraw", wxRadioButton)->GetValue()) + { + rawConverter = Converter::DCRAW; + } + else + { + if (XRCCTRL(*this, "raw_rb_rt", wxRadioButton)->GetValue()) + { + rawConverter = Converter::RAWTHERAPEE; + } + else + { + rawConverter = Converter::DARKTABLE; + }; + }; + XRCCTRL(*this, "raw_dcraw_text", wxStaticText)->Enable(rawConverter == Converter::DCRAW); + XRCCTRL(*this, "raw_dcraw_parameter", wxTextCtrl)->Enable(rawConverter == Converter::DCRAW); + XRCCTRL(*this, "raw_rt_text", wxStaticText)->Enable(rawConverter == Converter::RAWTHERAPEE); + XRCCTRL(*this, "raw_rt_processing_profile", wxTextCtrl)->Enable(rawConverter == Converter::RAWTHERAPEE); + XRCCTRL(*this, "raw_rt_processing_profile_select", wxButton)->Enable(rawConverter == Converter::RAWTHERAPEE); +}; + +void RawImportDialog::FillImageChoice() +{ + wxChoice* choice = XRCCTRL(*this, "raw_choice_wb", wxChoice); + for (int i=0; iAppend(file.GetFullName()); + }; + choice->SetSelection(0); +}; + diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/RawImport.h hugin-2019.0.0+dfsg/src/hugin1/hugin/RawImport.h --- hugin-2018.0.0+dfsg/src/hugin1/hugin/RawImport.h 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/RawImport.h 2019-02-02 10:11:01.000000000 +0000 @@ -0,0 +1,63 @@ +// -*- c-basic-offset: 4 -*- +/** @file RawImport.h + * + * @brief Definition of dialog and functions to import RAW images to project file + * + * @author T. Modes + * + */ + +/* This is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software. If not, see + * . + * + */ + +#ifndef _RAW_IMPORT_H +#define _RAW_IMPORT_H + +#include "panoinc_WX.h" +#include "panoinc.h" +#include "base_wx/Command.h" + +/** Dialog for raw import */ +class RawImportDialog : public wxDialog +{ +public: + /** Constructor, read from xrc ressource; restore last uses settings and position */ + RawImportDialog(wxWindow *parent, HuginBase::Panorama* pano, std::vector& rawFiles); + /** destructor, saves position */ + ~RawImportDialog(); + /** return PanoCommand for adding converted raw files to Panorama */ + PanoCommand::PanoCommand* GetPanoCommand(); + /** return true, if all raw files are from the same camera */ + bool CheckRawFiles(); + +protected: + /** called when dialog is finished and does the conversion */ + void OnOk(wxCommandEvent & e); + void OnSelectRTProcessingProfile(wxCommandEvent& e); + void OnRawConverterSelected(wxCommandEvent & e); + +private: + /** fill list with image names */ + void FillImageChoice(); + HuginBase::Panorama* m_pano; + wxArrayString m_rawImages; + wxArrayString m_images; + PanoCommand::PanoCommand* m_cmd=NULL; + + DECLARE_EVENT_TABLE() +}; + +#endif //_RAW_IMPORT_H diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/TextureManager.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/TextureManager.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/TextureManager.cpp 2017-04-22 17:02:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/TextureManager.cpp 2019-02-28 17:21:39.000000000 +0000 @@ -20,6 +20,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include #include @@ -58,6 +61,10 @@ // for loading preview images #include "wx/mstream.h" +#ifdef _WIN32 +// workaround for a conflict between exiv2 and wxWidgets/CMake built +#define HAVE_PID_T 1 +#endif #include "exiv2/exiv2.hpp" #include "exiv2/preview.hpp" @@ -785,21 +792,31 @@ wxImage rawImage; Exiv2::PreviewImage previewImage = previews->getPreviewImage(lists[previewIndex]); wxMemoryInputStream stream(previewImage.pData(), previewImage.size()); - rawImage.LoadFile(stream, wxString(previewImage.mimeType().c_str(), wxConvLocal), -1); - placeholderWidth = rawImage.GetWidth(); - placeholderHeight = rawImage.GetHeight(); - placeholder_image = new GLubyte[placeholderWidth * placeholderHeight * 4]; - size_t index = 0; - for (size_t y = 0; y < placeholderHeight; ++y) + // disable logging for loading preview images + wxLog::EnableLogging(false); + if (rawImage.LoadFile(stream, wxString(previewImage.mimeType().c_str(), wxConvLocal), -1)) { - for (size_t x = 0; x < placeholderWidth; ++x) + placeholderWidth = rawImage.GetWidth(); + placeholderHeight = rawImage.GetHeight(); + placeholder_image = new GLubyte[placeholderWidth * placeholderHeight * 4]; + size_t index = 0; + for (size_t y = 0; y < placeholderHeight; ++y) { - placeholder_image[index++] = rawImage.GetRed(x, y); - placeholder_image[index++] = rawImage.GetGreen(x, y); - placeholder_image[index++] = rawImage.GetBlue(x, y); - placeholder_image[index++] = 63; + for (size_t x = 0; x < placeholderWidth; ++x) + { + placeholder_image[index++] = rawImage.GetRed(x, y); + placeholder_image[index++] = rawImage.GetGreen(x, y); + placeholder_image[index++] = rawImage.GetBlue(x, y); + placeholder_image[index++] = 63; + }; }; + } + else + { + hasPreview = false; }; + // re-enable logging + wxLog::EnableLogging(true); }; }; if (!hasPreview) @@ -910,8 +927,16 @@ // setup photometric transform for this image type // this corrects for response curve, white balance, exposure and // radial vignetting + HuginBase::SrcPanoImage tempSrcImg(src_img); + // for linear float image reset response type + // because ImageCache returns already modified image information + // depending on settings in the preferences + if (entry->imageFloat->size().area() > 0 && tempSrcImg.getResponseType() == HuginBase::SrcPanoImage::RESPONSE_LINEAR) + { + tempSrcImg.setResponseType(HuginBase::SrcPanoImage::RESPONSE_EMOR); + } HuginBase::Photometric::InvResponseTransform < unsigned char, double > - invResponse(src_img); + invResponse(tempSrcImg); // Assume LDR for now. // if (m_destImg.outputMode == PanoramaOptions::OUTPUT_LDR) { // select exposure and response curve for LDR output @@ -924,7 +949,7 @@ vigra_ext::EMoR::createEMoRLUT(m_viewState->GetSrcImage(0)->getEMoRParams(), outLut); vigra_ext::enforceMonotonicity(outLut); invResponse.setOutput(1.0 / pow(2.0, dest_img.outputExposureValue), - outLut, 255.0); + outLut, 255.0, dest_img.outputRangeCompression); /*} else { // HDR output. not sure how that would be handled by the opengl // preview, though. It might be possible to apply a logarithmic diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/Tool.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/Tool.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/Tool.cpp 2015-05-10 06:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/Tool.cpp 2018-12-22 15:40:18.000000000 +0000 @@ -20,6 +20,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "Tool.h" #include "ToolHelper.h" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ToolHelper.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ToolHelper.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ToolHelper.cpp 2016-06-25 06:45:14.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ToolHelper.cpp 2018-12-22 15:40:24.000000000 +0000 @@ -22,7 +22,9 @@ */ - +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "ToolHelper.h" #include "Tool.h" #include "GLPreviewFrame.h" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/treelistctrl.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/treelistctrl.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/treelistctrl.cpp 2017-05-25 08:44:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/treelistctrl.cpp 2018-08-06 15:05:30.000000000 +0000 @@ -3217,7 +3217,7 @@ wxDCClipper clipper (dc, 0, item->GetY(), total_w, total_h); // only within line // compute text height based on main col int text_h = 0; - dc.GetTextExtent( item->GetText(GetMainColumn()).size() > 0 + dc.GetTextExtent( !item->GetText(GetMainColumn()).empty() ? item->GetText(GetMainColumn()) : _T("M"), // dummy text to avoid zero height and no highlight width NULL, &text_h ); @@ -3408,10 +3408,7 @@ if (HasFlag(wxTR_ROW_LINES)) { // horizontal lines between rows //dc.DestroyClippingRegion(); int total_width = std::max(m_owner->GetHeaderWindow()->GetWidth(), m_owner->GetClientSize().GetWidth()); - // if the background colour is white, choose a - // contrasting color for the lines - wxPen pen (wxSystemSettings::GetColour (wxSYS_COLOUR_3DLIGHT ), 1, wxPENSTYLE_SOLID); - dc.SetPen ((GetBackgroundColour() == *wxWHITE)? pen: *wxWHITE_PEN); + dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxPENSTYLE_SOLID)); dc.DrawLine (0, y_top, total_width, y_top); dc.DrawLine (0, y_top+h, total_width, y_top+h); } @@ -4299,7 +4296,7 @@ wxCoord text_h = 0; dc.SetFont (GetItemFont (item)); - dc.GetTextExtent (item->GetText(m_main_column).size() > 0 + dc.GetTextExtent (!item->GetText(m_main_column).empty() ? item->GetText (m_main_column) : _T(" "), // blank to avoid zero height and no highlight width &text_w, &text_h); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/VertexCoordRemapper.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/VertexCoordRemapper.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/VertexCoordRemapper.cpp 2016-03-19 08:54:25.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/VertexCoordRemapper.cpp 2018-03-04 20:44:33.000000000 +0000 @@ -627,8 +627,6 @@ case HuginBase::PanoramaOptions::LAMBERT: case HuginBase::PanoramaOptions::MILLER_CYLINDRICAL: case HuginBase::PanoramaOptions::PANINI: - case HuginBase::PanoramaOptions::BIPLANE: - case HuginBase::PanoramaOptions::TRIPLANE: case HuginBase::PanoramaOptions::GENERAL_PANINI: // Cylinderical-like projections have the seam across the left // and right edge. We'll take any face within the middle third diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/ViewState.cpp hugin-2019.0.0+dfsg/src/hugin1/hugin/ViewState.cpp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/ViewState.cpp 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/ViewState.cpp 2018-12-07 20:58:37.000000000 +0000 @@ -147,7 +147,8 @@ it->first->SetDirtyViewport(); it->first->ForceRequireRedraw(); } - if ( new_opts->outputExposureValue != opts.outputExposureValue) + if ((new_opts->outputExposureValue != opts.outputExposureValue) || + (new_opts->outputRangeCompression != opts.outputRangeCompression)) { // output exposure changed. All image photometrics are now different. it->first->SetDirtyViewport(); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/batch_frame.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/batch_frame.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/batch_frame.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/batch_frame.xrc 2018-02-03 14:34:24.000000000 +0000 @@ -276,7 +276,7 @@ wxHORIZONTAL - + wxLEFT|wxALIGN_CENTRE_VERTICAL 6 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/cpdetector_dialog.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/cpdetector_dialog.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/cpdetector_dialog.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/cpdetector_dialog.xrc 2018-02-03 14:34:24.000000000 +0000 @@ -34,7 +34,7 @@ - Autopano (by A. Jenny) + Autopano (by A. Jenny) All images at once Panorama with stacks Multi-row panorama diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/cp_editor_panel.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/cp_editor_panel.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/cp_editor_panel.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/cp_editor_panel.xrc 2018-02-03 14:34:24.000000000 +0000 @@ -114,7 +114,7 @@ wxHORIZONTAL - + wxALIGN_CENTRE_VERTICAL @@ -129,7 +129,7 @@ - + wxALIGN_CENTRE_VERTICAL @@ -144,7 +144,7 @@ - + wxALIGN_CENTRE_VERTICAL @@ -159,7 +159,7 @@ - + wxALIGN_CENTRE_VERTICAL @@ -216,13 +216,13 @@ - 100% + 100% fit to window - 200% - 150% - 75% - 50% - 25% + 200% + 150% + 75% + 50% + 25% 1 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/CMakeLists.txt hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/CMakeLists.txt --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/CMakeLists.txt 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/CMakeLists.txt 2019-01-05 08:44:31.000000000 +0000 @@ -21,9 +21,8 @@ # license text for about dialog INSTALL(FILES ${CMAKE_SOURCE_DIR}/COPYING.txt DESTINATION ${HUGINDATADIR}/xrc/data/) -IF (UNIX) - INSTALL(FILES hugin.png ptbatcher.png DESTINATION ${DATADIR}/pixmaps) -ENDIF (UNIX) +# install of icon files for Linux is done from platforms/linux/icons +# see there # install cursor on windows IF(WIN32) Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0014985448cc97c209313a079e4eda593c810582.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0014985448cc97c209313a079e4eda593c810582.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0881f567a2579a682ece721d6d93816eecbcff0d.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0881f567a2579a682ece721d6d93816eecbcff0d.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0d04667eb3325cfad4ec50e994bf00c22782f509.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0d04667eb3325cfad4ec50e994bf00c22782f509.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0f203b686a923982358b9274fb508753ac31b996.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/0f203b686a923982358b9274fb508753ac31b996.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/132e57acb643253e7810ee9702d9581f159a1c61.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/132e57acb643253e7810ee9702d9581f159a1c61.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16788a4cd7337294823325c28db92225.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16788a4cd7337294823325c28db92225.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit.html 2017-04-22 17:02:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,40 +1,41 @@ - + 16bit - PanoTools.org Wiki - - + + + - - - - - + + +
-

16bit

-
-
From PanoTools.org Wiki
+

16bit

+
From PanoTools.org Wiki
- -

In digital images, 16 bits per each color channel (red, green and blue), or 48 bits per pixel, is used for accurate processing. Such images do not look much better than 24-bit images, but the existence of more shades between colors (65,536 as opposed to 256) means that more operations can be performed on the image without risk of noticeable banding or w:posterization[*]. (from wikipedia[*]) +

In digital images, 16 bits per each color channel (red, green and blue), or 48 bits per pixel, is used for accurate processing. Such images do not look much better than 24-bit images, but the existence of more shades between colors (65,536 as opposed to 256) means that more operations can be performed on the image without risk of noticeable banding or w:posterization[*]. (from wikipedia[*])

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=16bit&oldid=11949[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=16bit&oldid=11949"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html 2017-04-22 17:02:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html 2019-01-09 15:36:56.000000000 +0000 @@ -1,42 +1,38 @@ - + 16bit workflow with hugin - PanoTools.org Wiki - - + + + - - - - - + + +
-

16bit workflow with hugin

-
-
From PanoTools.org Wiki
+

16bit workflow with hugin

+
From PanoTools.org Wiki
- -

This tutorial doesn't cover reasons why you might want to shoot with RAW and +

This tutorial doesn't cover reasons why you might want to shoot with RAW and stitch in 16bit format. It is a simple HOWTO listing the tools available and how to use them with hugin.

Preparing the 16bit images

-

Start by using dcraw[*] to read the RAW files and batch convert them into portable 16bit per -channel PPM[*] files. RAW pictures from my Nikon 8700 have a .nef extension, so the +

Start by using dcraw[*] to read the RAW files and batch convert them into portable 16bit per +channel PPM[*] files. RAW pictures from my Nikon 8700 have a .nef extension, so the command looks something like this: 

 dcraw -v -w -4 dscn*.nef
@@ -45,8 +41,8 @@
 converting RAW data to 16bit colour depth as RAW images are typically only 12bit in the
 first place.  If you need a greater dynamic range than found in RAW images, it is possible
 to combine bracketed exposures in a HDR workflow with hugin.
-
These PPM[*] files are not readable by hugin or nona, so the next step is to use
-ImageMagick[*] to create 16bit per channel TIFF files:
+
These PPM[*] files are not readable by hugin or nona, so the next step is to use
+ImageMagick[*] to create 16bit per channel TIFF files:
 

 
 convert -rotate 270 -gamma 2.2 dscn3088.ppm dscn3088.tif
  convert -rotate 270 -gamma 2.2 dscn3089.ppm dscn3089.tif
@@ -55,13 +51,13 @@
 
Note that I rotated them at the same time since these are portrait shots.
 Gamma correction is also applied at this stage since RAW data is generally linear
 and difficult to view without colour profile management (not yet supported by hugin).
-
You can now delete the intermediate PPM[*] files.
-
Alternatively UFRaw[*] can be used for the entire conversion from RAW.
+
You can now delete the intermediate PPM[*] files.
+
Alternatively UFRaw[*] can be used for the entire conversion from RAW.
 
If necessary, correct chromatic aberration with fulla at this stage.
 

 
Stitching with hugin

 
The TIFF images can be loaded into hugin as per usual except:
-
EXIF information about the Field of View was lost during the PPM[*] stage, so the field of view will need to be re-entered manually, re-optimised with PTOptimizer or transferred from the RAW file using exiftool[*]:
+
EXIF information about the Field of View was lost during the PPM[*] stage, so the field of view will need to be re-entered manually, re-optimised with PTOptimizer or transferred from the RAW file using exiftool[*]:
 

 
 exiftool -tagsfromfile DSCN3088.nef -overwrite_original_in_place -exif:all DSCN3088.tif
 

@@ -75,18 +71,22 @@
 
Post processing

 
This TIFF file is in 16bit per channel RGBA format, which is not viewable in most image
 viewers or web-browsers, so there is an extra step needed to create portable images:
-
Open the file in a 16bit aware image editor such as cinepaint[*] or krita[*], tweak the
+
Open the file in a 16bit aware image editor such as cinepaint[*] or krita[*], tweak the
 colours, retouch or apply a contrast mask
 and finally save in an 8bit per channel format such as JPEG.
 
Alternatively you can get very good results by simply applying the ICC colour profile
-for your camera and converting to sRGB colour-space, lcms[*] provides the tifficc tool
+for your camera and converting to sRGB colour-space, lcms[*] provides the tifficc tool
 for doing just this:
 

 
 tifficc -i mycamera.icm myproject.tif output.tif
 

 
-
-
-
- Retrieved from "http://wiki.panotools.org/index.php?title=16bit_workflow_with_hugin&oldid=8954[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=16bit_workflow_with_hugin&oldid=8954"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/17af7474cdfd5abe24fd07eb58810dba.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/17af7474cdfd5abe24fd07eb58810dba.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-2125768589_b.jpg and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-2125768589_b.jpg differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_crop.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_crop.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_drag.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_drag.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_identify.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_identify.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_rotate_drag.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_rotate_drag.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_start.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_start.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Focal_length.gif and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Focal_length.gif differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1876c10b5fac40156f4cd7ab00928c9fc2bed36b.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1876c10b5fac40156f4cd7ab00928c9fc2bed36b.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1d8b2987693a73b6ef2eb74783d2e51786789f89.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1d8b2987693a73b6ef2eb74783d2e51786789f89.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1d90bc6b2f34e2398a9accb8c63bb46bdcf8a629.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1d90bc6b2f34e2398a9accb8c63bb46bdcf8a629.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1e3fbb44cf80bc872c3bc50c35a10b98.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1e3fbb44cf80bc872c3bc50c35a10b98.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/228647b7d4a18b6c8c0c390b439a61da8fafec76.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/228647b7d4a18b6c8c0c390b439a61da8fafec76.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/2c5d28ca1131956936f41807db3895584e54ba78.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/2c5d28ca1131956936f41807db3895584e54ba78.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-2125768589_b.jpg and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-2125768589_b.jpg differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_crop.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_crop.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_drag.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_drag.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_identify.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_identify.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_rotate_drag.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_rotate_drag.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_start.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Fast_preview_guide_start.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Focal_length.gif and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Focal_length.gif differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Lamp_enfuse.jpg and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/300px-Lamp_enfuse.jpg differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/36408bbe3513b733d360cf77918a5cbfbedef425.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/36408bbe3513b733d360cf77918a5cbfbedef425.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/38d368a092f7d5a4d2b42bdf4d0dd89c.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/38d368a092f7d5a4d2b42bdf4d0dd89c.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/39178db26b94bc87f737b575c304974110ba292b.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/39178db26b94bc87f737b575c304974110ba292b.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/422cb0e4439a3b643f880b45af9d5636.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/422cb0e4439a3b643f880b45af9d5636.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/435638222a3155b22cedd949f090863742aeb32e.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/435638222a3155b22cedd949f090863742aeb32e.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/468496ffa63b733cefc74a49e3eb869acb771abe.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/468496ffa63b733cefc74a49e3eb869acb771abe.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/4b0bfb3769bf24d80e15374dc37b0441e2616e33.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/4b0bfb3769bf24d80e15374dc37b0441e2616e33.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/4c08b4c70c5be7cb6c402efa92fdb6ee.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/4c08b4c70c5be7cb6c402efa92fdb6ee.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/4d4d22d9c63b47c6f8fb7825ec5cd1db.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/4d4d22d9c63b47c6f8fb7825ec5cd1db.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/566a3cea17751229daea11d526505235164b25df.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/566a3cea17751229daea11d526505235164b25df.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/57b9ca0ee21ce403038c5efcdc7c5eca.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/57b9ca0ee21ce403038c5efcdc7c5eca.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/5a12c95d04637539015c2d09b5002204.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/5a12c95d04637539015c2d09b5002204.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/5b71f1d3fb01a7173133cf27840d65890345ba44.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/5b71f1d3fb01a7173133cf27840d65890345ba44.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/5f558fa7e9b1567daca23dc3433f5cec.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/5f558fa7e9b1567daca23dc3433f5cec.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6307c8a99dad7d0bcb712352ae0a748bd99a038b.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6307c8a99dad7d0bcb712352ae0a748bd99a038b.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/652e1fd9c3a2ca00e1a517783cdbb0e18e4181f8.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/652e1fd9c3a2ca00e1a517783cdbb0e18e4181f8.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/687431209ed4a8feab0c151b622ef1e0.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/687431209ed4a8feab0c151b622ef1e0.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6969c411977839d7af14df4000f56edfba759aed.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6969c411977839d7af14df4000f56edfba759aed.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6a4493e959276bb2365c2f4255a4749ed324d741.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6a4493e959276bb2365c2f4255a4749ed324d741.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6aea83a57db153f846b8b7b1a8306e59c4e43ef0.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6aea83a57db153f846b8b7b1a8306e59c4e43ef0.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6e5a86d56d252eb4d556c47ef65cbb3e9f5a9d2e.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6e5a86d56d252eb4d556c47ef65cbb3e9f5a9d2e.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6e5ab2664b422d53eb0c7df3b87e1360d75ad9af.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/6e5ab2664b422d53eb0c7df3b87e1360d75ad9af.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/73efd1f6493490b058097060a572606d2c550a06.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/73efd1f6493490b058097060a572606d2c550a06.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/77b1d0af49406a510722c741051555ca7ae87b1b.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/77b1d0af49406a510722c741051555ca7ae87b1b.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/7a52a97d85628ff81bb576d212dcae925f38f1eb.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/7a52a97d85628ff81bb576d212dcae925f38f1eb.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/7a62f58ab1c3f78523eee522e71a9416.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/7a62f58ab1c3f78523eee522e71a9416.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/81b4c8dd7cbec41cae5ef37da5644e99.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/81b4c8dd7cbec41cae5ef37da5644e99.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/89539baed8c394f4b6eea437f16b047d.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/89539baed8c394f4b6eea437f16b047d.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8cf629bdcc90521bb174119ac00d2f82e66b6858.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8cf629bdcc90521bb174119ac00d2f82e66b6858.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8d3ef9dbe5e117eb5bb0de31eb3d72ae5ee9878c.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8d3ef9dbe5e117eb5bb0de31eb3d72ae5ee9878c.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8dc4f8dfb753dc58e5cfaa70bb2add2e.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8dc4f8dfb753dc58e5cfaa70bb2add2e.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8fa14cdd754f91cc6554c9e71929cce7.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/8fa14cdd754f91cc6554c9e71929cce7.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/927996686539d9eacf2e62a8cf730cc117529091.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/927996686539d9eacf2e62a8cf730cc117529091.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/97f76ad87331fb0eebfa4c97bed26d8c.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/97f76ad87331fb0eebfa4c97bed26d8c.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/98dda29ec0838b4a60698e962d90cd03.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/98dda29ec0838b4a60698e962d90cd03.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/990bd2a1181cb4840ca9ff6b710ca7ec.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/990bd2a1181cb4840ca9ff6b710ca7ec.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/a0f45cb050ae05932d1495f15a13290e.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/a0f45cb050ae05932d1495f15a13290e.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/a98f19317c5b1baf19a11563189c874b.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/a98f19317c5b1baf19a11563189c874b.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/ab807c8735d25a66b577b029bc0e568f.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/ab807c8735d25a66b577b029bc0e568f.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/addsvgext.pl hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/addsvgext.pl --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/addsvgext.pl 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/addsvgext.pl 2019-01-10 15:34:53.000000000 +0000 @@ -0,0 +1,14 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +# SVG files are retrieved without .svg extension, which breaks locally served web pages + +for my $file (@ARGV) +{ + next unless $file =~ /^[a-f0-9]{40}$/; + rename $file, "$file.svg"; + system ('rsvg-convert', '-o', "$file.png", "$file.svg"); + unlink ("$file.svg"); +} diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aliasing.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aliasing.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aliasing.html 2017-04-22 17:02:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aliasing.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Aliasing - PanoTools.org Wiki - - + + + - - - - - + + +
-

Aliasing

-
-
From PanoTools.org Wiki
+

Aliasing

+
From PanoTools.org Wiki
- -


+


Definition and Background

Aliasing is a process that results in "jaggies" or Moire effects when an image is sampled or resampled. @@ -38,25 +34,30 @@

To avoid aliasing, a signal must not contain frequencies that are higher than one half the sample rate. Likewise, an input image must not contain details that are smaller than one pixel in the output image.

This can be accomplished by appropriately filtering the signal or blurring the image before resampling it.

Such filtering is one way to anti-alias. (There are others, not relevant here.) -

When using older versions of Panorama Tools[*] (and derived tools such as PTStitcher, nona or the Panorama Tools Plugins[*]) the important thing to know was that Panorama Tools did not anti-alias until pano12 version 2.7.0.11. This meant that if you had Panorama Tools make a small panorama directly, it was likely to show jaggies or Moire effects. -

In version 2.7.0.11 a couple of anti-aliasing interpolators[*] where added which can be used by either specifying the correct interpolator number in the script] or by choosing one of the interpolators directly if the Software supports it. However, the traditional interpolators "poly3", "spline16", "spline36", "sinc256", "spline64", "bilinear", "nearest neighbor" and "sinc1024" still cause aliasing. +

When using older versions of Panorama Tools[*] (and derived tools such as PTStitcher, nona or the Panorama Tools Plugins[*]) the important thing to know was that Panorama Tools did not anti-alias until pano12 version 2.7.0.11. This meant that if you had Panorama Tools make a small panorama directly, it was likely to show jaggies or Moire effects. +

In version 2.7.0.11 a couple of anti-aliasing interpolators[*] where added which can be used by either specifying the correct interpolator number in the script] or by choosing one of the interpolators directly if the Software supports it. However, the traditional interpolators "poly3", "spline16", "spline36", "sinc256", "spline64", "bilinear", "nearest neighbor" and "sinc1024" still cause aliasing.

Guidance

-

You will get better results by having Panorama Tools make a large panorama, then resizing it (downsampling) using some tool like Photoshop[*], ImageMagick[*] or the Gimp[*] that does incorporate anti-aliasing, if you use a version prior to 2.7.0.11 or if it's not possible to use the new anti-aliasing filters. +

You will get better results by having Panorama Tools make a large panorama, then resizing it (downsampling) using some tool like Photoshop[*], ImageMagick[*] or the Gimp[*] that does incorporate anti-aliasing, if you use a version prior to 2.7.0.11 or if it's not possible to use the new anti-aliasing filters.

Illustrations

The following images illustrate this guidance. They show crops from a 1000x500 panorama. -

On the left is what Photoshop produced by downsampling from a 6068x3034 pano, using the Image Size command with Bicubic resampling. (6068x3034 was the PTGui[*] "optimum" size.) +

On the left is what Photoshop produced by downsampling from a 6068x3034 pano, using the Image Size command with Bicubic resampling. (6068x3034 was the PTGui[*] "optimum" size.)

On the right is what Panorama Tools produced directly at 1000x500.

Actual pixels -

AliasingPScubic.jpg[*] AliasingPTpoly3.jpg[*] +

AliasingPScubic.jpg[*] AliasingPTpoly3.jpg[*]


2X enlargement to show the aliasing more clearly -

AliasingPScubic 2x.jpg[*] AliasingPTpoly3 2x.jpg[*] +

AliasingPScubic 2x.jpg[*] AliasingPTpoly3 2x.jpg[*]

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Aliasing&oldid=10854[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Aliasing&oldid=10854"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_a_stack_of_photos.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_a_stack_of_photos.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_a_stack_of_photos.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_a_stack_of_photos.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,76 +1,62 @@ - + Align a stack of photos - PanoTools.org Wiki - - + + + - - - - - + + +
-

Align a stack of photos

-
-
From PanoTools.org Wiki
+

Align a stack of photos

+
From PanoTools.org Wiki
- -

There are occasions where it is necessary to align a set of otherwise identical +

There are occasions where it is necessary to align a set of otherwise identical pictures:

-
    -
  • Aligning red, green and blue channels to correct chromatic aberration. -
    • -
  • Aligning photos taken over a period of time to create a time-lapse movie. -
    • -
  • Aligning bracketed shots to create a single HDR or contrast blended[*] image. -
    • -
  • Aligning photos taken at different focus distances to merge into a single extended Depth of Field image. -
    • -
+
  • Aligning red, green and blue channels to correct chromatic aberration.
    • +
  • Aligning photos taken over a period of time to create a time-lapse movie.
    • +
  • Aligning bracketed shots to create a single HDR or contrast blended[*] image.
    • +
  • Aligning photos taken at different focus distances to merge into a single extended Depth of Field image.

Panorama tools is particularly useful for this process since it allows sub-pixel alignment and has a sophisticated lens correction model for applying distortion - Even photos taken years apart with different cameras can be aligned perfectly. -

Most tools for HDR generation such as photomatix[*] have some level of +

Most tools for HDR generation such as photomatix[*] have some level of automatic alignment, so this may be sufficient for most purposes. Otherwise the hdrprep perl script automates the process described below:

Aligning with hugin

-
    -
  • Start up a new hugin project for each series and load the images. Set the Field of View, lens parameters and projection type, ie. if your lens is a fisheye, set this for both the input and output projection. -
    • -
  • Create control points via the Photos tab. Align_image_stack is specialized for this task. But also Panomatic or Cpfind work for this use case. -
    • -
  • Select "Positions (y,p,r)" and "Optimise now!" in the Photos tab. -
    • -
  • If necessary, fine tune the control points in the Control Points tab and optimise again. -
    • -
  • In the fast panorama preview, the images will be on top of each other. Select "Move/Drag" and "Fit", then select "Crop" and "HDR Autocrop". -
    • -
  • In the Stitcher tab, select "Calculate Optimal Size", then deselect the default panorama outputs and select "No exposure correction, low dynamic range" in the "Remapped images" section. Select "Stitch!". -
    • -
+
  • Start up a new hugin project for each series and load the images. Set the Field of View, lens parameters and projection type, ie. if your lens is a fisheye, set this for both the input and output projection.
    • +
  • Create control points via the Photos tab. Align_image_stack is specialized for this task. But also Panomatic or Cpfind work for this use case.
    • +
  • Select "Positions (y,p,r)" and "Optimise now!" in the Photos tab.
    • +
  • If necessary, fine tune the control points in the Control Points tab and optimise again.
    • +
  • In the fast panorama preview, the images will be on top of each other. Select "Move/Drag" and "Fit", then select "Crop" and "HDR Autocrop".
    • +
  • In the Stitcher tab, select "Calculate Optimal Size", then deselect the default panorama outputs and select "No exposure correction, low dynamic range" in the "Remapped images" section. Select "Stitch!".

See a more detailed view of this article here.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Align_a_stack_of_photos&oldid=15690[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Align_a_stack_of_photos&oldid=15690"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_image_stack.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_image_stack.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_image_stack.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Align_image_stack.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Align image stack - PanoTools.org Wiki - - + + + - - - - - + + +
-

Align image stack

-
-
From PanoTools.org Wiki
+

Align image stack

+
From PanoTools.org Wiki
- -

align_image_stack is a command-line tool to align overlapping images to facilitate HDR creation, Exposure blending[*], extended Depth of Field, and Stereoscopic[*] images. +

align_image_stack is a command-line tool to align overlapping images to facilitate HDR creation, Exposure blending[*], extended Depth of Field, and Stereoscopic[*] images.

Usage

align_image_stack [options] input_files
@@ -67,7 +63,7 @@
 

 
-f HFOV   
 

-
Approximate horizontal field of view[*] of input images. Use if EXIF info not complete.
+
Approximate horizontal field of view[*] of input images. Use if EXIF info not complete.
 

 
-m        
 

@@ -143,18 +139,24 @@
 

 

 
-
-
This article is incomplete.  You can help Panotools Wiki by expanding it.
-

+
+This article is incomplete.  You can help Panotools Wiki by expanding it.
+
 

 Once the article is ok feel free to remove the {{Incomplete}} template
-

+

 

 

 
 
+
+
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Align_image_stack&oldid=15916[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Align_image_stack&oldid=15916"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Alpha_channel.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Alpha_channel.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Alpha_channel.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Alpha_channel.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,53 +1,49 @@ - + Alpha channel - PanoTools.org Wiki - - + + + - - - - - + + +
-

Alpha channel

-
-
From PanoTools.org Wiki
+

Alpha channel

+
From PanoTools.org Wiki
- -

an image channel containing a mask or selection. +

an image channel containing a mask or selection. An Alpha channel is an additional image channel just like the red, green or blue channel. It can contain any information in form of a grayscale image but commonly it is used to store a selection or a mask.

-
    -
  • Black alpha channel pixels usually stand for masked, invisible or unselected pixels in the main image. -
    • -
  • White alpha channel pixels stand for unmasked, visible or selected pixels. -
    • -
  • Gray alpha channel pixels stand for more or less translucent pixels according to the brightness of gray. -
    • -
-

Both enblend and smartblend[*] use the alpha channel to determine seam position when blending, -see the how to use enblend for patching zenith and nadir images[*] tutorial for details. +

  • Black alpha channel pixels usually stand for masked, invisible or unselected pixels in the main image.
    • +
  • White alpha channel pixels stand for unmasked, visible or selected pixels.
    • +
  • Gray alpha channel pixels stand for more or less translucent pixels according to the brightness of gray.
+

Both enblend and smartblend[*] use the alpha channel to determine seam position when blending, +see the how to use enblend for patching zenith and nadir images[*] tutorial for details.

More information on wikipedia:alpha channel[*] page

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Alpha_channel&oldid=15489[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Alpha_channel&oldid=15489"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aspect_Ratio.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aspect_Ratio.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aspect_Ratio.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Aspect_Ratio.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,52 +1,48 @@ - + Aspect Ratio - PanoTools.org Wiki - - + + + - - - - - + + +
-

Aspect Ratio

-
-
From PanoTools.org Wiki
+

Aspect Ratio

+
From PanoTools.org Wiki
- -


+


Aspect ratio is the ratio (proportion) between width and height of an image. It doesn't matter whether the image is measured in cm, inch or pixels. However, measurement in digital imaging depends on resolution (and this can be different for width and height) hence always pixel values are used to calculate the aspect ratio.

If an image is 200 pixels wide and 100 pixels high it has an aspect ratio of 2:1 as well as if it is 600 pixels wide and 300 pixels high.

Common ratios

-
    -
  • Digital cameras often produce images with a 4:3 ratio, for example: 640×480 (VGA), 800×600, 1600×1200, 2048×1536 (3 megapixel), 2592×1944, 3264×2448, etc. -
    • -
  • The common frame size used with still photography on 35 mm film is approximately 36×24 mm, giving an aspect ratio of 3:2. -
    • -
  • Panoramic Images in an equirectangular format have an aspect ratio of 2:1 to cover 360 degrees horizontally and 180 degrees vertically. -
    • -
- - +
  • Digital cameras often produce images with a 4:3 ratio, for example: 640×480 (VGA), 800×600, 1600×1200, 2048×1536 (3 megapixel), 2592×1944, 3264×2448, etc.
    • +
  • The common frame size used with still photography on 35 mm film is approximately 36×24 mm, giving an aspect ratio of 3:2.
    • +
  • Panoramic Images in an equirectangular format have an aspect ratio of 2:1 to cover 360 degrees horizontally and 180 degrees vertically.
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Aspect_Ratio&oldid=9376[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Aspect_Ratio&oldid=9376"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,62 +1,45 @@ - + Autooptimiser - PanoTools.org Wiki - - + + + - - - - - + + +
-

Autooptimiser

-
-
From PanoTools.org Wiki
+

Autooptimiser

+
From PanoTools.org Wiki
- -

autooptimiser is a smart optimiser replacement for PTOptimizer and vig_optimize, it is part of the hugin suite of tools for panoramic imaging. +

autooptimiser is a smart optimiser replacement for PTOptimizer and vig_optimize, it is part of the hugin suite of tools for panoramic imaging.

It is not a 100% drop-in replacement for PTOptimizer as it has a slightly different interface and some extra features:

-
    -
  • PTOptimizer will write the output of the optimisation into the input script file as 'o' lines, deleting any that already exist. This behaviour is a little strange, so autooptimiser writes the result to STDOUT or a new file, as is more usual for a command-line tool. -
    • -
  • Not clobbering the original file means that there is no need to create 'o' lines, the output file is in the same format as the input with optimised values applied to the 'i' lines. -
    • -
  • PTStitcher requires 'o' lines, so the output of autooptimiser isn't suitable for stitching with PTStitcher without further processing - Stitch these files with nona instead. -
    • -
+
  • PTOptimizer will write the output of the optimisation into the input script file as 'o' lines, deleting any that already exist. This behaviour is a little strange, so autooptimiser writes the result to STDOUT or a new file, as is more usual for a command-line tool.
    • +
  • Not clobbering the original file means that there is no need to create 'o' lines, the output file is in the same format as the input with optimised values applied to the 'i' lines.
    • +
  • PTStitcher requires 'o' lines, so the output of autooptimiser isn't suitable for stitching with PTStitcher without further processing - Stitch these files with nona instead.

Additional features:

-
    -
  • autooptimiser can perform pairwise optimisation instead of trying to optimise all rotation parameters at the same time, this means that there is no need to pre-position images before optimisation. -
    • -
  • levelling the horizon in a set of images can be performed, this is the same functionality as the Straighten button in the hugin Preview window. -
    • -
  • auto-align mode will pick an optimisation scheme suited to the distribution of control points in the project so there is no need to specify parameters to optimise. -
    • -
  • autooptimiser can adjust the panorama field of view[*], dimensions and projection to suit the input images. -
    • -
  • the field of view of input images can be specified, this is useful as the project files created by autopano and autopano-sift don't specify the field of view of the input photos. -
    • -
  • autooptimiser can also perform photometric optimisation like the vig_optimize tool. Depending on the input images it selects automaticly these photometric parameters (exposure, white balance, vignetting, camera response curve) which should be optimised. -
    • -
+
  • autooptimiser can perform pairwise optimisation instead of trying to optimise all rotation parameters at the same time, this means that there is no need to pre-position images before optimisation.
    • +
  • levelling the horizon in a set of images can be performed, this is the same functionality as the Straighten button in the hugin Preview window.
    • +
  • auto-align mode will pick an optimisation scheme suited to the distribution of control points in the project so there is no need to specify parameters to optimise.
    • +
  • autooptimiser can adjust the panorama field of view[*], dimensions and projection to suit the input images.
    • +
  • the field of view of input images can be specified, this is useful as the project files created by autopano and autopano-sift don't specify the field of view of the input photos.
    • +
  • autooptimiser can also perform photometric optimisation like the vig_optimize tool. Depending on the input images it selects automaticly these photometric parameters (exposure, white balance, vignetting, camera response curve) which should be optimised.

Usage

      autooptimiser [options] project.pto
@@ -73,10 +56,7 @@

-o file.pto Output file. If omitted, stdout is used.


-
    -
  • Optimisation options (if not specified, no optimisation takes place): -
    • -
+
  • Optimisation options (if not specified, no optimisation takes place):

-a Auto align mode, includes various optimisation stages, depending on the amount and distribution of the control points

-p Pairwise optimisation of yaw, pitch and roll, starting from first @@ -85,17 +65,11 @@

-m Optimize photometric parameters (the optimized parameters are automatically selected depending on project settings)


-
    -
  • Post-processing options: -
    • -
+
  • Post-processing options:

-l Level horizon (works best for horizontal panoramas)

-s Automatically select a suitable output projection and size

-
    -
  • Other options: -
    • -
+
  • Other options:

-q Quiet operation (no progress is reported)

-v HFOV Specify horizontal field of view of input images. Used if the .pto file contains invalid HFOV values (autopano-SIFT writes .pto files @@ -104,8 +78,12 @@ the one of the "Align" button in hugin is performed.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Autooptimiser&oldid=13134[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Autooptimiser&oldid=13134"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,48 +1,46 @@ - + Autopano - PanoTools.org Wiki - - + + + - - - - - + + +
-

Autopano

-
-
From PanoTools.org Wiki
+

Autopano

+
From PanoTools.org Wiki
- -

Autopano is software for Windows and Linux by Alexandre Jenny which automatically generates control points from groups of photographs. It works with Hugin, PTAssembler[*], PTGui[*] and stand alone. +

Autopano is software for Windows and Linux by Alexandre Jenny which automatically generates control points from groups of photographs. It works with Hugin, PTAssembler[*], PTGui[*] (prior to version 11) and stand alone.

The functionality is very similar to that of autopano-sift, which is actually a different program. -

A commercial program using the same technology is Autopano pro[*] +

A commercial program using the same technology is Autopano pro[*]

External links

- - - + -
- Retrieved from "http://wiki.panotools.org/index.php?title=Autopano&oldid=10834[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Autopano&oldid=16074"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift-C.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,36 +1,32 @@ - + Autopano-sift-C - PanoTools.org Wiki - - + + + - - - - - + + +
-

Autopano-sift-C

-
-
From PanoTools.org Wiki
+

Autopano-sift-C

+
From PanoTools.org Wiki
- -

autopano-sift-C can be used to find control points in overlapping image pairs and is a C port of the C# software autopano-sift. It is somewhat faster and doesn't require a C# runtime - Installing the mono C# runtime on OS X has proved to be problematic on some systems. +

autopano-sift-C can be used to find control points in overlapping image pairs and is a C port of the C# software autopano-sift. It is somewhat faster and doesn't require a C# runtime - Installing the mono C# runtime on OS X has proved to be problematic on some systems.

Additionally, autopano-sift-C has experimental modifications to perform feature identification in conformal image space, this helps with wide angle or fisheye Projection photographs.

autopano-sift-C is available from the hugin project and can only be used within hugin as an optional installation due to patent issues: the use of the Scale-invariant feature transform[*] algorithm is restricted by US Patent 6,711,293, awarded March 23, 2004 to the University of British Columbia.

The current version 2.5.1 (autopano-sift-C-2.5.1) is available since the release of hugin 0.7 in October 2008. @@ -38,27 +34,27 @@

Installation on Mac OS X

On Mac OS X, autopano-sift-c can be installed via MacPorts:

-
-$ sudo port install autopano-sift-c
+
$ sudo port install autopano-sift-c
 

 
This may take some minutes to fetch and compile the required software. Once complete, the autopano-sift-c binary will be installed in /opt/local/bin.
 
To get Hugin to use it, you may need to add this full path into the preferences:
-
Autopano-prefs.png[*]
+
Autopano-prefs.png[*]
 
Now you're ready to use the control point alignment assistant in Hugin. Load up your images, then hit the 'Align' button:
 

-

-
Autopano-align.png[*]
-

-

+
Autopano-align.png[*]

 
At this point you'll either see a big fat error dialog, or if everything's working you'll see a dialog like this while autopano-sift-c does its thing. This may take a few minutes...
-
Autopano-searching.png[*]
+
Autopano-searching.png[*]
 
When it's done, Hugin's panorama preview should show you something decent now!
-
Autopano-done.png[*]
+
Autopano-done.png[*]
 
You'll probably still want to nudge some things or run the exposure optimizer, but this'll have saved a lot of time manually setting control points.
 

 
-
-
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Autopano-sift-C&oldid=12367[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Autopano-sift-C&oldid=12367"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Autopano-sift.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,44 +1,44 @@ - + Autopano-sift - PanoTools.org Wiki - - + + + - - - - - + + +
-

Autopano-sift

-
-
From PanoTools.org Wiki
+

Autopano-sift

+
From PanoTools.org Wiki
- -

Autopano-SIFT by Sebastian Nowozin automatically creates control points for groups of overlapping photographs, it can be controlled from within the Hugin GUI front-end[*]. See autopano sift page for details. +

Autopano-SIFT by Sebastian Nowozin automatically creates control points for groups of overlapping photographs, it can be controlled from within the Hugin GUI front-end[*]. See autopano sift page for details.

Functionally, autopano-sift is very similar to autopano and the two can be used interchangeably to a certain extent. -

There are both command-line and GUI versions of autopano-sift. There is a tutorial for Using Autopano-SIFT With PTGui[*]. +

There are both command-line and GUI versions of autopano-sift. There is a tutorial for Using Autopano-SIFT With PTGui[*].

Autopano-sift is Open Source and written using C# and mono. The use of the Scale-invariant feature transform[*] algorithm is restricted by US Patent 6,711,293 awarded March 23, 2004 to the University of British Columbia.

Autopano-sift has been largely superseded by a C port called autopano-sift-C, available from the hugin project.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Autopano-sift&oldid=11996[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Autopano-sift&oldid=11996"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/b27abc434a11d07b390df859d7aa782a.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/b27abc434a11d07b390df859d7aa782a.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/b46e7c5d2bb0d7e3dc91da9577785c32b9fe1c97.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/b46e7c5d2bb0d7e3dc91da9577785c32b9fe1c97.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/b52d9f5b1cbad5408a6d13c40055d28513b7d515.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/b52d9f5b1cbad5408a6d13c40055d28513b7d515.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/ba75cc7aa1514d3d82cf1cf2860b99a986f977c0.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/ba75cc7aa1514d3d82cf1cf2860b99a986f977c0.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Banding.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Banding.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Banding.html 2017-04-22 17:02:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Banding.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,41 +1,42 @@ - + Banding - PanoTools.org Wiki - - + + + - - - - - + + +
-

Banding

-
-
From PanoTools.org Wiki
+

Banding

+
From PanoTools.org Wiki
- -


-Banding Visible steps in smooth gradients. Early versions of Panorama Tools software could introduce obvious banding, for example during radial luminance correction[*] as discussed by John Houghton. This problem is largely corrected in current versions of the software. +


+Banding Visible steps in smooth gradients. Early versions of Panorama Tools software could introduce obvious banding, for example during radial luminance correction[*] as discussed by John Houghton. This problem is largely corrected in current versions of the software.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Banding&oldid=12177[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Banding&oldid=12177"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Barrel_distortion.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Barrel_distortion.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Barrel_distortion.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Barrel_distortion.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,45 +1,46 @@ - + Barrel distortion - PanoTools.org Wiki - - + + + - - - - - + + +
-

Barrel distortion

-
-
From PanoTools.org Wiki
+

Barrel distortion

+
From PanoTools.org Wiki
- -


+


Barrel distortion is the opposite of pincushion distortion, it is a radial image distortion introduced by the lens itself.

It is a common Lens distortion that can be corrected by the lens correction model of panotools.

-
[*]
A photograph showing exaggerated barrel distortion
- - +
[*]
A photograph showing exaggerated barrel distortion
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Barrel_distortion&oldid=9378[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Barrel_distortion&oldid=9378"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/be171a7c8c559cc35aaec70416b787efc4aebe31.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/be171a7c8c559cc35aaec70416b787efc4aebe31.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Bracketing.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Bracketing.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Bracketing.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Bracketing.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,42 +1,38 @@ - + Bracketing - PanoTools.org Wiki - - + + + - - - - - + + +
-

Bracketing

-
-
From PanoTools.org Wiki
+

Bracketing

+
From PanoTools.org Wiki
- -


+


Most digital cameras allow taking of bracketed shots, ie. more than one picture of the same scene, but at different exposures.

This can be useful when photographing panoramas. -

Since most cameras are limited in the number of shots there are possibilities to extend the bracketing range[*] +

Since most cameras are limited in the number of shots there are possibilities to extend the bracketing range[*]

-

Contents

+

Contents

  • 1 Panoramic stitching techniques
      @@ -55,65 +51,47 @@

      Simple

      Pick the best exposed set of images and discard the rest.

      -
        -
      • This may be good enough, though you lose the ability to use the entire dynamic range in the final panorama. -
        • -
      +
      • This may be good enough, though you lose the ability to use the entire dynamic range in the final panorama.

      Contrast blend bracketed shots

      -

      Use Contrast Blending[*] to merge each bracketed view, then stitch +

      Use Contrast Blending[*] to merge each bracketed view, then stitch these 8bit images into an 8bit panorama.

      -
        -
      • You have to use the same 'exposure' when merging each shot, but you don't know what that needs to be until you have finished and can see the result (less of a problem if you use a full 16 bit workflow[*]). -
        • -
      +
      • You have to use the same 'exposure' when merging each shot, but you don't know what that needs to be until you have finished and can see the result (less of a problem if you use a full 16 bit workflow[*]).

      Contrast blend bracketed panoramas

      Stitch each exposure step into a complete 8bit panorama, then merge -these with Contrast Blending[*] into an 8bit panorama. +these with Contrast Blending[*] into an 8bit panorama.

      -
        -
      • Running enblend multiple times is slow. -
        • -
      • Ghosting[*] unless your panoramas are aligned perfectly. -
        • -
      +
      • Running enblend multiple times is slow.
        • +
      • Ghosting[*] unless your panoramas are aligned perfectly.

      Convert bracketed shots to HDR

      Merge each bracketed view into an HDR image, stitch these into an HDR panorama and then reduce to 8bit with tone mapping.

      -
        -
      • Local tone mapping operators produce ugly artefacts in equirectangular panoramas. -
        • -
      • Currently this workflow is only possible with hugin. -
        • -
      +
      • Local tone mapping operators produce ugly artefacts in equirectangular panoramas.
        • +
      • Currently this workflow is only possible with hugin.

      Convert bracketed panoramas to HDR

      Stitch each exposure step into a complete 8bit panorama, then merge these into an HDR panorama and reduce to 8bit with tone mapping.

      -
        -
      • Running enblend multiple times is slow. -
        • -
      • Local tone mapping operators produce ugly artefacts in equirectangular panoramas. -
        • -
      • Ghosting[*] unless all your panoramas are aligned perfectly. -
        • -
      +

      Tone map bracketed shots

      Merge each bracketed view into an HDR image, use a tone mapping operator to generate 8bit images. Then stitch these into an 8bit panorama.

      -
        -
      • You have to use the same tone mapping settings for each shot, but you don't know what that needs to be until you have finished and can see the result (less of a problem with a full 16 bit workflow[*]). -
        • -
      • Local tone mapping operators will behave differently for overlapping areas, you need to hope that blending with enblend, smartblend[*] or PTGui[*] will fix them. -
        • -
      - +
      • You have to use the same tone mapping settings for each shot, but you don't know what that needs to be until you have finished and can see the result (less of a problem with a full 16 bit workflow[*]).
        • +
      • Local tone mapping operators will behave differently for overlapping areas, you need to hope that blending with enblend, smartblend[*] or PTGui[*] will fix them.
      + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Bracketing&oldid=15795[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Bracketing&oldid=15795"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c31fdc58e559f2dcdf2cee6a137cc3db024f093c.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c31fdc58e559f2dcdf2cee6a137cc3db024f093c.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c398d95d4b6e864a2b448a53b5a245fd.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c398d95d4b6e864a2b448a53b5a245fd.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c3c9a2c7b599b37105512c5d570edc034056dd40.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c3c9a2c7b599b37105512c5d570edc034056dd40.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c3cc50179501003b73b0f3d8f02098dc.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c3cc50179501003b73b0f3d8f02098dc.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c81f99c35740e0ae9e1602d890467f02f02ade21.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c81f99c35740e0ae9e1602d890467f02f02ade21.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c92a8ec1cc630ea8f8f4f936688278d7636bb4e6.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/c92a8ec1cc630ea8f8f4f936688278d7636bb4e6.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Calibrate_lens_gui.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Calibrate_lens_gui.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Calibrate_lens_gui.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Calibrate_lens_gui.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,36 +1,32 @@ - + Calibrate lens gui - PanoTools.org Wiki - - + + + - - - - - + + +
-

Calibrate lens gui

-
-
From PanoTools.org Wiki
+

Calibrate lens gui

+
From PanoTools.org Wiki
- -

calibrate_lens_gui is a tool for lens calibration using the straight line approach. +

calibrate_lens_gui is a tool for lens calibration using the straight line approach.

Workflow

1. Load images @@ -45,20 +41,19 @@

Finally the found lines are checked if they are straight in respect to the given focal length. Also lines with are shorter than the minimal line length are rejected. Minimum line length is given as ratio to the image width/height. So a value of 0.3 means that only lines which are longer than 30 % of the image width are used.

Preview

-
    -
  • Original: Shows the original image as loaded from the disc. -
    • -
  • Edge detection: Shows the result of the Canny edge detector. Useful for tweaking the scale and threshold parameters that good lines are found. -
    • -
  • Corrected: Shows the image corrected with the current lens parameters. If you manually edit these values you need to press Refresh so see the effect of the modified parameters. -
    • -
+
  • Original: Shows the original image as loaded from the disc.
    • +
  • Edge detection: Shows the result of the Canny edge detector. Useful for tweaking the scale and threshold parameters that good lines are found.
    • +
  • Corrected: Shows the image corrected with the current lens parameters. If you manually edit these values you need to press Refresh so see the effect of the modified parameters.

Show lines: This will blend the detected lines into the image. Valid lines are drawn in green. Invalid lines (e.g. too short or too curved) are drawn in black - these lines are not always visible.

With the left mouse button you can mark lines to be not used for the optimisation (e.g. if the automatic detection was not perfect and selected also bad lines). Lines which are ignored by the the optimiser are drawn in red. If you want these lines to be used by the optimiser again click with the right mouse button on these lines.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Calibrate_lens_gui&oldid=13517[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Calibrate_lens_gui&oldid=13517"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Camera_response_curve.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Camera_response_curve.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Camera_response_curve.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Camera_response_curve.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,56 +1,51 @@ - + Camera response curve - PanoTools.org Wiki - - + + + - - - - - + + +
-

Camera response curve

-
-
From PanoTools.org Wiki
+

Camera response curve

+
From PanoTools.org Wiki
- -

The camera response curve is +

The camera response curve is a curve showing the relation between amount of incoming light and image pixel values of a digital camera.

This curve is sometimes also called Opto-Electrical Transfer Function.

Although optical sensors work quite linear (a certain amount of photons coming in causes a proportional amount of electrons in the sensor cell), the resulting pixel values are not proportional to the amount of incoming light. This might have several reasons:

-
    -
  • The analog-digital converter might not work linearly. -
    • -
  • A Gamma correction is applied. -
    • -
  • A correction is applied to make the image more visually appealing -
    • -
  • A white balance is applied to compensate for different light temperature -
    • -
+
  • The analog-digital converter might not work linearly.
    • +
  • A Gamma correction is applied.
    • +
  • A correction is applied to make the image more visually appealing
    • +
  • A white balance is applied to compensate for different light temperature

While the first reason applies to all kinds of images, the other ones apply to non-RAW (JPEG, TIFF) images only. RAW images should contain linear sensor data.

The camera response curve is an issue mainly in HDR generation where it is necessary to have linear (proportional to light) input data. Non-linear data (= a badly estimated camera response curve) will result in banding in contrast gradients (f.e. around bright lights).

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Camera_response_curve&oldid=9582[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Camera_response_curve&oldid=9582"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/CCD.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/CCD.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/CCD.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/CCD.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,41 +1,42 @@ - + CCD - PanoTools.org Wiki - - + + + - - - - - + + +
-

CCD

-
-
From PanoTools.org Wiki
+

CCD

+
From PanoTools.org Wiki
- -


+


CCD is an abbreviation of Charged Coupled Device, a type of sensor found in most digital cameras, see the w:Ccd[*] wikipedia article for in-depth detail.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=CCD&oldid=9541[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=CCD&oldid=9541"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/cce47ef57ba2ee096573a3835e2e2f8a10be5480.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/cce47ef57ba2ee096573a3835e2e2f8a10be5480.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/ccf48cf728225d3dcecf1f74e74dafa3.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/ccf48cf728225d3dcecf1f74e74dafa3.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Celeste_standalone.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Celeste_standalone.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Celeste_standalone.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Celeste_standalone.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,44 +1,44 @@ - + Celeste standalone - PanoTools.org Wiki - - + + + - - - - - + + +
-

Celeste standalone

-
-
From PanoTools.org Wiki
+

Celeste standalone

+
From PanoTools.org Wiki
- -

Control point generators are not very good at distinguishing between static objects, such as buildings, and objects that change quickly such as waves, foliage, clouds and people. This causes alignment problems, especially with clouds that can easily move several pixels between shots. -

Celeste is a new tool in hugin that has been trained using w:Support vector machine[*] techniques to identify clouds in photos and remove control points from these areas. This functionality is available in the Hugin Images tab[*] and described in the Using Celeste with hugin tutorial. +

Control point generators are not very good at distinguishing between static objects, such as buildings, and objects that change quickly such as waves, foliage, clouds and people. This causes alignment problems, especially with clouds that can easily move several pixels between shots. +

Celeste is a new tool in hugin that has been trained using w:Support vector machine[*] techniques to identify clouds in photos and remove control points from these areas. This functionality is available in the Hugin Images tab[*] and described in the Using Celeste with hugin tutorial.

celeste_standalone is a command-line tool with all the same functionality as Celeste in hugin. It has many options, but at its simplest can be used to just 'clean' an existing project file: 

 celeste_standalone -i project.pto -o project.pto
- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Celeste_standalone&oldid=11382[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Celeste_standalone&oldid=11382"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/cfa11ce088a7a72cde469f7893eec012452e3c1d.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/cfa11ce088a7a72cde469f7893eec012452e3c1d.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Checkpto.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Checkpto.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Checkpto.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Checkpto.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,36 +1,32 @@ - + Checkpto - PanoTools.org Wiki - - + + + - - - - - + + +
-

Checkpto

-
-
From PanoTools.org Wiki
+

Checkpto

+
From PanoTools.org Wiki
- -

checkpto is a command-line tool and Helper program for Hugin's Makefile assistant that examines a Hugin's project file and reports back the number of image chains or parts present. It does this by examining how images are connected with control points. If images are not connected together they can not be positioned correctly by optimizing their position. +

checkpto is a command-line tool and Helper program for Hugin's Makefile assistant that examines a Hugin's project file and reports back the number of image chains or parts present. It does this by examining how images are connected with control points. If images are not connected together they can not be positioned correctly by optimizing their position.


usage

@@ -44,8 +40,12 @@ >1 If more than one image chain present. Return value is number of image chains. - - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Checkpto&oldid=13504[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Checkpto&oldid=13504"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Chromatic_aberration.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,38 +1,34 @@ - + Chromatic aberration - PanoTools.org Wiki - - + + + - - - - - + + +
-

Chromatic aberration

-
-
From PanoTools.org Wiki
+

Chromatic aberration

+
From PanoTools.org Wiki
- -


+


-

Contents

+

Contents

  • 1 Intro
  • 2 What it is @@ -72,62 +68,39 @@

    LCA

    Different refractive index means different Focal Length for a single lens. This would lead to different focal planes for different colors. You would have to focus differently for red, blue or green. This effect is called longitudinal chromatic aberration (LCA). If you have a fringe near the image center that changes color if you defocus slightly, this is most likely longitudinal chromatic aberration. This type:

    -
      -
    • can not be corrected by software -
      • -
    • gets less if stopped down -
      • -
    • is dependent from focus distance. -
      • -
    +
    • can not be corrected by software
      • +
    • gets less if stopped down
      • +
    • is dependent from focus distance.


    TCA

    When a lens is corrected for longitudinal chromatic aberration, different colors focus more or less in the same point on the optical axis, but they might focus in different distances off axis resulting in images of different size for different colors. This type is called lateral or transverse chromatic aberration (TCA). If you have complementary colored fringes progressively more from the center to the corners, this is most likely transverse chromatic aberration (although there are some exceptions as the example below illustrates). This type:

    -
      -
    • can be corrected by software -
      • -
    • does not change by stopping down (stopping down would perhaps make the fringes sharper and lead to the impression TCA is reduced) -
      • -
    • is dependent from focus distance. -
      • -
    +
    • can be corrected by software
      • +
    • does not change by stopping down (stopping down would perhaps make the fringes sharper and lead to the impression TCA is reduced)
      • +
    • is dependent from focus distance.

    What it is not

    Digital photography introduced some new types of color fringes, that are not lens chromatic aberration. They are frequently confused with TCA and unfortunately they occur often mixed with TCA. These effects might be visible as purple or blue fringes and are visible around overexposed areas in most cases.

    They might have different causes:

    -
      -
    • By sensor overflow visible as blooming. This blooming often has a purple color because of the bayer pattern of the sensor: If a sensor cell overflows to the neighboring cells all cells are affected the same. There are 50% green but only 25% red and 25% blue sensor cells. Hence blue and red are weighted more resulting in purple fringes around overexposed areas. Since CMOS sensors are not prone to overflow this affects only CCD sensors. -
      • -
    • By chromatic aberration and other errors in the micro lenses that are in front of the sensor. -
      • -
    • By reflections between the sensor and the protective glass (that might be coated and hence reflects colored). -
      • -
    • By interpolation errors or anti moire filters. -
      • -
    • By partial color saturation: Blue sky f.e. might be clipped to pure white because all color channels are saturated. If there is a blurred dark object in the image the sensors in the blur region receive only part of the light and hence don't saturate. The blur region appears blue. This is the only effect that applies to analog film as well. -
      • -
    +
    • By sensor overflow visible as blooming. This blooming often has a purple color because of the bayer pattern of the sensor: If a sensor cell overflows to the neighboring cells all cells are affected the same. There are 50% green but only 25% red and 25% blue sensor cells. Hence blue and red are weighted more resulting in purple fringes around overexposed areas. Since CMOS sensors are not prone to overflow this affects only CCD sensors.
      • +
    • By chromatic aberration and other errors in the micro lenses that are in front of the sensor.
      • +
    • By reflections between the sensor and the protective glass (that might be coated and hence reflects colored).
      • +
    • By interpolation errors or anti moire filters.
      • +
    • By partial color saturation: Blue sky f.e. might be clipped to pure white because all color channels are saturated. If there is a blurred dark object in the image the sensors in the blur region receive only part of the light and hence don't saturate. The blur region appears blue. This is the only effect that applies to analog film as well.

    How to avoid

    LCA can be avoided if shot stopped down. Purple or blue fringes might benefit from stopping down, too. They can be avoided in most cases if you expose for the highlights (i.e. don't overexpose). TCA can only not be avoided if you can use a better lens. Fixed Focal Length lenses are less prone to TCA than cheap zoom lenses. Converters are often very bad. You can avoid TCA while stitching if you don't use the corners where it is most prominent.

    How to distinguish

    If you want to correct color fringes by software you need to know which type they are. If all of the following points are met your image most likely contains true TCA:

    -
      -
    • Corners should show most color fringes whereas the center should show none. -
      • -
    • Color fringes should be not only at the edges of overexposed areas but at lower contrast edges, too. -
      • -
    • Color fringes should be of complementary color (red-cyan, blue-yellow or purple-green) on opposite sides of a dark or bright area. -
      • -
    • Color fringes should be in all corners the same direction pointing out from the center. -
      • -
    +
    • Corners should show most color fringes whereas the center should show none.
      • +
    • Color fringes should be not only at the edges of overexposed areas but at lower contrast edges, too.
      • +
    • Color fringes should be of complementary color (red-cyan, blue-yellow or purple-green) on opposite sides of a dark or bright area.
      • +
    • Color fringes should be in all corners the same direction pointing out from the center.

    Difficulties to view

    -
    [*]
    Artificial Red-Cyan TCA
    -
    [*]
    Artificial Blue-Yellow TCA
    +
    [*]
    Artificial Red-Cyan TCA
    +
    [*]
    Artificial Blue-Yellow TCA

    If you want to test your lens for CA the subject you shoot is critical. The visibility of TCA highly depends on the colors forming contrast edges. Here two artificial examples to illustrate this. In both images TCA was introduced by sizing one channel to 101%. In the upper image this was the red channel causing red-cyan fringes in the lower image sizing the blue channel to 101% caused blue-yellow fringes.

    Please have a close look at the half with the azure background in both images. The cyan fringes in the upper image are not visible at all with dark green foreground, the red fringes turn into an almost invisible dark brown.

    In the lower image both blue and yellow fringes are invisible on the more saturated yellow background. Where it turns to a lighter shade of yellow the blue fringes appear purple. The yellow fringes are green on the azure background. @@ -136,97 +109,79 @@

    Example with true TCA

    This image is reduced to 30% but still shows heavy TCA as a result of the usage of a cheap wide angle converter:

    -
    [*]
    Image courtesy of © Thomas Niemann
    -

    Here a crop of the upper left corner, enlarged to 200%. To verify this is true TCA you can simply cycle through the color channels (f.e. by pressing Ctrl+1, Ctrl+2 and Ctrl+3 in Photoshop[*]). If the whole image content in areas with more or less neutral colors seems to move this is true TCA: -

    CA tCA01.jpg[*] CA tCA01.gif[*] +

    [*]
    Image courtesy of © Thomas Niemann
    +

    Here a crop of the upper left corner, enlarged to 200%. To verify this is true TCA you can simply cycle through the color channels (f.e. by pressing Ctrl+1, Ctrl+2 and Ctrl+3 in Photoshop[*]). If the whole image content in areas with more or less neutral colors seems to move this is true TCA: +

    CA tCA01.jpg[*] CA tCA01.gif[*]

    switch on GIF animation to see the different channels in the right image

    The whole image content seems to move if channels change. This is clearly due to TCA. As you can see, the channels have different sharpness. This is most likely due to longitudinal CA.

    For comparison a similar sized and enlarged crop from the center: -

    CA tCA03.jpg[*] +

    CA tCA03.jpg[*]

    There are no color fringes in the center. A good indicator of true TCA. -

    You can try to correct TCA by hand in one corner in Photoshop[*] to see whether it is worth the effort to correct it in total: +

    You can try to correct TCA by hand in one corner in Photoshop[*] to see whether it is worth the effort to correct it in total:

    -
      -
    • crop to a corner with visible TCA -
      • -
    • enlarge by 200% to 400% -
      • -
    • flatten image if needed. -
      • -
    • try to nudge the red and the blue channel in order to minimze fringes. To do this, in the channels palette: -
        -
      • Click the red channel to make it the active one. -
        • -
      • Click the small eye symbol of the RGB channel in order to make all colors visible -
        • -
      • Choose the move tool from the tools palette -
        • -
      • Nudge the red channel with the arrow keys until the fringes are blue-yellow -
        • -
      • repeat the same for the blue channel and nudge to optimum -
        • -
      • repeat for the red channel if there are still red-green fringes -
        • -
      -
      • -
    +
    • crop to a corner with visible TCA
      • +
    • enlarge by 200% to 400%
      • +
    • flatten image if needed.
      • +
    • try to nudge the red and the blue channel in order to minimze fringes. To do this, in the channels palette: +
      • Click the red channel to make it the active one.
        • +
      • Click the small eye symbol of the RGB channel in order to make all colors visible
        • +
      • Choose the move tool from the tools palette
        • +
      • Nudge the red channel with the arrow keys until the fringes are blue-yellow
        • +
      • repeat the same for the blue channel and nudge to optimum
        • +
      • repeat for the red channel if there are still red-green fringes

    Here is the above example after using this technique. -

    CA tCA02.jpg[*] +

    CA tCA02.jpg[*]

    The remaining light blue fringes can not be corrected. They are most likely not lens TCA but an effect as described under What it is not.

    Example with no TCA but purple fringes

    This image is reduced to 40%. It shows purple fringes but no chromatic aberration: -

    CA fringes00.jpg[*] +

    CA fringes00.jpg[*]

    Here the enlargement of the upper left corner and the moving channels: -

    CA fringes01.jpg[*] CA fringes01.gif[*] +

    CA fringes01.jpg[*] CA fringes01.gif[*]

    (switch on GIF animation to see the different channels in the right image)

    As you can notice, the details on the grey tree don't move at all. It's only the left (outside) side of the overexposed sky areas that changes.


    Strange Example

    This crop (lower left corner) is from a frequently used combo: Nikon D70 with Nikkor 10.5mm full frame fisheye (image (c) Andrey Ilyin). At the first glance this looks like normal red-cyan TCA. But if you try to correct this one, it will drive you nuts. Have a close look on the moving channels: -

    CA strange01.jpg[*] CA strange01.gif[*] +

    CA strange01.jpg[*] CA strange01.gif[*]

    (switch on GIF animation to see the different channels in the right image)

    As you can see part of the image details move but part doesn't (the blade of grass in the center). If you minimize the fringes there will be new fringes or even double details with different color: -

    CA strange02.jpg[*] +

    CA strange02.jpg[*]

    This weird kind of colored fringes is definitely not lens CA. I can only think of some effects of bayer interpolation, but this is wild guess.

    How to correct

    In many cases it would be enough to adjust the size of the color channels to correct for TCA. However, correction might not always be satisfactory even if it is of the true tCA type. This might have different causes:

    -
      -
    • There might be a rest of LCA in the image. In this cases one or two color channels can be blurred. This is partly the case in the Example with true TCA. You can try to selectively sharpen[*] the questionable channels. Since unsharp masking works best on gaussian blur but CA blur is more of the radial blur type this probably won't work very good. -
      • -
    • Images where JPEG compressed (too much). If you shift the color channels of previously jpeg compressed images you emphasize the jpeg artifacts. It is a better idea to work on TIFF images converted directly from RAW or scanned directly. -
      • -
    • Adjustment is too coarse. Depending on the resolution of the image sub-pixel alignment might be necessary. -
      • -
    +
    • There might be a rest of LCA in the image. In this cases one or two color channels can be blurred. This is partly the case in the Example with true TCA. You can try to selectively sharpen[*] the questionable channels. Since unsharp masking works best on gaussian blur but CA blur is more of the radial blur type this probably won't work very good.
      • +
    • Images where JPEG compressed (too much). If you shift the color channels of previously jpeg compressed images you emphasize the jpeg artifacts. It is a better idea to work on TIFF images converted directly from RAW or scanned directly.
      • +
    • Adjustment is too coarse. Depending on the resolution of the image sub-pixel alignment might be necessary.

    Easy

    -

    The most convenient way to correct TCA is to use a tool like the Adobe Raw Converter, Picture Window Pro or PTLens[*] offer. You zoom into a corner with good details and use a pair of sliders to adjust the image size for the red channel (red-cyan fringes) and the blue channel (blue-yellow fringes - the purple-green type is a mixture of red-cyan and blue-yellow type). Both ways allow for sub-pixel adjustment. +

    The most convenient way to correct TCA is to use a tool like the Adobe Raw Converter, Picture Window Pro or PTLens[*] offer. You zoom into a corner with good details and use a pair of sliders to adjust the image size for the red channel (red-cyan fringes) and the blue channel (blue-yellow fringes - the purple-green type is a mixture of red-cyan and blue-yellow type). Both ways allow for sub-pixel adjustment.

    This technique (including sub pixel adjustment) can be peformed by hand with any image editor that can make size adjustments to single channels. If the step size is too large, the image can be upsampled prior to correction.

    However, if you use one of those easy approaches look closely at different areas of the image - especially different distances from the image center. It could well be that correction in one area causes fringes in another one. If this is the case TCA in this image doesn't follow an easy linear scheme and hence can't be corrected this way - see next paragraph.

    Precise

    -

    Panorama tools Radial Shift[*] filter allows for separate correction of red, green and blue channel using a third degree polinomial. This kind of curve should be complex enough to correct for any kind of non-linear TCA. +

    Panorama tools Radial Shift[*] filter allows for separate correction of red, green and blue channel using a third degree polinomial. This kind of curve should be complex enough to correct for any kind of non-linear TCA.

    Unfortunately it was very difficult to estimate the correct values until 2004 when Jim Watters and Erik Krause found a way to determine suitable correction coefficients using different calculation approaches. -

    Based on this work Eric Gerds developed a Photoshop CS Javascript called PTShift[*] that allows for manual correction in different areas and passes the found deviations as virtual control points to PTOptimizer in order to calculate correction coefficients. -

    Alternatively the correction coefficients can be calculated entirely with hugin and PTOptimizer, for more details see this hugin tutorial on correcting TCA. For more precise results, octave (script on the hugin page: [1]) can be used to calculate the coefficients rather than PTOptimizer. An alternative to the Radial Shift[*] filter is fulla which can also correct TCA, barrel distortion and vignetting at the same time. -

    Erik Krause[*] 17:18, 2 May 2005 (EDT) +

    Based on this work Eric Gerds developed a Photoshop CS Javascript called PTShift[*] that allows for manual correction in different areas and passes the found deviations as virtual control points to PTOptimizer in order to calculate correction coefficients. +

    Alternatively the correction coefficients can be calculated entirely with hugin and PTOptimizer, for more details see this hugin tutorial on correcting TCA. For more precise results, octave (script on the hugin page: [1]) can be used to calculate the coefficients rather than PTOptimizer. An alternative to the Radial Shift[*] filter is fulla which can also correct TCA, barrel distortion and vignetting at the same time. +

    Erik Krause[*] 17:18, 2 May 2005 (EDT)

    External links

    - - + + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Chromatic_aberration&oldid=13736[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Chromatic_aberration&oldid=13736"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Color_correct_tiff.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Color_correct_tiff.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Color_correct_tiff.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Color_correct_tiff.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,36 +1,32 @@ - + Color correct tiff - PanoTools.org Wiki - - + + + - - - - - + + +
-

Color correct tiff

-
-
From PanoTools.org Wiki
+

Color correct tiff

+
From PanoTools.org Wiki
- -

color_correct_tiff is an experimental utility written by Phillipe Thomin and +

color_correct_tiff is an experimental utility written by Phillipe Thomin and included with hugin.

Note: this tool isn't built by default and needs to be compiled separately.

It takes two overlapping pictures and produces a third one that is version @@ -38,8 +34,12 @@ Similar functionality is implemented in PTStitcher, PTmender and PTblender.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Color_correct_tiff&oldid=10170[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Color_correct_tiff&oldid=10170"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Colour_profile.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Colour_profile.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Colour_profile.html 2017-04-22 17:02:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Colour_profile.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,41 +1,42 @@ - + Colour profile - PanoTools.org Wiki - - + + + - - - - - + + +
-

Colour profile

-
-
From PanoTools.org Wiki
+

Colour profile

+
From PanoTools.org Wiki
- -

Color profiles describe the color attributes of a particular device or viewing equipment by defining a mapping between the source or target color space to a common profile connection space. +

Color profiles describe the color attributes of a particular device or viewing equipment by defining a mapping between the source or target color space to a common profile connection space.

See ICC Profile[*] and Color management[*] on Wikipedia for further information.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Colour_profile&oldid=9394[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Colour_profile&oldid=9394"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Contrast.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Contrast.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Contrast.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Contrast.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,47 +1,45 @@ - + Contrast - PanoTools.org Wiki - - + + + - - - - - + + +
-

Contrast

-
-
From PanoTools.org Wiki
+

Contrast

+
From PanoTools.org Wiki
- -

Contrast is +

Contrast is the difference in visual properties that makes an object distinguishable from other objects and the background.

External links

-
    -
  • wikipedia page on contrast[*] -
    • -
- - +
  • wikipedia page on contrast[*]
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Contrast&oldid=11954[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Contrast&oldid=11954"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,39 +1,35 @@ - + Control Point Detector Parameters - PanoTools.org Wiki - - + + + - - - - - + + +
-

Control Point Detector Parameters

-
-
From PanoTools.org Wiki
+

Control Point Detector Parameters

+
From PanoTools.org Wiki
- -

This site will give you an overview about the different control point detectors and their main options to use with hugin. This settings can be changed in preferences dialog. +

This site will give you an overview about the different control point detectors and their main options to use with hugin. This settings can be changed in preferences dialog. A detailed description of the individual settings can be found here

-

Contents

+

Contents

Cpfind

-
    -
  • For outdoor projects, single and multi-row panorama -
    • -
+
  • For outdoor projects, single and multi-row panorama
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program cpfind +cpfind
Arguments +Arguments --multirow --celeste -o %o %s -
-
    -
  • For indoor projects, single and multi-row panorama -
    • -
+--multirow --celeste -o %o %s + +
  • For indoor projects, single and multi-row panorama
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program cpfind +cpfind
Arguments +Arguments --multirow -o %o %s -
-
    -
  • For prealigned panoramas (e.g. when using a template or script) -
    • -
+--multirow -o %o %s + +
  • For prealigned panoramas (e.g. when using a template or script)
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program cpfind +cpfind
Arguments +Arguments --prealigned -o %o %s -
-
    -
  • For very big outdoor projects, single and multi-row panorama, with caching to disc -
    • -
+--prealigned -o %o %s + +
  • For very big outdoor projects, single and multi-row panorama, with caching to disc
- - + - - - - - - - - -
Detector Type +
Detector Type Multi-row panoramas +Multi-row panoramas
Detector +Detector One-step detector +One-step detector
Program +Program cpfind +cpfind
Arguments +Arguments --cache --celeste -o %o %s +--cache --celeste -o %o %s
Cleanup arguments +Cleanup arguments --clean %s -
+--clean %s +

Hints:

-
    -
  • MacOSX: Both in the bundle version as in the cmake version you need to add cpfind without browsing for it and without adding a pathname, just cpfind. -
    • -
+
  • MacOSX: Both in the bundle version as in the cmake version you need to add cpfind without browsing for it and without adding a pathname, just cpfind.

Panomatic

-
    -
  • For general projects -
    • -
+
  • For general projects
- - + - - - - - - -
Detector Type +
Detector Type All images at once
or Multi-row panorama +		All images at once
or Multi-row panorama
Detector +Detector One-step detector +One-step detector
Program +Program panomatic +panomatic
Arguments +Arguments -o %o %i -
-
    -
  • For single-row projects -
    • -
+-o %o %i + +
  • For single-row projects
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program panomatic +panomatic
Arguments +Arguments --linearmatch -o %o %i -
+--linearmatch -o %o %i +

Autopano-sift-C

-
    -
  • For general projects -
    • -
+
  • For general projects
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program autopano-sift-c +autopano-sift-c
Arguments +Arguments --maxmatches %p --projection %f,%v %o %i
in version in Mercurial the parameter --projection is broken, use instead --maxmatches %p %o %i or --maxmatches %p %o %s (the latter works also for bigger projects) -
-
    -
  • For multi-row projects -
    • -
+--maxmatches %p --projection %f,%v %o %i
in version in Mercurial the parameter --projection is broken, use instead --maxmatches %p %o %i or --maxmatches %p %o %s (the latter works also for bigger projects) + +
  • For multi-row projects
- - + - - - - - - - - - - -
Detector Type +
Detector Type Multi-row panorama +Multi-row panorama
Detector +Detector Two-step detector +Two-step detector
Feature descriptor +Feature descriptor generatekeys +generatekeys
Arguments +Arguments %i %k 800 +%i %k 800
Feature matcher +Feature matcher autopano +autopano
Arguments +Arguments --maxmatches %p %o %k -
+--maxmatches %p %o %k +

Autopano by Alexandre Jenny

- - + - - - - - - -
Detector Type +
Detector Type Autopano (by A. Jenny) +Autopano (by A. Jenny)
Detector +Detector One-step detector +One-step detector
Program +Program autopano +autopano
Arguments +Arguments /allinone /path:%d /keys:%p /project:oto /name:%o /size:1024 /f %i -
+/allinone /path:%d /keys:%p /project:oto /name:%o /size:1024 /f %i +

Hints:

-
    -
  • Autopano runs only on Windows and Linux. There is no MacOS version. -
    • -
  • Don't mix autopano by A. Jenny with autopano from autopano-sift-C package. -
    • -
+
  • Autopano runs only on Windows and Linux. There is no MacOS version.
    • +
  • Don't mix autopano by A. Jenny with autopano from autopano-sift-C package.

Align_image_stack

-
    -
  • As standalone detector for HDR images -
    • -
+
  • As standalone detector for HDR images
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program align_image_stack +align_image_stack
Arguments +Arguments -f %v -v -p %o %i
or -f %v -v -e -p %o %i for full-frame fisheye images -
+-f %v -v -p %o %i
or -f %v -v -e -p %o %i for full-frame fisheye images +

Align_image_stack can also be used in conjugation with the above mentioned detector as special case for stacks. For this use case set Detector Type to Panorama with stacks or Multi-row panorama with stacks and set the options for align_image_stack on the tab Detector for stacks

Hints:

-
    -
  • MacOSX: Both in the bundle version as in the cmake version you need to add align_image_stack without browsing for it and without adding a pathname, just align-image_stack. -
    • -
+
  • MacOSX: Both in the bundle version as in the cmake version you need to add align_image_stack without browsing for it and without adding a pathname, just align-image_stack.


Linefind

-
    -
  • Vertical features autodetector -
    • -
+
  • Vertical features autodetector
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program linefind +linefind
Arguments +Arguments -o %o %s -
+-o %o %s +

Geocpset

-
    -
  • Add geometric control points to images without features. This add control points based on the current position of the images. -
    • -
  • Usecase: projects containing images without features (e. g. images with only sky) -
    • -
  • Attention: You need to assign the position to the images before running this control point detector. Use the drag feature in the preview window, enter numeric values for yaw, pitch and roll in the Photos tab or use pto_var to assign the position. Running on a not aligned images will create wrong control points. -
    • -
+
  • Add geometric control points to images without features. This add control points based on the current position of the images.
    • +
  • Usecase: projects containing images without features (e. g. images with only sky)
    • +
  • Attention: You need to assign the position to the images before running this control point detector. Use the drag feature in the preview window, enter numeric values for yaw, pitch and roll in the Photos tab or use pto_var to assign the position. Running on a not aligned images will create wrong control points.
- - + - - - - - - -
Detector Type +
Detector Type All images at once +All images at once
Detector +Detector One-step detector +One-step detector
Program +Program geocpset +geocpset
Arguments +Arguments -o %o %s -
- +-o %o %s + + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Control_Point_Detector_Parameters&oldid=15451[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Control_Point_Detector_Parameters&oldid=15451"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_point_generators.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_point_generators.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_point_generators.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_point_generators.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,39 +1,35 @@ - + Control point generators - PanoTools.org Wiki - - + + + - - - - - + + +
-

Control point generators

-
-
From PanoTools.org Wiki
+

Control point generators

+
From PanoTools.org Wiki
- -

This stub is to hold the list of available control point generators in general, and how they can be configured in Hugin in particular (starting with version 2009.2) -

This list should supersede the one available on the GUI_front-ends[*] page. +

This stub is to hold the list of available control point generators in general, and how they can be configured in Hugin in particular (starting with version 2009.2) +

This list should supersede the one available on the GUI_front-ends[*] page.

-

Contents

+

Contents

- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Control_point_generators&oldid=15562[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Control_point_generators&oldid=15562"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_points.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_points.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_points.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Control_points.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Control points - PanoTools.org Wiki - - + + + - - - - - + + +
-

Control points

-
-
From PanoTools.org Wiki
+

Control points

+
From PanoTools.org Wiki
- -


+


Most techniques for aligning photographs involve Control points at some stage.

The principle is that by identifying the same physical features (a door, a tree, whatever) in more than one photo, it is possible to establish facts about the relative camera orientations @@ -42,25 +38,30 @@ Field of View and other aspects of the lens correction model are optimised at the same time.

Control points can be picked manually by clicking with a mouse, and there are a number of -GUI front-ends[*] to help you do this. There are other tools such as autopano-sift and +GUI front-ends[*] to help you do this. There are other tools such as autopano-sift and autopano that can generate control points automatically with some limitations.

In addition to these simple control points, PTOptimizer allows users to define horizontal control points, vertical control points and straight line control points. -These have various uses, but mainly they are good for Leveling a Finished Panorama[*] and +These have various uses, but mainly they are good for Leveling a Finished Panorama[*] and perspective correction.

Historical note

-

Before PTPicker[*], the GUI front-ends[*] and autopano/autopano-sift, control points +

Before PTPicker[*], the GUI front-ends[*] and autopano/autopano-sift, control points were set by cutting and pasting the flags below into source photos. You were allowed up to twenty pairs of points and twenty images - Panorama Tools would read the bar codes embedded in the flags and generate a script for PTOptimizer. -

This functionality is still available in the adjust menu of the Panorama Gimp plug-in[*], +

This functionality is still available in the adjust menu of the Panorama Gimp plug-in[*], however the technique is extremely laborious and definitely not recommended. -

Barcode flags used by the original panorama tools control point picking technique[*] +

Barcode flags used by the original panorama tools control point picking technique[*]

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Control_points&oldid=13441[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Control_points&oldid=13441"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpclean.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpclean.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpclean.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpclean.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,39 +1,35 @@ - + Cpclean - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cpclean

-
-
From PanoTools.org Wiki
+

Cpclean

+
From PanoTools.org Wiki
- -

cpclean is a command-line tool that implements the 'bad' control points pruning available within the Hugin GUI. It is similar conceptually to apclean[*], but with some extra functionality. Both tools use a statistical filter to remove points with an error above a statistical threshold. +

cpclean is a command-line tool that implements the 'bad' control points pruning available within the Hugin GUI. It is similar conceptually to apclean[*], but with some extra functionality. Both tools use a statistical filter to remove points with an error above a statistical threshold.

The idea is to remove all non-credible control points. To do this it uses a two step process to remove bad control points.

-

Contents

+

Contents

  • 1 Step 1
  • 2 Step 2
    • @@ -79,11 +75,15 @@ 

     cpclean --whole-pano-checking --check-line-cp --output=output.pto project.pto
    -

    cpclean is based on ptoclean[*]. +

    cpclean is based on ptoclean[*].

    + +
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cpclean&oldid=15800[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cpclean&oldid=15800"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,36 +1,32 @@ - + Cpfind - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cpfind

-
-
From PanoTools.org Wiki
+

Cpfind

+
From PanoTools.org Wiki
- -

Contents

+

Contents

  • 1 General and description
  • 2 Usage @@ -64,15 +60,11 @@

    Internal the control point detector algorithm is divided into 2 parts:

    -
      -
    • The first step is the feature description: In this step the images of the project file are loaded and so called keypoints are searched. They describe distinctive features in the image. Cpfind is using a gradient based descriptor for the feature description of the keypoints. -
      • -
    • In a second step, the feature matching, all keypoints of two images are matched against each other to find features which are on both images. If this matching was successful two keypoints in the two images become one control point. -
      • -
    +
    • The first step is the feature description: In this step the images of the project file are loaded and so called keypoints are searched. They describe distinctive features in the image. Cpfind is using a gradient based descriptor for the feature description of the keypoints.
      • +
    • In a second step, the feature matching, all keypoints of two images are matched against each other to find features which are on both images. If this matching was successful two keypoints in the two images become one control point.

    Usage

    Rectilinear and fisheye images

    -

    Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefore remapped into a conformal space (cpfind is using the stereographic projection[*]) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens. +

    Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefore remapped into a conformal space (cpfind is using the stereographic projection[*]) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens.

    Using celeste

    Outdoor panorama often contains clouds. Clouds are bad areas for setting control points because they are moving object. Cpfind can use the same algorithm as celeste_standalone to masked out areas which contains clouds. (This is only done internal for the keypoint finding step and does not change the alpha channel of your image. If you want to generate a mask image use celeste_standalone). To run cpfind with celeste use @@ -102,7 +94,7 @@

    The algorithm is the same as described in multi-row panorama. By integrating this algorithm into cpfind it is faster by using several cores of modern CPUs and don't caching the keypoints to disc (which is time consuming). If you want to use this multi-row matching inside hugin set the control point detector type to All images at once, this is so that Hugin passes all images to cpfind and lets cpfind apply the multirow matching smarts itself.

    -

    Matching overlapping images (prealigned panorama)

    +

    Matching overlapping images (prealigned panorama)

    This setting is for finding control points in panorama, in which the rough positions of the images are already known (e.g. when using a template or when generating the pto file by a script) 

       cpfind --prealigned -o output.pto input.pto
@@ -145,26 +137,11 @@
 
    --ransacdist <int>            Ransac: homography estimation distance threshold (pixels) (default: 25)
 
    --ransacmode <string>        Select the mode used in the ransac step. Possible values: auto, hom, rpy, rpyv, rpyb (default: auto)
 
    
-
      
-
    •  hom: Assume a homography. Only applicable for non-wide angle views. Uses the original panomatic code. It is also more flexible than required and can generate false matches, particularly if most of the matches are located on a single line.
-
      • 
-
    
-
      
-
    •  rpy: Align images using roll, pitch and yaw. This requires a good estimate for the horizontal field of view (and distortion, for  heavily distorted images). It is the preferred mode if a calibrated lens is used, or the HFOV could be read successfully from the EXIF data.
-
      • 
-
    
-
      
-
    •  rpyv: Align pair by optimizing roll, pitch, yaw and field of view. Should work without prior knowledge of the field of view, but might fail more often, due to error function used in the panotools optimizer, it tends to shrink the fov to 0.
-
      • 
-
    
-
      
-
    •  rpyvb: Align pair by optimizing roll, pitch, yaw, field of view and the "b" distortion parameter.  Probably very fragile, just implemented for testing.
-
      • 
-
    
-
      
-
    •  auto: Use homography for images with hfov < 65 degrees and rpy otherwise.
-
      • 
-
    
+
    • hom: Assume a homography. Only applicable for non-wide angle views. Uses the original panomatic code. It is also more flexible than required and can generate false matches, particularly if most of the matches are located on a single line.
    
+
    • rpy: Align images using roll, pitch and yaw. This requires a good estimate for the horizontal field of view (and distortion, for  heavily distorted images). It is the preferred mode if a calibrated lens is used, or the HFOV could be read successfully from the EXIF data.
    
+
    • rpyv: Align pair by optimizing roll, pitch, yaw and field of view. Should work without prior knowledge of the field of view, but might fail more often, due to error function used in the panotools optimizer, it tends to shrink the fov to 0.
    
+
    • rpyvb: Align pair by optimizing roll, pitch, yaw, field of view and the "b" distortion parameter.  Probably very fragile, just implemented for testing.
    
+
    • auto: Use homography for images with hfov < 65 degrees and rpy otherwise.
    
 
    --minmatches <int>            Minimum matches (default: 4)
 
    --sieve2width <int>           Sieve 2: Number of buckets on width (default: 5)
 
    --sieve2height <int>          Sieve 2: Number of buckets on height (default: 5)
@@ -174,8 +151,12 @@
 This filtering step (sieve2) works similar like sieve1 step described above: The rectangular area, which is covered by control points, is divided into sieve2width * sieve2height rectangles/buckets - sieve1width horizontally by sieve1height vertically. For each bucket only sieve2size control points are saved in the project file. This step is intended to get an uniform distribution of the control points.
 
    
 
+
+
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cpfind&oldid=14282[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cpfind&oldid=14282"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Crop_factor.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Crop_factor.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Crop_factor.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Crop_factor.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Crop factor - PanoTools.org Wiki - - + + + - - - - - + + +
-

Crop factor

-
-
From PanoTools.org Wiki
+

Crop factor

+
From PanoTools.org Wiki
- -

The crop factor or focal length multiplier is +

The crop factor or focal length multiplier is the ratio between the size of the CCD sensor in your camera and the size of a typical 35mm film frame.

Usually CCDs are smaller, so the crop factor for a pocket camera can be around 6 and the crop factor for a DSLR is usually around 1.5. @@ -42,8 +38,13 @@

External link: The digital crop factor explained

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Crop_factor&oldid=10047[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Crop_factor&oldid=10047"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cropped_TIFF.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cropped_TIFF.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cropped_TIFF.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cropped_TIFF.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,37 +1,33 @@ - + Cropped TIFF - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cropped TIFF

-
-
From PanoTools.org Wiki
+

Cropped TIFF

+
From PanoTools.org Wiki
- -


-A common situation when stitching images together is that most of the output image or layer is empty. This happens particularly during perspective correction or when creating High resolution partial panoramas[*] from large numbers of photos. +


+A common situation when stitching images together is that most of the output image or layer is empty. This happens particularly during perspective correction or when creating High resolution partial panoramas[*] from large numbers of photos.

This is ok except that panorama tools will labouriously process the geometry for all these empty pixels, which then consume valuable memory and disc space.

The TIFF specification allows for an image canvas to include a smaller image at an offset within the larger area using the XPOSITION, YPOSITION, TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLHEIGHT TIFF tags, which is ideal for a typical panoramic image that is mostly empty space.

hugin, nona and PTmender can be told to create such cropped TIFF files by adding r:CROP as a TIFF option to the panorama format section of the p line in a stitching script. Two TIFF output formats are supported, TIFF_m and TIFF_multilayer (note that TIFF_multilayer is only supported by nona). @@ -39,7 +35,7 @@ 

 p f0 w1000 h500 v120 n"TIFF_m c:LZW r:CROP"
-

enblend can read these cropped TIFF files since version 2.4, so this technique is useful when working with enblend. Additionally the gimp[*] image editor can open multilayer cropped TIFF files directly, though it cannot save them. It can be convenient to edit the alpha masks in multi-layer TIFFs before passing them to enblend with the help of a script; see Multi-Layer TIFF editing with the Gimp[*]. +

enblend can read these cropped TIFF files since version 2.4, so this technique is useful when working with enblend. Additionally the gimp[*] image editor can open multilayer cropped TIFF files directly, though it cannot save them. It can be convenient to edit the alpha masks in multi-layer TIFFs before passing them to enblend with the help of a script; see Multi-Layer TIFF editing with the Gimp[*].

Preserving TIFF offset when editing with GIMP

Using cropped intermediate images is very useful - they use less diskspace and less resources are needed to generate them. Unfortunately, GIMP does not preserve the TIFF offset - and this is very unfortunate if you want to mask out some passing object in some of the remapped images, and blend them later with enblend. There's a way to preserve TIFF offset, though. First we have to figure out what the original offset of the image we will be editing is (of course, it is suggested to create a backup copy of the image anyway). To find that out, execute: @@ -60,8 +56,13 @@

Of course, if one of the offsets is 0 when dumping the data, there is no need to set it on the resulting image. Both tiffdump and tiffset are part of the libtiff package.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cropped_TIFF&oldid=11669[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cropped_TIFF&oldid=11669"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,44 +1,47 @@ - + Cubic Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cubic Projection

-
-
From PanoTools.org Wiki
-
(Redirected from Cubic[*])
- -
Cubic projection, source image courtesy Ben Kreunen[*]
+

Cubic Projection

+
From PanoTools.org Wiki
(Redirected from Cubic[*])
+ +


+

+
Cubic projection, source image courtesy Ben Kreunen[*]

Cubic is a type of projection for mapping a portion of the surface of a sphere (or the whole sphere) to flat images. The images are arranged like the faces of a cube and are each one in the Rectilinear Projection. This cube is viewed from it's center. -

Four cube faces cover front, right, back and left, one the zenith and one the nadir, each of them having 90°x90° Field of View. In each cube face all straight lines stay straight, hence it is very good for editing. See extracting and inserting rectilinear Views[*] on different possibilities how to extract cube faces from an equirectangular image and inserting them again. -

Images in the Cubic projection are commonly used as the image source by several spherical panorama viewers[*], including SPi-V[*] and Quicktime[*]. +

Four cube faces cover front, right, back and left, one the zenith and one the nadir, each of them having 90°x90° Field of View. In each cube face all straight lines stay straight, hence it is very good for editing. See extracting and inserting rectilinear Views[*] on different possibilities how to extract cube faces from an equirectangular image and inserting them again. +

Images in the Cubic projection are commonly used as the image source by several spherical panorama viewers[*], including SPi-V[*] and Quicktime[*].

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cubic_Projection&oldid=9402[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cubic_Projection&oldid=9402"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic_Projection.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cubic_Projection.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,43 +1,46 @@ - + Cubic Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cubic Projection

-
-
From PanoTools.org Wiki
+

Cubic Projection

+
From PanoTools.org Wiki
- -
Cubic projection, source image courtesy Ben Kreunen[*]
+


+

+
Cubic projection, source image courtesy Ben Kreunen[*]

Cubic is a type of projection for mapping a portion of the surface of a sphere (or the whole sphere) to flat images. The images are arranged like the faces of a cube and are each one in the Rectilinear Projection. This cube is viewed from it's center. -

Four cube faces cover front, right, back and left, one the zenith and one the nadir, each of them having 90°x90° Field of View. In each cube face all straight lines stay straight, hence it is very good for editing. See extracting and inserting rectilinear Views[*] on different possibilities how to extract cube faces from an equirectangular image and inserting them again. -

Images in the Cubic projection are commonly used as the image source by several spherical panorama viewers[*], including SPi-V[*] and Quicktime[*]. +

Four cube faces cover front, right, back and left, one the zenith and one the nadir, each of them having 90°x90° Field of View. In each cube face all straight lines stay straight, hence it is very good for editing. See extracting and inserting rectilinear Views[*] on different possibilities how to extract cube faces from an equirectangular image and inserting them again. +

Images in the Cubic projection are commonly used as the image source by several spherical panorama viewers[*], including SPi-V[*] and Quicktime[*].

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cubic_Projection&oldid=9402[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cubic_Projection&oldid=9402"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,52 +1,52 @@ - + Cylindrical Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cylindrical Projection

-
-
From PanoTools.org Wiki
-
(Redirected from Cylindrical[*])
- -
Cylindrical projection, with permission from Ben Kreunen[*]
+

Cylindrical Projection

+
From PanoTools.org Wiki
(Redirected from Cylindrical[*])
+ +


+

+
Cylindrical projection, with permission from Ben Kreunen[*]

A cylindrical projection is a type of projection for mapping a portion of the surface of a sphere to a flat image. It can be envisioned by imagining wrapping a flat piece of paper around the circumference of a sphere, such that it is tangent to the sphere at its equator. Shining a light from the center of the sphere then projects the spherical surface onto the flat paper.

In panoramic imaging, the cylindrical projection is most often used for prints of wide panoramas which occupy large range (>120 degrees) of longitude. Like the Equirectangular Projection, the cylindrical projection also preserves verticals, but it cannot represent data near the poles (nadir and zenith), which are distorted and stretched further and further to infinity. It can however be used to display more than 360 degrees horizontally: scanning cameras often record a little bit more than 360 degrees so the overlapping region is easier to be stitched if light changes or something moves in that area. Multiples of 360 degrees can e.g. display a changing subject like different seasons.

Straight lines which are not vertical in reality become curved (other than the horizon). The horizon is mapped to a straight line across the middle of the image. Of course this only applies if the axis which the camera was rotated around was strictly vertical. If not the horizon is curved.

Cylindrical projection is the native output format of a rotating (scanning) panorama camera (like panoscan, spheron and others) with rectilinear lens or from a swing lens camera (Horizon, Noblex...) -

Other forms of cylindrical projections which can represent the poles, such as the Mercator Projection[*] common in map-making, are not typically used in panoramic imaging. +

Other forms of cylindrical projections which can represent the poles, such as the Mercator Projection[*] common in map-making, are not typically used in panoramic imaging.

External links

- - - + -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cylindrical_Projection&oldid=10000[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cylindrical_Projection&oldid=10000"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_panorama.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_panorama.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_panorama.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_panorama.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,42 +1,43 @@ - + Cylindrical panorama - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cylindrical panorama

-
-
From PanoTools.org Wiki
+

Cylindrical panorama

+
From PanoTools.org Wiki
- -


-A Cylindrical panorama uses the Cylindrical Projection and is the format used by the original Quicktime[*] plugin. -

Most aspects of cylindrical panorama are the same as for partial panoramas. You find anything you need in the article about high resolution partial panoramas[*] except that for web presentation you don't need very high resolution. +


+A Cylindrical panorama uses the Cylindrical Projection and is the format used by the original Quicktime[*] plugin. +

Most aspects of cylindrical panorama are the same as for partial panoramas. You find anything you need in the article about high resolution partial panoramas[*] except that for web presentation you don't need very high resolution.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cylindrical_panorama&oldid=9415[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cylindrical_panorama&oldid=9415"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_Projection.html 2017-04-22 17:02:54.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Cylindrical_Projection.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,51 +1,51 @@ - + Cylindrical Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Cylindrical Projection

-
-
From PanoTools.org Wiki
+

Cylindrical Projection

+
From PanoTools.org Wiki
- -
Cylindrical projection, with permission from Ben Kreunen[*]
+


+

+
Cylindrical projection, with permission from Ben Kreunen[*]

A cylindrical projection is a type of projection for mapping a portion of the surface of a sphere to a flat image. It can be envisioned by imagining wrapping a flat piece of paper around the circumference of a sphere, such that it is tangent to the sphere at its equator. Shining a light from the center of the sphere then projects the spherical surface onto the flat paper.

In panoramic imaging, the cylindrical projection is most often used for prints of wide panoramas which occupy large range (>120 degrees) of longitude. Like the Equirectangular Projection, the cylindrical projection also preserves verticals, but it cannot represent data near the poles (nadir and zenith), which are distorted and stretched further and further to infinity. It can however be used to display more than 360 degrees horizontally: scanning cameras often record a little bit more than 360 degrees so the overlapping region is easier to be stitched if light changes or something moves in that area. Multiples of 360 degrees can e.g. display a changing subject like different seasons.

Straight lines which are not vertical in reality become curved (other than the horizon). The horizon is mapped to a straight line across the middle of the image. Of course this only applies if the axis which the camera was rotated around was strictly vertical. If not the horizon is curved.

Cylindrical projection is the native output format of a rotating (scanning) panorama camera (like panoscan, spheron and others) with rectilinear lens or from a swing lens camera (Horizon, Noblex...) -

Other forms of cylindrical projections which can represent the poles, such as the Mercator Projection[*] common in map-making, are not typically used in panoramic imaging. +

Other forms of cylindrical projections which can represent the poles, such as the Mercator Projection[*] common in map-making, are not typically used in panoramic imaging.

External links

- - - + -
- Retrieved from "http://wiki.panotools.org/index.php?title=Cylindrical_Projection&oldid=10000[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Cylindrical_Projection&oldid=10000"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/d1e5d518892671cb94ae0907a94eddf2f170438c.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/d1e5d518892671cb94ae0907a94eddf2f170438c.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/d4466e5ff97cd6bbdddc514f3a28fb88.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/d4466e5ff97cd6bbdddc514f3a28fb88.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/db71893e7683801204b25f076e7db8b3.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/db71893e7683801204b25f076e7db8b3.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/dd7303c9e2a572c54f834b7ed72ba86e118153de.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/dd7303c9e2a572c54f834b7ed72ba86e118153de.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,38 +1,34 @@ - + Depth of Field - PanoTools.org Wiki - - + + + - - - - - + + +
-

Depth of Field

-
-
From PanoTools.org Wiki
+

Depth of Field

+
From PanoTools.org Wiki
- -


+


-

Contents

+

Contents

  • 1 What it is
  • 2 Considerations for zoomable panoramas
    • @@ -51,7 +47,7 @@

    Considerations for zoomable panoramas

    For computer displayed panorama creation where one can zoom into the image, the limit must be the pixel distance in the viewable panorama - unless you don't allow to zoom in until 100% pixel view. -

    Since a pixel in an equirectangular panorama corresponds to a certain angle of view in reality, we can directly calculate the allowed angle of confusion in the shot image. It is 360° divided by the pixel width of the equirectangular image. +

    Since a pixel in an equirectangular panorama corresponds to a certain angle of view in reality, we can directly calculate the allowed angle of confusion in the shot image. It is 360° divided by the pixel width of the equirectangular image.

    For a standard angle of confusion of 2 arc minutes this would result in an equirect image with 10800*5400 pixel. If zoomable panoramas are smaller in pixel size, the Depth of Field is far bigger than for classical photography and standard depth of field calculators are of no big use. Read on to see how to circumvent this.

    Diffraction

    @@ -62,16 +58,10 @@

    However, there is a distance you can focus on, that extends the Depth of Field exactly from infinity to a nearer limit. This is the hyperfocal distance. It can be calculated, if the allowed circle of confusion (see above) on the sensor is known.

    Following the above considerations on Depth of Field for zoomable panoramas we can calculate a small table with

    -
      -
    • Width - image width in pixels -
      • -
    • AoC - angle of confusion in arc minutes -
      • -
    • CoC - Circle of Confusion on full format DSLR or analog film in mm (diagonal 43.3mm) -
      • -
    • CoC1.6 - Circle of Confusion on crop factor 1.6 DSLR in mm (diagonal 27mm) -
      • -
    +
    • Width - image width in pixels
      • +
    • AoC - angle of confusion in arc minutes
      • +
    • CoC - Circle of Confusion on full format DSLR or analog film in mm (diagonal 43.3mm)
      • +
    • CoC1.6 - Circle of Confusion on crop factor 1.6 DSLR in mm (diagonal 27mm)
     Width  AoC  CoC    C0C1.6
 16000   1.4  0.017  0.011
 12000   1.8  0.023  0.014
@@ -94,11 +84,16 @@
 
    
 
    Web links
    
 
    Some Investigations Regarding Depth of Field by Rik Littlefield: [1]
-
    Erik Krause[*] 16:50, 6 Jun 2005 (EDT)
+
    Erik Krause[*] 16:50, 6 Jun 2005 (EDT)
 
    
 
+
+
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Depth_of_Field&oldid=15783[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Depth_of_Field&oldid=15783"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl 2019-01-10 15:34:53.000000000 +0000 @@ -32,7 +32,8 @@ $data =~ s/]*>[[:space:]]*<\/div>//gs; $data =~ s// + + - - - - - + + +
-

Diffraction

-
-
From PanoTools.org Wiki
+

Diffraction

+
From PanoTools.org Wiki
- -


+


-

Contents

+

Contents

  • 1 What it is
  • 2 Sharpness
    • @@ -58,9 +54,62 @@

    The maximum obtainable resolution is limited by diffraction according to the Rayleigh criterion[*]. We can safely assume the equivalent of one pixel distance as the minimum resolvable distance required by the Rayleigh criterion. Since this criterion defines the angular resolution it can be directly used for zoomable panoramas neglecting sensor sizes etc. By simply dividing the panorama Field of View (FoV) by the angular resolution we get the maximum possible pixel resolution.

    For an average value we take the wavelength of light λ = 550nm = 5.5*10-4mm which is in the middle of the spectrum and a color where our eyes are most sensitive. The resulting formula is:

    -
    pixelresolution={\frac  {FoV}{asin\left({\frac  {1}{1490*D}}\right)}}
+
    
 
    
-
    D is the physical diameter of the lens' entrance pupil, which is the focal length in mm divided by the f-number. The following table shows the maximum angular resolution in pixels/degree which is obtainable by a given focal length (vertical) and f-number (horizontal) without regard to currently available sensors for an ideal lens without aberrations:
+
    D is the physical diameter of the lens' entrance pupil, which is the focal length in mm divided by the f-number. The following table shows the maximum angular resolution in pixels/degree which is obtainable by a given focal length (vertical) and f-number (horizontal) without regard to currently available sensors for an ideal lens without aberrations:
 
    
 
              2.8      4     5.6       8      11      16      22    32    44
   50      464    325     232     163     118      81      59    41    30
@@ -72,14 +121,10 @@
 
    
 
    Some usage examples
 
    
-
      
-
    • You want to shoot a gigapixel panorama of 175° width with a 800mm lens at f/11. You get 175*1,891 = 330,925 pixel maximum horizontal resolution.
-
      • 
-
    • You will use an APS-C format sensor in portrait orientation for this panorama. A 800mm lens has a FoV of 1.1° in that case, which at f/11 gives 2080 pixels or app. 6 megapixels. Applying the 70% rule to compensate for bayer interpolation blur indicates that 12 megapixels per image are enough.
-
      • 
-
    
+
    • You want to shoot a gigapixel panorama of 175° width with a 800mm lens at f/11. You get 175*1,891 = 330,925 pixel maximum horizontal resolution.
      • 
+
    • You will use an APS-C format sensor in portrait orientation for this panorama. A 800mm lens has a FoV of 1.1° in that case, which at f/11 gives 2080 pixels or app. 6 megapixels. Applying the 70% rule to compensate for bayer interpolation blur indicates that 12 megapixels per image are enough.
    
 
    Wide angle
    
-
    Although the above formula is applicable to wide angle and fisheye[*] lenses as well it is harder to give correct values. Most DSLR wide angle and fisheye lenses change the entrance pupil diameter depending from the angle of incidence. This is intended and serves as a mechanism to compensate for natural vignetting.
+
    Although the above formula is applicable to wide angle and fisheye[*] lenses as well it is harder to give correct values. Most DSLR wide angle and fisheye lenses change the entrance pupil diameter depending from the angle of incidence. This is intended and serves as a mechanism to compensate for natural vignetting.
 
    However, diffraction is an issue for those lenses, too. For a comparison of two widely used fisheyes see link at the bottom.
 
    
 
    Caveats
    
@@ -87,22 +132,20 @@
 
    Other factors (lens shake, atmospheric scintillation, sensor noise, haze etc.) reduce resolution and sharpness even further, hence the above values will seldom be reached.
 
    
 
    External links
    
-
      
-
    • wikipedia on Diffraction[*]
-
      • 
-
    • wikipedia on Angular resolution[*]
-
      • 
-
    • Ken Rockwell's page on Selecting the Sharpest Aperture
-
      • 
-
    • Ken Rockwell's page with a sharpness comparison of the Zenitar 16mm and Nikkor 10.5mm fisheye lenses at different aperture.
-
      • 
-
    • A very extensive article about resolution limits on Luminous Landscape containing many valuable links.
-
      • 
-
    
-
+
    • wikipedia on Diffraction[*]
      • 
+
    • wikipedia on Angular resolution[*]
      • 
+
    • Ken Rockwell's page on Selecting the Sharpest Aperture
      • 
+
    • Ken Rockwell's page with a sharpness comparison of the Zenitar 16mm and Nikkor 10.5mm fisheye lenses at different aperture.
      • 
+
    • A very extensive article about resolution limits on Luminous Landscape containing many valuable links.
    
 
 
+
+
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Diffraction&oldid=15719[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Diffraction&oldid=15719"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,102 +1,80 @@ - + DSLR spherical resolution - PanoTools.org Wiki - - + + + - - - - - + + +
-

DSLR spherical resolution

-
-
From PanoTools.org Wiki
+

DSLR spherical resolution

+
From PanoTools.org Wiki
- -


+


-

Contents

+

Intro

-

In general photography megapixels are more or less synonymous to resulting image resolution. Panorama photography is a bit different, especially spherical panoramas. Here the sensor pixel density is more important than the sensor pixel count. +

In general photography megapixels are more or less synonymous to resulting image resolution. Panorama photography is a bit different. Here the sensor pixel density is more important than the sensor pixel count.

-

The Problem

+

Cameras

Digital Single Lens Reflex (DSLR) cameras exist in four major groups:

-
    -
  • With FourThirds sensor (crop factor 2.0) -
    • -
  • With an APS-C type sensor (crop factor 1.5 or 1.6) -
    • -
  • With APS-H type sensor (crop factor 1.3) -
    • -
  • With a sensor of the full 35mm film size (crop factor 1.0) -
    • -
-

In each size category there are several cameras with different sensor resolutions. And there are several lenses that can be attached to cameras with different sensor sizes. To have the effects of different lenses comparable the concept of a 35mm equivalent focal length has been established - the real focal length multiplied with the crop factor gives the same Field of View like for a 35mm film camera. -

However, this is not possible for fisheye[*] lenses, since the Focal Length does not correspond linearly to the Field of View. One has to look at the degree/mm ratio and absolute pixel density instead. +

+

In each size category there are several cameras with different sensor resolutions. And there are several lenses that can be attached to cameras with different sensor sizes.

-

Degree/mm

-

In the Fisheye Projection an angular distance from the optical axis maps to a linear distance on the sensor. The mapping is determined by the focal length (the following numbers are approximations, since real fisheyes almost never resemble the ideal fisheye mapping): -

-
    -
  • 5.6mm focal length 11.4°/mm -
    • -
  • 8mm focal length 8°/mm -
    • -
  • 10.5mm focal length 6°/mm -
    • -
  • 16mm focal length 4°/mm -
    • -

Pixel density

-

To deduce the pixel resolution obtainable by a certain sensor/lens combination we should know the density in pixels/mm of the respective sensor. The pixel density can be calculated roughly from the Megapixels (better would be actual pixel size) and the sensor size. For the three major groups and some typical Megapixel sizes: +

To deduce the pixel resolution obtainable by a certain sensor/lens combination we should know the density in pixels/mm of the respective sensor. The pixel density can be calculated roughly from the Megapixels and the sensor size. +

You get the exact pixel density by dividing the sensor size in pixels by the corresponding size in mm. +

For the four major groups and some typical Megapixel sizes:

FourThirds

with 13.5mm short side

-
Megapixel          6       8      10      12
-Short side px   2121    2450    2739    3024
-px/mm            157     181     203     232
+
Megapixel          6       8      10      12      16      20
+Short side px   2121    2450    2739    3024    3460    3900
+px/mm            157     181     203     232     260     290
 

 
APS-C

 
with 16mm short side              
 

-
Megapixel          6      8      10      12     15      20      24
-Short side px   2000   2309    2582    2828   3160    3650    4000
-px/mm            125    144     161     177    197     228     250
+
Megapixel          6      8      10      12     15      20      24      28
+Short side px   2000   2309    2582    2828   3160    3650    4000    4320
+px/mm            125    144     161     177    197     228     250     273
 

 
APS-H

 
with 19mm short side              
@@ -108,31 +86,175 @@
 
Full size

 
with 24mm short side
 

-
Megapixel          6       8      10      12      16      21      24      28      36
-Short side px   2000    2309    2582    2828    3266    3742    4032    4320    4900
-px/mm             83      96     108     118     136     156     168     180     204
+
Megapixel          6       8      10      12      16      21      24      28      36      42      46
+Short side px   2000    2309    2582    2828    3266    3742    4032    4320    4900    5300    5500
+px/mm             83      96     108     118     136     156     168     180     204     220     229
 

+
Lenses

+
To determine the angular resolution we need the ratio between the angular distance as seen by the camera and the physical distance on the sensor. This ratio depends on the angular distance  from the optical axis for all projections but the equidistant fisheye. Luckily at the optical axis  all projection formulas converge to the equidistant projection  The angle  is expressed in radians, which gives an angular mapping of  
+
In simple words: The angular mapping in mm/radians equals the focal length in mm in the image center. The actual mapping is not relevant, the formula applies equally to all kinds of fisheyes as well as to normal (rectilinear) lenses.
+

 
Pano sizes

-
From the above values we can easily calculate some sample panorama resolutions. The table gives some rounded values for the maximum pixel size of an equirectangular:
+
From the above values we can easily calculate some sample panorama resolutions. The table gives some rounded values for the maximum pixel width of an equirectangular (f = focal length, MP = Megapixel):
 

-
FourThirds MP      -      -       -       -       6       7       8      10      12       -       -
-APS-C      MP      -      -       6       8      10      11      12      15      20       -      24
-APS-H      MP      -      -       8      10       -      16      -       -       -        -       -
-Full size  MP      6      8      12      16      21      24      28      36      46      50       -
-pixel/mm          80    100     120     140     160     170     180     204     230     240     250
-f=5.6mm  size   2520   3150    3780    4420    5050    5360    5680    6440    7260    7580    7890
-f=8mm    size   3600   4500    5400    6300    7200    7600    8100    9180   10350   10800   11250
-f=10.5mm size   4800   6000    7200    8400    9600   10200   10800   12240   13800   14400   15000
-f=16mm   size   7200   9000   10800   12600   14400   15300   16200   18360   20700   21600   22500
+
FourThirds MP      -      -       -       -       6       7       8      10      12       -      16      20
+APS-C      MP      -      -       6       8      10      11      12      15      20       -      24      28
+APS-H      MP      -      -       8      10       -      16      -       -       -        -       -       -
+Full size  MP      6      8      12      16      21      24      28      36      42      46       -       -
+pixel/mm          80    100     120     140     160     170     180     200     220     230     260     280
+f=5.6mm  width  2820   3520    4220    4920    5280    5980    6340    7040    7740    8100    9140    9860
+f=8mm    width  4020   5020    6040    7040    7540    8540    9040   10100   11100   11600   13100   14100
+f=10.5mm width  5280   6600    7920    9240    9900   11200   11900   13200   14500   15200   17200   18500
+f=12mm   width  6040   7540    9040   10560   11300   12800   13600   15100   16600   17300   19600   21100
+f=16mm   width  8040  10060   12100   14100   15100   17100   18100   20100   22100   23100   26100   28100
 

-
The formula for an exact calculation is  \textstyle {\frac  {{\text{pixel}}/{\text{mm}}}{{\text{degree}}/{\text{mm}}}}\cdot 360
-

---Erik Krause[*] 22:11, 21 August 2007 (CEST)
-
-

-
-
+
The formula for an exact calculation is 
+
with  = focal length,  = pixel density,  = full circle. This is the exact same formula that f.e. PTGui[*] uses.
+

+
+
+
-
- Retrieved from "http://wiki.panotools.org/index.php?title=DSLR_spherical_resolution&oldid=15687[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=DSLR_spherical_resolution&oldid=16078"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dust_Removal_with_Flatfield.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dust_Removal_with_Flatfield.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dust_Removal_with_Flatfield.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dust_Removal_with_Flatfield.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,68 +1,64 @@ - + Dust Removal with Flatfield - PanoTools.org Wiki - - + + + - - - - - + + +
-

Dust Removal with Flatfield

-
-
From PanoTools.org Wiki
+

Dust Removal with Flatfield

+
From PanoTools.org Wiki
- -

Dust can get into camera optics. In panorama images created from such photos the repetitive pattern can be particulary irritating, as a dust speck or a dust speck pattern tends to show up multiple times. +

Dust can get into camera optics. In panorama images created from such photos the repetitive pattern can be particulary irritating, as a dust speck or a dust speck pattern tends to show up multiple times.

-
[*]
[*]
Image with dust specks
+
[*]
[*]
Image with dust specks

One can prepare a flatfield for correction. While one may correct the input files prior to stitching precessing each with the gimp for example, a much smoother workflow results if the stitching software itself provides for the use of a flatfield.

-
[*]
[*]
Image without dust specks
+
[*]
[*]
Image without dust specks

Flatfields may also be used to correct vignetting, or vignetting correction and dust removal combined. But even with hugin 0.7 using a parametrisation approach for vignetting, a suitably prepared flatfield is useful for dust removal.

Example of flatfield performance

  • -
    +

    Original image

  • -
    +

    Snapped raw flatfield

  • -
    +

    Flatfield

  • -
    +

    Corrected image

    @@ -93,8 +89,13 @@ is faster to spot than a single spot positioned at random.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Dust_Removal_with_Flatfield&oldid=9627[*]"
    -
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Dust_Removal_with_Flatfield&oldid=9627"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dynamic_range.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dynamic_range.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dynamic_range.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Dynamic_range.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Dynamic range - PanoTools.org Wiki - - + + + - - - - - + + +
-

Dynamic range

-
-
From PanoTools.org Wiki
+

Dynamic range

+
From PanoTools.org Wiki
- -


+


The dynamic range of a scene, photograph or panorama refers to the ratio between the brightest and darkest portions of the image which is accurately captured or observed. A common problem for panorama production is the large range of brightness levels found in many scenes, e.g. from the deepest shadows under a rock, to direct, unfiltered sunlight. A single exposure cannot possibly achieve detail in the shadows, and avoid saturation in the highlights.

To understand why dynamic range is such a challenge in panoramic photography, it helps to understand how the human brain eye system copes with the natural range of brightness found in the world. Typical natural scenes have a dynamic range of about 18 stops (i.e. 18 doublings), and the human eye, at a single pupil dilation, can appreciate about @@ -39,19 +35,24 @@ illumination conditions, the human brain-eye system can appreciate about 30 stops of dynamic range (a factor of 1 billion:1!), from the faintest star to full-on sunlight. -

By contrast, camera and display systems offer far, far less dynamic range. Good digital cameras may offer only up to 10 stops of dynamic range (i.e. 1,000:1). Most deliver dynamic range well below that (see [1]). Using a camera's RAW mode gives more control for tone mapping the dynamic range captured by the sensors, which may extend the range by 1-1.5 stop at most. See RAW dynamic range extraction[*] for details. +

By contrast, camera and display systems offer far, far less dynamic range. Good digital cameras may offer only up to 10 stops of dynamic range (i.e. 1,000:1). Most deliver dynamic range well below that (see [1]). Using a camera's RAW mode gives more control for tone mapping the dynamic range captured by the sensors, which may extend the range by 1-1.5 stop at most. See RAW dynamic range extraction[*] for details.

This is still a factor of ~500 less than is present in typical sun-illuminated scenes, and even that is rarely achieved in practice (see [2]). Film cameras offer larger dynamic range at the cost of non-linear "roll-off" of shadows and highlights. Some digital cameras apply digital transfer curves to approximate this, and certain cameras (e.g. [3]) have special purpose CCDs to extend dynamic range even further. The problem is even worse when considering display systems. Typical desktop displays offer about 7-8 stops of contrast (e.g. 100:1), high-end plasma TV's offer 10 stops (1200:1),

This gives you a sense of the problem, and also poignantly illustrates why it's so hard to get realistic looking moon shots or other high contrast scenes which are so easy to appreciate using your eyes, but so hard to capture using photographic techniques. -

There are several methods of coping with high dynamic range, including shooting a series of exposures at different exposure times, and combining them digitally afterwards (see Contrast Blending[*]) using 16bits per color channel (e.g. Full 16 bit workflow[*]) to target the limited range of the output device (printer or display). There are also several interesting automatic range compression algorithms which have been proposed (e.g. Gradient Domain High Dynamic Range Compression). -

Photoshop CS2 now has an internal merge to HDR function, which can assemble a bracketed exposure series into a true HDR image. There is a nice tutorial by Brian Greenstone on how to deal with this: [4] and a comparison of two plugins that attempt to compress a HDR image here: HDR compression[*] +

There are several methods of coping with high dynamic range, including shooting a series of exposures at different exposure times, and combining them digitally afterwards (see Contrast Blending[*]) using 16bits per color channel (e.g. Full 16 bit workflow[*]) to target the limited range of the output device (printer or display). There are also several interesting automatic range compression algorithms which have been proposed (e.g. Gradient Domain High Dynamic Range Compression). +

Photoshop CS2 now has an internal merge to HDR function, which can assemble a bracketed exposure series into a true HDR image. There is a nice tutorial by Brian Greenstone on how to deal with this: [4] and a comparison of two plugins that attempt to compress a HDR image here: HDR compression[*]

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Dynamic_range&oldid=12357[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Dynamic_range&oldid=12357"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/e1e1d3d40573127e9ee0480caf1283d6.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/e1e1d3d40573127e9ee0480caf1283d6.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enblend.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enblend.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enblend.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enblend.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,73 +1,56 @@ - + Enblend - PanoTools.org Wiki - - + + + - - - - - + + +
-

Enblend

-
-
From PanoTools.org Wiki
+

Enblend

+
From PanoTools.org Wiki
- -

Contents

+
-

For detailed information please see Enblend reference manual[*] -

-

Intro

+

Overview

Enblend -overlays multiple TIFF images so as to make the seam invisible. It works with 8, 16 or 32 bit (HDR floating point) per channel images. -

Enblend can work as a plug-in for PTGui[*], Hugin or PTAssembler[*] or standalone from the command line or by Enblend Front End[*]. -

New in version 3.0: -

-
    -
  • Adjusts the seam line to avoid areas of mismatch between source images such as parallax errors -
    • -
  • Supports saving and loading masks -
    • -
  • Includes various other performance improvements. -
    • -
-

Enblend and the full documentation for each version is available from the project site. +overlays multiple images so as to make the seam invisible. It works with a broad range of image file formats and supports images with 8, 16 or 32 bit (HDR floating point) per channel. +

Enblend is used as a plug-in for PTGui[*], Hugin and PTAssembler[*] or standalone from the command line or by Enblend Front End[*]. +

Some main features include: +

+
  • Adjusts the seam line to avoid areas of mismatch between source images such as parallax errors
    • +
  • Supports saving and loading masks
+

Enblend and the full documentation (manuals for each version and a "NEWS" link for the release notes) is available from the project site.

Command-line usage

Arguments and parameters may change between versions and also depend on the build process. It is recommended to rely on the manual for your specific version of Enblend which is available from Enblend's home page.

Enblend supports cropped TIFF input files as well as other file formats and bit depths. Please refer to the manual. -

The Enblend reference manual[*] is based on information for an outdated version of Enblend. -

-

Caveat

-

If you are trying to run Enblend 3.0 on Windows and are finding that the program returns immediately with no output, you may be attempting to run a version compiled with SSE instructions on a non-SSE-capable CPU (e.g like older AMD CPUs). You can obtain an non-SSE binary for Enblend from Sourceforge.[1] -

However, it could be that this version still doesn't run as discussed on [2] (problem) and [3] (solution). If so there is a patched version available at http://alto.anu.edu.au/~wpc/private/enblend/enblend-3.0-cyg.zip +

The Enblend reference manual[*] is based on information for an outdated version of Enblend.

Getting Enblend

Enblend is Open Source. As such you can download it for free from its project page linked below. Enblend is part of the major linux distributions. You can get the latest release by using the distributions' software package management system. For ubuntu linux, open a terminal and type: @@ -81,38 +64,30 @@

enblend is Open Source, and as such very much dependent on voluntary contributions of resources. If you have coding skills, you are welcome to look at the source code and contribute to it. Even if you don't have coding skills, you most likely have some skills that the project could use and you are more than welcome to contribute your time. The tasks requiring attention change frequently and so do the required skillset and resources. Join the hugin-ptx mailing list to find out what is going on at the moment and how you can help. Even just testing and giving feedback help.

To get the bleeding edge, follow the development / build process of Hugin

-
    -
  • Ubuntu Linux[*] -
    • -
  • Fedora Linux[*] -
    • -
  • Mac OSX[*] -
    • -
  • Windows[*] -
    • -
+
  • Ubuntu Linux[*]
    • +
  • Fedora Linux[*]
    • +
  • Mac OSX[*]
    • +
  • Windows[*]

See also

Tutorials featuring enblend:

-
    -
  • Using enblend to fill the "Hole in the floor"[*] Nice to know[*] -
    • -
  • How to use enblend for patching zenith and nadir images[*] Nice to know[*] -
    • -
  • How to remove blending error caused by enblend and enfuse at zenith and nadir (automatic)[*] -
    • -
+
  • Using enblend to fill the "Hole in the floor"[*] Nice to know[*]
    • +
  • How to use enblend for patching zenith and nadir images[*] Nice to know[*]
    • +
  • How to remove blending error caused by enblend and enfuse at zenith and nadir (automatic)[*]

External links

- - + + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Enblend&oldid=15894[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Enblend&oldid=15955"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Enfuse.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,44 +1,40 @@ - + Enfuse - PanoTools.org Wiki - - + + + - - - - - + + +
-

Enfuse

-
-
From PanoTools.org Wiki
+

Enfuse

+
From PanoTools.org Wiki
- -
[*]
[*]
Four exposure panorama blended with enfuse[*]
-
[*]
[*]
17 EV image blended with enfuse - (c) Jacek Zagaja[*]
+
[*]
[*]
Four exposure panorama blended with enfuse[*]
+
[*]
[*]
17 EV image blended with enfuse - (c) Jacek Zagaja[*]

Enfuse is -a command-line program used to merge different exposures of the same scene to produce an image that looks very much like a tonemapped image (without the halos[*]) but requires no creation of an HDR image. Therefore it is much simpler to use and allows the creation of very large multiple exposure panoramas. -

Enfuse is based on a paper by Tom Mertens, Jan Kautz and Frank Van Reeth: "Exposure fusion" The implementation was done by Andrew Mihal (developer of Enblend) and the hugin team around Pablo d'Angelo[*] -

An extended documentation could be found on Enfuse reference manual[*] -

Other programs using Exposure Fusion: tufuse and PTGui[*] Pro +a command-line program used to merge different exposures of the same scene to produce an image that looks very much like a tonemapped image (without the halos[*]) but requires no creation of an HDR image. Therefore it is much simpler to use and allows the creation of very large multiple exposure panoramas. +

Enfuse is based on a paper by Tom Mertens, Jan Kautz and Frank Van Reeth: "Exposure fusion" The implementation was done by Andrew Mihal (developer of Enblend) and the hugin team around Pablo d'Angelo[*] +

An extended documentation could be found on Enfuse reference manual[*] +

Other programs using Exposure Fusion: tufuse and PTGui[*] Pro

-

Contents

+

Contents

  • 1 State of development
      @@ -80,28 +76,15 @@ Enfuse/enblend can be downloaded from enblend.sourceforge.net. On that site you will find the 3.2 version source code as well as precompiled windows binaries.

      Beta (development) releases can be downloaded from

      - +

      Known bugs

      (This section needs to be updated)
      This is a list of known bugs in the current version as linked above. For a list of bugs in previous versions please refer to an older version of this page

      -
        -
      • If contrasty structures are near zenith or nadir in an equirectangular image, there might be an artifact (vortex) in the resulting pano. -
        • -
      -
      -
      Workaround: use on zenith and nadir images separately and stitch them in the resulting pano afterwards. -
      -
      - unknown, whether could be fixed easily -
      -
      -
      -
      +
      • If contrasty structures are near zenith or nadir in an equirectangular image, there might be an artifact (vortex) in the resulting pano.
      +
      Workaround: use on zenith and nadir images separately and stitch them in the resulting pano afterwards. +
      - unknown, whether could be fixed easily

      Description

      Enfuse merges overlapping images using the Mertens-Kautz-Van Reeth exposure fusion algorithm. This is a quick way to blend differently exposed images into a nice output image, without producing intermediate HDR images that are then tonemapped to a viewable image. This simplified process often works much better than the currently known tonemapping algorithms.

      Enfuse can also be used to build extended DOF images, by blending a focus stack. @@ -110,17 +93,12 @@

      The basic idea is that pixels in the input images are weighted according to qualities such as proper exposure, good contrast, and high saturation. These weights determine how much a given pixel will contribute to the final image.

      This idea is not quite new. F.e. Ardeshir Goshtasby proposed a technique to select and blend only well exposed blocks and Erik Krause provided a photoshop action to smart mask badly exposed areas. Many such "DRI" or "Exposure Blending" solutions exist.

      The problem of all this techniques was to find good transitions between the areas taken from differently exposed images. There always was a risk of getting banding or even reversed gradients within areas where the brightness gradually changed. -

      Enfuse solves this problem by using the multi resolution spline blending technique well known from enblend and smartblend[*] - and it is actually this step which is responsible for the wonderful results. The technique is described detailed for enblend and it works almost the same for enfuse, with the exception that instead of the initial seam line a mask is created according to the given criteria. +

      Enfuse solves this problem by using the multi resolution spline blending technique well known from enblend and smartblend[*] - and it is actually this step which is responsible for the wonderful results. The technique is described detailed for enblend and it works almost the same for enfuse, with the exception that instead of the initial seam line a mask is created according to the given criteria.

      Enfuse uses three different criteria to judge the quality of a pixel: Exposure, saturation, and contrast.

      -
        -
      • The exposure criteria favors pixels with luminance close to the middle of the range. These pixels are considered better-exposed than those with high or low luminance levels. -
        • -
      • The saturation criteria favors highly-saturated pixels. -
        • -
      • The contrast criteria favors high-contrast pixels. The local gray or color value standard deviation is used as a contrast measure. The Mertens-Kautz-Van Reeth paper suggest using a laplacian filter, but the standard deviation produces much better results for differently focused images. -
        • -
      +
      • The exposure criteria favors pixels with luminance close to the middle of the range. These pixels are considered better-exposed than those with high or low luminance levels.
        • +
      • The saturation criteria favors highly-saturated pixels.
        • +
      • The contrast criteria favors high-contrast pixels. The local gray or color value standard deviation is used as a contrast measure. The Mertens-Kautz-Van Reeth paper suggest using a laplacian filter, but the standard deviation produces much better results for differently focused images.

      Adjustments

      You can adjust how much importance is given to each criteria by setting the weight parameters on the command line. For example, if you set --wExposure=1.0 and --wSaturation=0.5, Enfuse will favor well-exposed pixels over highly-saturated pixels when blending the source images. The impact of these parameters on the final result will not always be clear. The quality of the result is subject to your artistic interpretation. Playing with the weights may or may not give you a more pleasing result. I encourage you to experiment (perhaps using downsized images for speed).

      Enfuse allows each input image to have an alpha channel. By setting the alpha values of pixels to zero, users can manually remove those pixels from consideration when blending. If an input image lacks an alpha channel, Enfuse will print a warning and continue assuming all pixels should be processed for final output. Any alpha value other than zero is interpreted as "this pixel should should be considered for the final image". @@ -195,7 +173,7 @@ 

      --wMu=mu
      -

      Mean of the gaussian weighting function (from 0 to 1) for the exposure criterion only. default value: 0.5. This moves the peak of the curve towards the brighter or darker end of the histogram[*]. Higher values pick more brighter pixels from the source images, lower values more darker ones. +

      Mean of the gaussian weighting function (from 0 to 1) for the exposure criterion only. default value: 0.5. This moves the peak of the curve towards the brighter or darker end of the histogram[*]. Higher values pick more brighter pixels from the source images, lower values more darker ones. 

      --wSigma=sigma
      @@ -236,63 +214,31 @@

      enfuse has triggered the development of some GUIs.

      Multi platform

      - -
        -
      • PTGui[*] Pro since version 7.7 has a built in image fusion tool which features the exposure criterion only but has extended adjustment possibilities. -
        • -
      - + +
      • PTGui[*] Pro since version 7.7 has a built in image fusion tool which features the exposure criterion only but has extended adjustment possibilities.
      +

      Linux

      -
        -
      • KImageFuser by Harry van der Wolf is an enfuse/align_image_stack Gui for Linux (free GPL V3). It has a preview function and batch options. It is written in the graphical script environment kommander and can run on any linux platform. Dependencies are: kdewebdev-3.5.9 or newer, enfuse, align_image_stack (from Hugin), convert (ImageMagick). Not a dependendency but highly recommended: Exiftool to be able to copy all relevant exif data (ImageDescription, Make, Model, Artist, WhitePoint, Copyright, GPS:all, DateTimeOriginal, CreateDate, UserComment, ColorSpace, OwnerName, SerialNumber, all IPTC, all JFIF, XResolution, YResolution, ResolutionUnit, Lens, FocalLengthIn35mmFormat and FocalLength) to the new image. All dependencies are available in the main linux distributions. Note also that at least one KDE theme should be available like e.g. the famous (and default) "bluecurve" theme. KImageFuser has also been added to the Hugin svn in it's own project KImageFuser tree. -
        • -
      • digiKam can use enfuse to blend bracketed images. -
        • -
      +
      • KImageFuser by Harry van der Wolf is an enfuse/align_image_stack Gui for Linux (free GPL V3). It has a preview function and batch options. It is written in the graphical script environment kommander and can run on any linux platform. Dependencies are: kdewebdev-3.5.9 or newer, enfuse, align_image_stack (from Hugin), convert (ImageMagick). Not a dependendency but highly recommended: Exiftool to be able to copy all relevant exif data (ImageDescription, Make, Model, Artist, WhitePoint, Copyright, GPS:all, DateTimeOriginal, CreateDate, UserComment, ColorSpace, OwnerName, SerialNumber, all IPTC, all JFIF, XResolution, YResolution, ResolutionUnit, Lens, FocalLengthIn35mmFormat and FocalLength) to the new image. All dependencies are available in the main linux distributions. Note also that at least one KDE theme should be available like e.g. the famous (and default) "bluecurve" theme. KImageFuser has also been added to the Hugin svn in it's own project KImageFuser tree.
        • +
      • digiKam can use enfuse to blend bracketed images.

      Windows

      -
        -
      • The droplets by Erik Krause are contained in the hugin windows package from http://hugin.sourceforge.net and installed ready to use. A group of image files or an entire folder can be dragged and dropped on a droplet. In case of a folder the user can specify the number of images in a bracketed series, hence multiple series can be enfused in one go. The droplets copy relevant EXIF data to the result image such that camera and lens data isn't lost f.e. for subsequent stitching. Another droplet version does automatic alignment in order to allow for handheld bracketed series. (open source) -
        • -
      -
        -
      • EnfuseGUI by Ingemar Bergmark is a graphical user interface (free). -
        • -
      -
        -
      • TuFuse Pro by Max Lyons is a nice graphical user interface to his own tufuse free command line application (commercial) -
        • -
      -
        -
      • Tufusion is a free GUI for Max Lyons' tufuse, developed by TuFuse forum user "entropy". It's not as sophisticated as TuFuse Pro, but it surely makes life a lot easier, compared to using the command line application. -
        • -
      +
      • The droplets by Erik Krause are contained in the hugin windows package from http://hugin.sourceforge.net and installed ready to use. A group of image files or an entire folder can be dragged and dropped on a droplet. In case of a folder the user can specify the number of images in a bracketed series, hence multiple series can be enfused in one go. The droplets copy relevant EXIF data to the result image such that camera and lens data isn't lost f.e. for subsequent stitching. Another droplet version does automatic alignment in order to allow for handheld bracketed series. (open source)
      +
      • EnfuseGUI by Ingemar Bergmark is a graphical user interface (free).
      +
      • TuFuse Pro by Max Lyons is a nice graphical user interface to his own tufuse free command line application (commercial)
      +
      • Tufusion is a free GUI for Max Lyons' tufuse, developed by TuFuse forum user "entropy". It's not as sophisticated as TuFuse Pro, but it surely makes life a lot easier, compared to using the command line application.

      Mac OSX

      -
        -
      • Bracketeer (commercial) by Brian Greenstone is a graphical user interface with preview function for OS X 10.4 and higher. -
        • -
      -
        -
      • EnfuseGUI (donationware) by Ingemar Bergmark is a graphical user interface for OS X 10.4 and higher. -
        • -
      - -
        -
      • XFuse (free) by Kevin Kratzke is a graphical user interface that allows for batch processing and works on OS X 10.4 and higher. Development of this application is discontinued, last downloadable version is 0.5 as of Feb. 8, 2008. -
        • -
      - +
      • Bracketeer (commercial) by Brian Greenstone is a graphical user interface with preview function for OS X 10.4 and higher.
      +
      • EnfuseGUI (donationware) by Ingemar Bergmark is a graphical user interface for OS X 10.4 and higher.
      + +
      • XFuse (free) by Kevin Kratzke is a graphical user interface that allows for batch processing and works on OS X 10.4 and higher. Development of this application is discontinued, last downloadable version is 0.5 as of Feb. 8, 2008.
      + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Enfuse&oldid=15708[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Enfuse&oldid=15708"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,46 +1,42 @@ - + No-parallax point - PanoTools.org Wiki - - + + + - - - - - + + +
-

No-parallax point

-
-
From PanoTools.org Wiki
-
(Redirected from Entrance pupil[*])
- -


+

No-parallax point

+
From PanoTools.org Wiki
(Redirected from Entrance pupil[*])
+ +


If you rotate your camera around some randomly chosen point, your images may show parallax and be difficult to stitch.

With most lenses, there is one special point around which you can rotate your camera and get no parallax. This special "no-parallax point" is the center of the lens's entrance pupil, a virtual aperture within the lens. In the panorama photography community, this special point is often called the "nodal point", but it is in fact unrelated to the actual nodal points of the lens.1,2 The actual nodal points are other points on the optical path, which are of no significance to most photographers. The no-parallax point is also the "center of perspective", but this term is not commonly used and does not describe why the no-parallax point is important.

The entrance pupil is the image of the limiting aperture or diaphragm, as seen through the front of the lens. The image seen may be magnified by the effect of the lens elements in front of it, and the image is displaced from the actual position of the aperture. It is the center of this image about which the camera must be rotated to avoid parallax.

Everything considered, the best term for the no-parallax point may be (surprise!) the "no-parallax point". "Entrance pupil" is correct although a bit imprecise to a geometry purist; it makes a good term for searching the literature and would be preferred in formal writing. "Nodal point" is commonly-used, but incorrect and leads to confusion. It should be avoided when writing and interpreted with caution in reading the literature.

Regardless of what you call the no-parallax point, it is easily found by trial and error. Just adjust the rotation point so that foreground and background points stay lined up.

Some lenses, notably fisheyes, do not have a single no-parallax point. Instead, they have a range of what we might call "least-parallax points" that depend on the angle away from the lens axis. Such lenses can be recognized easily — just look into the front of the lens and observe that the location of the entrance pupil moves forward or backward as you rotate the lens off-axis. With such lenses, it is good to pick one angle at which you like to stitch, and rotate your camera around a point that gives no parallax at that angle. -

To facilitate finding the no-parallax point for other people, please fill the measurements you have found for your Camera / Lens / Focal Length combination in the Entrance Pupil Database[*] +

To facilitate finding the no-parallax point for other people, please fill the measurements you have found for your Camera / Lens / Focal Length combination in the Entrance Pupil Database[*]

-

Contents

+

Contents

See also

-
    -
  • NPP adapters[*] -
    • -
  • Entrance Pupil Database[*] -
    • -
+
  • NPP adapters[*]
    • +
  • Entrance Pupil Database[*]

References

-
    -
  1. Kerr, Douglas A. "The Proper Pivot Point for Panoramic Photography" The Pumpkin (2005). Accessed 2011-02-02. -
    2. -
  2. van Walree, Paul "Misconceptions in photographic optics", Item #6. Accessed 2011-02-02. -
    3. -
+
  1. Kerr, Douglas A. "The Proper Pivot Point for Panoramic Photography" The Pumpkin (2005). Accessed 2011-02-02.
    2. +
  2. van Walree, Paul "Misconceptions in photographic optics", Item #6. Accessed 2011-02-02.

Links

In theory

- -

Locating the NPP(s) of a specific lens

- - - - + +

Locating the NPP(s) of a specific lens

+ + + + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=No-parallax_point&oldid=15841[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=No-parallax_point&oldid=15841"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,38 +1,36 @@ - + Equirectangular Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Equirectangular Projection

-
-
From PanoTools.org Wiki
-
(Redirected from Equirectangular[*])
- -
Equirectangular Projection, with permission from Ben Kreunen[*]
-

Contents

+

Equirectangular Projection

+
From PanoTools.org Wiki
(Redirected from Equirectangular[*])
+ +


+

+
Equirectangular Projection, with permission from Ben Kreunen[*]
+

Contents

  • 1 Description
  • 2 Common problems @@ -50,13 +48,13 @@

    This is a type of projection for mapping a portion of the surface of a sphere to a flat image. It is also called the "non-projection", or plate carre, since the horizontal coordinate is simply longitude, and the vertical coordinate is simply latitude, with no transformation or scaling applied. The equirectangular projection was used in map creation since it was invented around 100 A.D. by Marinus of Tyre. See Mathworld's page for more detailed information on the mathematics of this projection.

    In an equirectangular panoramic image all verticals remain vertical, and the horizon becomes a straight line across the middle of the image. Coordinates in the image relate linearly to pan and tilt angles in the real world. The poles (Zenith, Nadir) are located at the top and bottom edge and are stretched to the entire width of the image. Areas near the poles get stretched horizontally.

    The Equirectangular projection is the default output format of a rotating (scanning) panorama camera equipped with a fisheye lens -- 180° fisheye giving a full sphere at 360° rotation. Scanning cameras sometimes cover more than one 360° turn but software often assumes that equirectangular images cover 360° horizontally and 180° vertically, i.e. make sure that your equirectangular image has a proper aspect ratio of 2:1. Look at the pixel values -- a file with 1650 x 824 pixels lacks one pixel at the short side thus confusing some applications. -

    The Equirectangular projection is commonly used as the projection type of the source images for spherical panorama viewers[*], including PTViewer. The other possibility is the Cubic Projection. +

    The Equirectangular projection is commonly used as the projection type of the source images for spherical panorama viewers[*], including PTViewer. The other possibility is the Cubic Projection.

    Common problems

    Retouching

    The polar regions of an equirectangular image are extremely distorted, making retouching of these areas very difficult. Some tips are given in the -Zenith and Nadir editing overview[*] tutorial. +Zenith and Nadir editing overview[*] tutorial.

    Blending

    There are related problems with automatically blending seams near the poles. @@ -75,16 +73,21 @@

    Scaling

    Equirectangular images have a very large amount of data redundancy near the poles because they are stretched in the 'latitude' direction. When downsizing -an image in an editor such as Photoshop[*] or the Gimp[*], the effective +an image in an editor such as Photoshop[*] or the Gimp[*], the effective resolution of the image is decreased as expected except near the poles.

    This can cause strange radial artefacts when viewed later in -Panorama Viewers[*]. The solution is to always switch to a less distorted +Panorama Viewers[*]. The solution is to always switch to a less distorted projection such as Cubic Projection before scaling, blurring or -sharpening[*] a panorama - Switching back later if necessary +sharpening[*] a panorama - Switching back later if necessary

    + +
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Equirectangular_Projection&oldid=10659[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Equirectangular_Projection&oldid=10659"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,40 +1,40 @@ - + Equirectangular Panini - PanoTools.org Wiki - - + + + - - - - - + + +
-

Equirectangular Panini

-
-
From PanoTools.org Wiki
+

Equirectangular Panini

+
From PanoTools.org Wiki
- -

The projection labelled "equirectangular Panini" in libpano13 is the standard Pannini projection, which is the cylindrical analogue of the stereographic projection. The "Panini general" projection, available since early 2010, is an adjustable projection that is identical to "equirectangular Panini" at its default parameter settings. +

The projection labelled "equirectangular Panini" in libpano13 is the standard Pannini projection, which is the cylindrical analogue of the stereographic projection. The "Panini general" projection, available since early 2010, is an adjustable projection that is identical to "equirectangular Panini" at its default parameter settings.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Equirectangular_Panini&oldid=13321[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Equirectangular_Panini&oldid=13321"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Projection.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Projection.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,37 +1,35 @@ - + Equirectangular Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Equirectangular Projection

-
-
From PanoTools.org Wiki
+

Equirectangular Projection

+
From PanoTools.org Wiki
- -
Equirectangular Projection, with permission from Ben Kreunen[*]
-

Contents

+


+

+
Equirectangular Projection, with permission from Ben Kreunen[*]
+

Contents

  • 1 Description
  • 2 Common problems @@ -49,13 +47,13 @@

    This is a type of projection for mapping a portion of the surface of a sphere to a flat image. It is also called the "non-projection", or plate carre, since the horizontal coordinate is simply longitude, and the vertical coordinate is simply latitude, with no transformation or scaling applied. The equirectangular projection was used in map creation since it was invented around 100 A.D. by Marinus of Tyre. See Mathworld's page for more detailed information on the mathematics of this projection.

    In an equirectangular panoramic image all verticals remain vertical, and the horizon becomes a straight line across the middle of the image. Coordinates in the image relate linearly to pan and tilt angles in the real world. The poles (Zenith, Nadir) are located at the top and bottom edge and are stretched to the entire width of the image. Areas near the poles get stretched horizontally.

    The Equirectangular projection is the default output format of a rotating (scanning) panorama camera equipped with a fisheye lens -- 180° fisheye giving a full sphere at 360° rotation. Scanning cameras sometimes cover more than one 360° turn but software often assumes that equirectangular images cover 360° horizontally and 180° vertically, i.e. make sure that your equirectangular image has a proper aspect ratio of 2:1. Look at the pixel values -- a file with 1650 x 824 pixels lacks one pixel at the short side thus confusing some applications. -

    The Equirectangular projection is commonly used as the projection type of the source images for spherical panorama viewers[*], including PTViewer. The other possibility is the Cubic Projection. +

    The Equirectangular projection is commonly used as the projection type of the source images for spherical panorama viewers[*], including PTViewer. The other possibility is the Cubic Projection.

    Common problems

    Retouching

    The polar regions of an equirectangular image are extremely distorted, making retouching of these areas very difficult. Some tips are given in the -Zenith and Nadir editing overview[*] tutorial. +Zenith and Nadir editing overview[*] tutorial.

    Blending

    There are related problems with automatically blending seams near the poles. @@ -74,16 +72,21 @@

    Scaling

    Equirectangular images have a very large amount of data redundancy near the poles because they are stretched in the 'latitude' direction. When downsizing -an image in an editor such as Photoshop[*] or the Gimp[*], the effective +an image in an editor such as Photoshop[*] or the Gimp[*], the effective resolution of the image is decreased as expected except near the poles.

    This can cause strange radial artefacts when viewed later in -Panorama Viewers[*]. The solution is to always switch to a less distorted +Panorama Viewers[*]. The solution is to always switch to a less distorted projection such as Cubic Projection before scaling, blurring or -sharpening[*] a panorama - Switching back later if necessary +sharpening[*] a panorama - Switching back later if necessary

    + +
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=Equirectangular_Projection&oldid=10659[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Equirectangular_Projection&oldid=10659"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/EXIF.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/EXIF.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/EXIF.html 2017-04-22 17:02:55.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/EXIF.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,58 +1,52 @@ - + EXIF - PanoTools.org Wiki - - + + + - - - - - + + +
-

EXIF

-
-
From PanoTools.org Wiki
+

EXIF

+
From PanoTools.org Wiki
- -


-The Exchangeable Image File Format (EXIF) allows camera, lens, exposure information, image description, copyright, etc. to be embedded in standardized fields within JFIF (JPEG) or TIFF image files. EXIF is a de facto standard promoted by the camera industry as a means to store metadata recorded by a digital camera, and is not intended as a general-purpose metadata storage mechanism. XMP[*] is a more generalized format for storing arbitrary metadata in a variety of media file formats. -

EXIF metadata is used by stitching products such as PTGUI[*] to make assumptions about the camera (sensor) and lens used to shoot a given image. This information is used to set defaults for the Field of View and Cropping Factor[*] for stitching projects. These defaults are typically used only as a starting point, and are refined through the optimization process. +


+The Exchangeable Image File Format (EXIF) allows camera, lens, exposure information, image description, copyright, etc. to be embedded in standardized fields within JFIF (JPEG) or TIFF image files. EXIF is a de facto standard promoted by the camera industry as a means to store metadata recorded by a digital camera, and is not intended as a general-purpose metadata storage mechanism. XMP[*] is a more generalized format for storing arbitrary metadata in a variety of media file formats. +

EXIF metadata is used by stitching products such as PTGUI[*] to make assumptions about the camera (sensor) and lens used to shoot a given image. This information is used to set defaults for the Field of View and Cropping Factor[*] for stitching projects. These defaults are typically used only as a starting point, and are refined through the optimization process.

As you'll note from the ExifTool pages below, there are many redundant fields due to different manufacturers defining unique fields for semantically identical information, as well as fields which are intended to store manufacturer-specific metadata. Many of these fields are undocumented, at least as far as the public is concerned, and so there is much energy in the industry devoted to decoding these unique fields, their semantics and their constraints.

While EXIF is not generally intended to be user editable, there are a large number of tools that are capable of editing EXIF metadata with varying degrees of support for the huge variety of fields found in real-world EXIF files.

ExifTool is free software that allows manipulation of EXIF and related data in many different kinds of files. ExifTool is one of the most comprehensive EXIF editors available, and continues to grow the number and depth of support for undocumented EXIF metadata, as well as adding support for other (non-EXIF) file formats and metadata structures. -

photomolo[*] is a free tool for lossless rotation of JPEG images and updating the EXIF tags appropriately. +

photomolo[*] is a free tool for lossless rotation of JPEG images and updating the EXIF tags appropriately.

External links

- - - + -
- Retrieved from "http://wiki.panotools.org/index.php?title=EXIF&oldid=9393[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=EXIF&oldid=9393"
+
\ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f08ce4d4c86c5b43f36c8435fb598da6471047c6.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f08ce4d4c86c5b43f36c8435fb598da6471047c6.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f10801280c8b36520b1a628171f25d8f.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f10801280c8b36520b1a628171f25d8f.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f34c10f53deff61bbb851e44b35b6ba2e54191b3.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f34c10f53deff61bbb851e44b35b6ba2e54191b3.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f351bd4263519281b738ce53c3b402823e9ab2ec.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f351bd4263519281b738ce53c3b402823e9ab2ec.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f7bd60b75b29d79b660a2859395c1a24.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/f7bd60b75b29d79b660a2859395c1a24.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.png differ Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/faeac1d4d9b6f8b8fd4efba91c90f189a2e3089f.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/faeac1d4d9b6f8b8fd4efba91c90f189a2e3089f.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/fetch.sh hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/fetch.sh --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/fetch.sh 2016-01-22 17:49:36.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/fetch.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh - -wget --input-file=pages.txt \ - --base=http://wiki.panotools.org/ \ - --no-host-directories \ - --html-extension \ - --page-requisites \ - --convert-links \ - --no-clobber \ - --no-directories \ - --exclude-directories=wiki/skins \ - --ignore-tags=link - -rm -f robots.txt -rm -f index.php* -rm -f gnu-fdl.png -rm -f load.php* -rm -f poweredby_mediawiki_88x31.png - diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Field_of_View.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,67 +1,426 @@ - + Field of View - PanoTools.org Wiki - - + + + - - - - - + + +
-

Field of View

-
-
From PanoTools.org Wiki
+

Field of View

+
From PanoTools.org Wiki
- -


-The angle of view of a photograph or camera is a measure of the proportion of a scene included in the image. Simply said: How many degrees of view are included in an image. A typical fixed lens camera might have an angle of view of 50°, a fisheye lens can have an angle of view greater than 180° and a full equirectangular or cylindrical panorama would have an angle of view of 360°. +


+The angle of view of a photograph or camera is a measure of the proportion of a scene included in the image. Simply said: How many degrees of view are included in an image. A typical fixed lens camera might have an angle of view of 50°, a fisheye lens can have an angle of view greater than 180° and a full equirectangular or cylindrical panorama would have an angle of view of 360°.

Most people speak of field of view when in fact they mean angle of view. Field of view is the distance covered by a projection at a certain distance. So if an image exactly shows a 2 meter wide object at 1 meter distance, then the field of view is 2 meter (and the angle of view is 90°). Angle of view is also known as angle of coverage.

-
Field-of-view.svg[*]
+
Field-of-view.svg[*]

From here on and on the rest of the wiki we will only speak of field of view (although we should speak of angle of view).

Field of view is often abbreviated as FoV. Usually field of view refers to the horizontal field of view (hFoV) of an image. Some applications make use of the vertical field of view (vFoV) which can be calculated from the Aspect Ratio of the image:

For rectilinear images: -

AspectRatio={\frac {tan({\frac {hFoV}{2}})}{tan({\frac {vFoV}{2}})}} +

For fisheye images (approximation): -

AspectRatio={\frac {hFoV}{vFoV}} +

Conversion from focal length

The other standard measure of the width or narrowness of a lens is Focal Length. -

Assuming a rectilinear lens, the field of view can be calculated like this (size being either width or height for the respective FoV): -

FoV=2*atan\left({\frac {size}{2*FocalLength}}\right) -

Please note that this is an approximation. The exact values depend on the location of the entrance pupil. More information on that in Rik Littlefield's paper. -See Fisheye Projection for formulas for Fisheyes[*]. +

Assuming a rectilinear lens, the field of view can be calculated like this ( being either width or height for the respective FoV): +

+

Please note that this is an approximation. The exact values depend on the location of the entrance pupil. More information on that in Rik Littlefield's paper. +See Fisheye Projection for formulas for Fisheyes[*]. +

Please also note that some software may modify somewhat the above relationship between FoV and focal length. For example, Hugin takes into account ratio of input image (see beginning of function SrcPanoImage::calcFocalLength() for details).

Conversion from horizontal to vertical and vice versa

For fisheye (approximation) and equirectangular images: -

vFoV=hFoV*{\frac {height}{width}}\ -

hFoV=vFoV*{\frac {width}{height}}\ +

+

For rectilinear images: -

vFoV=2*atan\left(tan\left({\frac {hFoV}{2}}\right)*{\frac {height}{width}}\right) -

hFoV=2*atan\left(tan\left({\frac {vFoV}{2}}\right)*{\frac {width}{height}}\right) +

+

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Field_of_View&oldid=13076[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Field_of_View&oldid=16031"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fisheye_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fisheye_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fisheye_Projection.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fisheye_Projection.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,106 +1,482 @@ - + Fisheye Projection - PanoTools.org Wiki - - + + + - - - - - + + +
-

Fisheye Projection

-
-
From PanoTools.org Wiki
+

Fisheye Projection

+
From PanoTools.org Wiki
- -
[*]
Circular Fisheye projection, with permission from Ben Kreunen
-
[*]
Fullframe Fisheye projection, with permission from Ben Kreunen
+


+

+
[*]
Circular Fisheye projection, with permission from Ben Kreunen
+
[*]
Fullframe Fisheye projection, with permission from Ben Kreunen

This is a class of projections for mapping a portion of the surface of a sphere to a flat image, typically a camera's film or detector plane. In a fisheye projection the distance from the centre of the image to a point is close to proportional to the true angle of separation. -

Commonly there are two types of fisheye distinguished: circular fisheyes[*] and fullframe fisheyes[*]. However, both follow the same projection geometrics. The only difference is one of Field of View: for a circular fisheye the circular image fits (more or less) completely in the frame, leaving blank areas in the corner. For the full frame variety, the image is over-filled by the circular fisheye image, leaving no blank space on the film or detector. A circular fisheye can be made full frame if you use it with a smaller sensor/film size (and vice versa), or by zooming a fisheye adaptor on a zoom lens. +

Commonly there are two types of fisheye distinguished: circular fisheyes[*] and fullframe fisheyes[*]. However, both follow the same projection geometrics. The only difference is one of Field of View: for a circular fisheye the circular image fits (more or less) completely in the frame, leaving blank areas in the corner. For the full frame variety, the image is over-filled by the circular fisheye image, leaving no blank space on the film or detector. A circular fisheye can be made full frame if you use it with a smaller sensor/film size (and vice versa), or by zooming a fisheye adaptor on a zoom lens.

There is no single fisheye projection, but instead there are a class of projection transformation all referred to as fisheye by various lens manufacturers, with names like equisolid angle projection, or equidistance fisheye. Less common are traditional spherical projections which map to circular images, such as the orthographic (lenses commonly designated OP) or stereographic projections. Luckily, Panorama tools and Hugin can deal with most of these mentioned projections. -

\theta \, is the angle in rad between a point in the real world and the optical axis, which goes from the center of the image through the center of the lens, f is the focal length of the lens and R is radial position of a point on the image on the film or sensor. +

is the angle in rad between a point in the real world and the optical axis, which goes from the center of the image through the center of the lens, is the focal length of the lens and is radial position of a point on the image on the film or sensor.

- - + - - - - - - - - - - - - - - - - -
projection +
projection math +math real lenses, matching this projection +real lenses, matching this projection
equidistant fisheye +equidistant fisheye R=f\cdot \theta + e.g. Peleng 8mm f/3.5 Fisheye
This is the ideal fisheye projection panotools uses internally +		e.g. Peleng 8mm f/3.5 Fisheye
This is the ideal fisheye projection panotools uses internally
stereographic +stereographic R=2f\cdot \tan \left({\frac {\theta }{2}}\right) + e.g. Samyang 8 mm f/3.5 +e.g. Samyang 8 mm f/3.5
orthographic +orthographic R=f\cdot \sin \left(\theta \right) + e.g. Yasuhara - MADOKA 180 circle fisheye lens +e.g. Yasuhara - MADOKA 180 circle fisheye lens
equisolid +equisolid

(equal-area fisheye)

R=2f\cdot \sin \left({\frac {\theta }{2}}\right) + e. g. Sigma 8mm f/4.0 AF EX, (also convex mirror) +e. g. Sigma 8mm f/4.0 AF EX, (also convex mirror)
Thoby fisheye +Thoby fisheye R=k_{1}\cdot f\cdot \sin \left(k_{2}\cdot \theta \right) -

with k_{1}=1.47 and k_{2}=0.713 +

 +

with and

e. g. AF DX Fisheye-Nikkor 10.5mm f/2.8G ED +e. g. AF DX Fisheye-Nikkor 10.5mm f/2.8G ED

(empirical found math for this lens)

-
+ + +PTGui 11 fisheye + + + +The fisheye factor can model any possible fisheye. Different values correspond to the different fisheye mappings:
+

equidistant:
+stereographic:
+orthographic:
+equisolid:
+rectilinear (normal lens): +

+

So for example 90 degrees, which would be the maximum theta of a lens with 180 degree Field of View, f=8mm, equisolid mapping, you get R = 11.3mm, which is the radius of the image circle. -

Btw, a rectilinear lens has a mapping +

Btw, a rectilinear lens has a mapping +

More information on fisheyes[*] and their distortions from Bob Atkins Photography +

Panotools fisheye mapping mentioned by Helmut Dersch[*] in http://www.panotools.org/mailarchive/msg/6864#msg6864

-
R=f*tan(\theta )\,
-
-

More information on fisheyes[*] and their distortions from Bob Atkins Photography -

Panotools fisheye mapping mentioned by Helmut Dersch[*] in http://www.panotools.org/mailarchive/msg/6864#msg6864 -

(Content partly based on a mail by Helmut Dersch which can be found at W.J. Markerink's page about fisheye analysis Link not valid anymore) -

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Fisheye_Projection&oldid=15452[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Fisheye_Projection&oldid=16077"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Focal_Length.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Focal_Length.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Focal_Length.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Focal_Length.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,44 +1,47 @@ - + Focal Length - PanoTools.org Wiki - - + + + - - - - - + + +
-

Focal Length

-
-
From PanoTools.org Wiki
+

Focal Length

+
From PanoTools.org Wiki
- -
[*]
[*]
Focal Length
+


+

+
[*]
[*]
Focal Length

For photographic purpose the focal length is a physical property of a lens (or mirror) giving the distance from the lens in which rays of light that fall parallel to the optical axis into the lens are focused to one point. The exact point from which the focal length is measured is the rear principal plane[*]. This point is located outside the physical lens for common wide angle lenses for single lens reflexe cameras.

For a better definition see Wikipedia: w:Focal_length[*]

Together with the film or sensor format the focal length determines the image Field of View which is far more important for panoramic imaging. -

Whereas for rectilinear (normal) lenses the focal length is the same throughout the image for fisheye[*] lenses it is valid only for the image center. +

Whereas for rectilinear (normal) lenses the focal length is the same throughout the image for fisheye[*] lenses it is valid only for the image center.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Focal_Length&oldid=12241[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Focal_Length&oldid=12241"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Freepv.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Freepv.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Freepv.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Freepv.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,97 +1,68 @@ - + Freepv - PanoTools.org Wiki - - + + + - - - - - + + +
-

Freepv

-
-
From PanoTools.org Wiki
+

Freepv

+
From PanoTools.org Wiki
- -

freepv is an open source panorama viewer, development is at an early stage, but features already include: +

freepv is an open source panorama viewer, development is at an early stage, but features already include:

-
    -
  • Hardware acceleration -
    • -
  • Cubic Projection and Cylindrical Projection panoramas -
    • -
  • QTVR support -
    • -
  • Mozilla/Firefox plugin for Windows and Linux -
    • -
  • Standalone viewer (Windows, Unix/Linux and probably compilable on Mac OS X as well) -
    • -
  • Inertial motion similar to SPi-V[*] -
    • -
+
  • Hardware acceleration
    • +
  • Cubic Projection and Cylindrical Projection panoramas
    • +
  • QTVR support
    • +
  • Mozilla/Firefox plugin for Windows and Linux
    • +
  • Standalone viewer (Windows, Unix/Linux and probably compilable on Mac OS X as well)
    • +
  • Inertial motion similar to SPi-V[*]

Links

- +

Test pages

These are some example panoramas that should all eventually work with freepv:

Good

- +

Bad

- - - + -
- Retrieved from "http://wiki.panotools.org/index.php?title=Freepv&oldid=9100[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Freepv&oldid=9100"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Fulla.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,38 +1,34 @@ - + Fulla - PanoTools.org Wiki - - + + + - - - - - + + +
-

Fulla

-
-
From PanoTools.org Wiki
+

Fulla

+
From PanoTools.org Wiki
- -

fulla is a command-line tool distributed with hugin. It can correct chromatic aberration, lens distortion, and vignetting. +

fulla is a command-line tool distributed with hugin. It can correct chromatic aberration, lens distortion, and vignetting.

-

Contents

+

Contents

  • 1 About fulla
  • 2 Command-line usage
    • @@ -45,17 +41,12 @@

    About fulla

    fulla is suitable for batch correction of:

    -
    -
    Chromatic aberration
    -
    See tutorial in external links. -
    +
    Chromatic aberration
    +
    See tutorial in external links.
    Lens distortion
    -
    Barrel or pincushion distortion can be corrected using the same a, b, c and d parameters as other Panorama Tools[*] derived programs. -
    +
    Barrel or pincushion distortion can be corrected using the same a, b, c and d parameters as other Panorama Tools[*] derived programs.
    Vignetting
    -
    Polynomial correction by division, addition or flatfield images. hugin contains a vignetting calculator that can use a series of overlapping photographs to determine the likely polynomial required to correct common vignetting problems. -
    -
    +
    Polynomial correction by division, addition or flatfield images. hugin contains a vignetting calculator that can use a series of overlapping photographs to determine the likely polynomial required to correct common vignetting problems.

    fulla can work with the same range of image types as nona, including 8bit and 16bit TIFF and 32bit floating-point HDR TIFF data.

    Command-line usage

    @@ -66,112 +57,58 @@


    The following options can be specified:

    -
      -
    • --green=db|a:b:c:d or -g db|a:b:c:d -
      • -
    +
    • --green=db|a:b:c:d or -g db|a:b:c:d

    Correct radial distortion for all channels. Specify 'db' for database lookup or the 4 coefficients a:b:c:d.

    -
      -
    • --blue=db|a:b:c:d or -b db|a:b:c:d -
      • -
    +
    • --blue=db|a:b:c:d or -b db|a:b:c:d

    Correct radial distortion for blue channel, this is applied on top of the --green distortion coefficients, use for TCA corr. Specify 'db' for database lookup or the 4 coefficients a:b:c:d.

    -
      -
    • --red=db|a:b:c:d or -r db|a:b:c:d -
      • -
    +
    • --red=db|a:b:c:d or -r db|a:b:c:d

    Correct radial distortion for red channel, this is applied on top of the --green distortion coefficients, use for TCA corr. Specify 'db' for database lookup or the 4 coefficients a:b:c:d

    -
      -
    • --camera-maker=Maker or -m Maker -
      • -
    +
    • --camera-maker=Maker or -m Maker

    Camera manufacturer, for database query

    -
      -
    • --camera-model=Cam or -n Model -
      • -
    +
    • --camera-model=Cam or -n Model

    Camera name, for database query

    -
      -
    • --lensname=Lens or -l Lens -
      • -
    +
    • --lensname=Lens or -l Lens

    Lens name, for database query. Specify --camera-maker and --camera-model for fixed lens cameras or --lensname for interchangeable lenses.

    -
      -
    • --focallength=50 or -d 50 -
      • -
    +
    • --focallength=50 or -d 50

    Specify focal length in mm, for database query

    -
      -
    • --aperture=3.5 or -a 3.5 -
      • -
    +
    • --aperture=3.5 or -a 3.5

    Specify aperture for vignetting data database query

    -
      -
    • --dont-rescale or -s -
      • -
    +
    • --dont-rescale or -s

    Do not rescale the image to avoid black borders.

    -
      -
    • --flatfield=filename or -f filename -
      • -
    +
    • --flatfield=filename or -f filename

    Vignetting correction by flatfield division: I = I / c, c = flatfield / mean(flatfield)

    -
      -
    • --vignetting=db|a:b:c:d or -c db|a:b:c:d -
      • -
    +
    • --vignetting=db|a:b:c:d or -c db|a:b:c:d

    Correct vignetting (by division). Specify db for database look up or the the 4 coefficients a:b:c:d: I = I / ( a + b*r^2 + c*r^4 + d*r^6)

    -
      -
    • --linear -
      • -
    +
    • --linear

    Do vignetting correction in linear color space

    -
      -
    • --gamma=value or -i value -
      • -
    +
    • --gamma=value or -i value

    Gamma of input data. used for gamma correction before and after flatfield correction

    -
      -
    • --help or -h -
      • -
    +
    • --help or -h

    Display help

    -
      -
    • --output=name or -o name -
      • -
    +
    • --output=name or -o name

    Set output filename. If more than one image is given, the name will be uses as suffix (default suffix: _corr)

    -
      -
    • --compression=value or -e value -
      • -
    +
    • --compression=value or -e value

    Compression of the output files. For jpeg output: 0-100, For tiff output: PACKBITS, DEFLATE, LZW

    -
      -
    • --offset=X:Y or -x X:Y -
      • -
    +
    • --offset=X:Y or -x X:Y

    Horizontal and vertical shift

    -
      -
    • --verbose or -v -
      • -
    +
    • --verbose or -v

    Verbose output

    Notes

    @@ -181,39 +118,27 @@

    Once you have calculated fulla parameters as described above, you can create a custom droplet for batch correcting photos like so:

    -
      -
    • Create a Shortcut to fulla.exe by dragging the fulla icon to another directory in Windows explorer -
      • -
    • Edit properties -
      • -
    • Change the target to include your correction parameters: -
      • -
    +
    • Create a Shortcut to fulla.exe by dragging the fulla icon to another directory in Windows explorer
      • +
    • Edit properties
      • +
    • Change the target to include your correction parameters:
     "C:\Program Files\hugin\fulla.exe" --red=0:0:0.00056:1.00015 --blue=0:0:-0.00026:1.0011 --vignetting=1:0.20:-0.51:0.2
    -
      -
    • Rename the shortcut to something descriptive like fulla-peleng -
      • -
    • Now you can correct photos by dragging and dropping them onto the icon -
      • -
    +
    • Rename the shortcut to something descriptive like fulla-peleng
      • +
    • Now you can correct photos by dragging and dropping them onto the icon

    External links

    - - + + +
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Fulla&oldid=15710[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Fulla&oldid=15918"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Gamma.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Gamma.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Gamma.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Gamma.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,57 +1,47 @@ - + Gamma - PanoTools.org Wiki - - + + + - - - - - + + +
-

Gamma

-
-
From PanoTools.org Wiki
+

Gamma

+
From PanoTools.org Wiki
- -


+


Gamma is the relation between pixel value respectively electric power and visible brightness on a specific output medium.

Although for common uses the gamma value just controls the subjective brightness of the mid range of pixels, there are certain situations in a photo stitching workflow where it makes a quantitative difference to the results:

-
    -
  • Pixel values are interpolated when correcting TCA (transverse chromatic aberration). -
    • -
  • Pixel intensity is scaled when correcting vignetting. -
    • -
  • Pixel values are interpolated when photos are re-projected into the output image. -
    • -
  • Blending via feathering, enblend or smartblend[*] averages pixel values between images. -
    • -
+
  • Pixel values are interpolated when correcting TCA (transverse chromatic aberration).
    • +
  • Pixel intensity is scaled when correcting vignetting.
    • +
  • Pixel values are interpolated when photos are re-projected into the output image.
    • +
  • Blending via feathering, enblend or smartblend[*] averages pixel values between images.

In any of these situations, it may be necessary to work with linear data (gamma = 1.0) or to use tools that work internally with gamma corrected data like so:

When using fulla to correct chromatic aberration and vignetting, be sure to set the -i parameter to the gamma of your input images.

nona, PTStitcher and PTmender all accept a g (gamma) parameter on the m line, most -GUI front-ends[*] allow you to set this. +GUI front-ends[*] allow you to set this.

enblend (including version 3.0) appears to assume that input data is already gamma-corrected, so if you are working with linear data you probably need to change to gamma = 2.2 before running enblend.

See Helmut Dersch's article on Interpolation and Gamma Correction. @@ -59,8 +49,13 @@ Gamma FAQ.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=Gamma&oldid=13467[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Gamma&oldid=13467"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Geocpset.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Geocpset.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Geocpset.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Geocpset.html 2019-01-09 15:36:57.000000000 +0000 @@ -1,36 +1,32 @@ - + Geocpset - PanoTools.org Wiki - - + + + - - - - - + + +
-

Geocpset

-
-
From PanoTools.org Wiki
+

Geocpset

+
From PanoTools.org Wiki
- -

General and description

+

General and description

Geocpset is a tool for panoramas which contains featureless images, e.g. sky images. In this images a control point detector does not find control points. Geocpset analyses the positions of the images in project files. Then it adds control points to these images which are not connected by control points. The control points are set only be the geometric positions of the images and not by the image content. So geocpset should only used with projects which have assigned rough image positions.

Usage

@@ -41,45 +37,31 @@

If the --output/-o switch is missing then the suffix "_geo" is added to the filename.

The indented workflow is

-
    -
  • First create project file using pto_gen -
    • -
+
  • First create project file using pto_gen
    pto_gen -o project.pto *.jpg
-
    -
  • Then assign rough positions to images with pto_var -
    • -
+
  • Then assign rough positions to images with pto_var
    pto_var --set=y=i*20-40,p=0,r=0 -o project.pto project.pto
-
    -
  • Now run a "normal" control point detector, e.g. only on overlapping images with cpfind -
    • -
+
  • Now run a "normal" control point detector, e.g. only on overlapping images with cpfind
    cpfind --prealigned -o project.pto project.pto
-
    -
  • And finally connect all unconnected images -
    • -
+
  • And finally connect all unconnected images
    geocpset -o project.pto project.pto

Options

-
    -
  • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_geo" to the input filename. -
    • -
  • -e|--each-overlap By default geocpset adds only control points to unconnected images. With this switch you can force to add a geometric control point to each overlap, which is not connected by control points or linked with image positions. -
    • -
  • --min-overlap=NUM By default geocpset takes only image pairs into account which overlap more than 10 %. If you have very narrow overlaps you can decrease this value to take also such small overlaps into account, e.g. --min-overlap=1 -
    • -
  • -h | --help Display help. -
    • -
- - +
  • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_geo" to the input filename.
    • +
  • -e|--each-overlap By default geocpset adds only control points to unconnected images. With this switch you can force to add a geometric control point to each overlap, which is not connected by control points or linked with image positions.
    • +
  • --min-overlap=NUM By default geocpset takes only image pairs into account which overlap more than 10 %. If you have very narrow overlaps you can decrease this value to take also such small overlaps into account, e.g. --min-overlap=1
    • +
  • -h | --help Display help.
-
- Retrieved from "http://wiki.panotools.org/index.php?title=Geocpset&oldid=15793[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=Geocpset&oldid=15793"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/GIF.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/GIF.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/GIF.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/GIF.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,42 +1,43 @@ - + GIF - PanoTools.org Wiki - - + + + - - - - - + + +
-

GIF

-
-
From PanoTools.org Wiki
+

GIF

+
From PanoTools.org Wiki
- -


-Graphics Interchange Format is a bitmap image format[*] widely used on the web for logos, graphics and simple animated images. There where patent issues in the past. Read more on Wikipedia: w:GIF[*]. -

GIF has not much use in panoramic imaging. However, it is used by PTViewer[*] to display buttons and (possibly animated) hotspot[*] graphics. +


+Graphics Interchange Format is a bitmap image format[*] widely used on the web for logos, graphics and simple animated images. There where patent issues in the past. Read more on Wikipedia: w:GIF[*]. +

GIF has not much use in panoramic imaging. However, it is used by PTViewer[*] to display buttons and (possibly animated) hotspot[*] graphics.

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=GIF&oldid=9542[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=GIF&oldid=9542"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,71 +1,59 @@ - + HDR - PanoTools.org Wiki - - + + + - - - - - + + +
-

HDR

-
-
From PanoTools.org Wiki
+

HDR

+
From PanoTools.org Wiki
- -

HDR means +

HDR means high Dynamic Range. The term is used to refer to techniques and images that are capable of capturing and reproducing scenes with a high dynamic range.

HDR is used more or less accurately for almost any way to get more details out of the shadows and/or highlights. To understand how so-called "HDR techniques" work, it is important to differentiate between the two limitations that affects dynamic range in photography and imaging. The first limitation comes from the capture, i.e. the camera. The second limitation from the display, i.e. monitor or printer.

-
    -
  • Camera limitation: Standard digital cameras can capture at most a dynamic range of 1,000:1, which is much less than the dynamic range of most outdoor scenes. This limitation is usually addressed by taking several exposures of the same scene (this is the purpose of the "Automatic Exposure Bracketing" function available in many digicams). -
    • -
-
    -
  • Display limitation: Standard monitors have a rather low dynamic range, around 100:1, which is not even enough to display correctly the RAW data captured by a standard camera. This limitation is addressed by tone mapping or by techniques that directly blend exposures. Exposure Blending can be done either manually in Photoshop, semi-manually with Photoshop actions (see Contrast Blending[*] and Jook Leung's HDR for Dummy) or automatically in specialized software (see Photomatix[*], FDRTools[*] or pfstools[*] - comparison on HDR compression[*]). -
    • -
+
  • Camera limitation: Standard digital cameras can capture at most a dynamic range of 1,000:1, which is much less than the dynamic range of most outdoor scenes. This limitation is usually addressed by taking several exposures of the same scene (this is the purpose of the "Automatic Exposure Bracketing" function available in many digicams).
+
  • Display limitation: Standard monitors have a rather low dynamic range, around 100:1, which is not even enough to display correctly the RAW data captured by a standard camera. This limitation is addressed by tone mapping or by techniques that directly blend exposures. Exposure Blending can be done either manually in Photoshop, semi-manually with Photoshop actions (see Contrast Blending[*] and Jook Leung's HDR for Dummy) or automatically in specialized software (see Photomatix[*], FDRTools[*] or pfstools[*] - comparison on HDR compression[*]).

Both camera and display limitations can be overcome with specialised equipment like the SpheroCam HDR camera and Brightside HDR Display. However, such equipment remains very expensive for the time being.

HDR images are stored in a high bit depth and/or floating point format. There are several HDR formats among them

-
    -
  • .hdr Radiance RGBE format -
    • -
  • .tif Floating point TIFF -
    • -
  • .pfm Portable floatmap -
    • -
  • .float Raw binary floating point -
    • -
  • .exr OpenEXR EXR[*] format -
    • -
-

The hugin panorama tools GUI front end[*] supports stitching both floating point TIFF and +

  • .hdr Radiance RGBE format
    • +
  • .tif Floating point TIFF
    • +
  • .pfm Portable floatmap
    • +
  • .float Raw binary floating point
    • +
  • .exr OpenEXR EXR[*] format
+

The hugin panorama tools GUI front end[*] supports stitching both floating point TIFF and Radiance RGBE HDR images, see the HDR workflow with hugin page for details. The enblend tool also supports blending floating point TIFF HDR data, but not RGBE data yet.

Some more info on HDR is found on wikipedia: w:High dynamic range imaging[*] and the HDR Image FAQ. -

Also, see the HDR Software overview[*], Batch merge handheld images[*] and enfuse +

Also, see the HDR Software overview[*], Batch merge handheld images[*] and enfuse

- - -
- Retrieved from "http://wiki.panotools.org/index.php?title=HDR&oldid=14216[*]"
-
\ No newline at end of file + +
+ +
+ Retrieved from "https://wiki.panotools.org/index.php?title=HDR&oldid=14216"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/HDR_workflow_with_hugin.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + HDR workflow with hugin - PanoTools.org Wiki - - + + + - - - - - + + +
-

HDR workflow with hugin

-
-
From PanoTools.org Wiki
+

HDR workflow with hugin

+
From PanoTools.org Wiki
- -

This tutorial doesn't cover reasons why you might want to stitch in HDR +

This tutorial doesn't cover reasons why you might want to stitch in HDR format. It is a simple HOWTO listing the tools available and how to use them with hugin.

TODO this is all very out of date, hugin now supports HDR assembly internally. @@ -39,21 +35,15 @@ probably want to look at a 16bit workflow with hugin.

Still here? There are two basic ways of creating an HDR panorama:

-
    -
  • Stitch several panoramas of the same scene, each one at a different exposure, and merge them together into a single HDR file. -
    • -
-
    -
  • Create a set of HDR shots of the scene and then stitch them together. -
    • -
+
  • Stitch several panoramas of the same scene, each one at a different exposure, and merge them together into a single HDR file.
+
  • Create a set of HDR shots of the scene and then stitch them together.

Each has advantages and disadvantages: The first technique is simpler and has the advantage that the final HDR step can be skipped and substituted with a -Contrast Blending[*] approach, but has the potential for misalignments causing -ghosting[*] problems. The second technique is presented here since it +Contrast Blending[*] approach, but has the potential for misalignments causing +ghosting[*] problems. The second technique is presented here since it involves a greater range of tools.

-

Contents

+

Contents

  • 1 Quick and easy technique
  • 2 Laborious and difficult technique @@ -86,20 +76,11 @@

    Quick and easy technique

    The rest of this tutorial describes generating high quality output using command-line tools. However it is now possible to complete the workflow entirely with GUI tools, something like this:

    -
      -
    1. Take bracketed shots of your scene. -
      2. -
    2. Open bracketed images in Hugin. Align - let's say - the middle exposures together and set the stacks in the Images tab. -
        -
      1. If your stacks don't align (shot hand-held, sloppy panohead, etc.), set some control points inside stacks and align them too. -
        2. -
      -
      3. -
    3. Stitch the panorama with hugin and enblend to HDR file. -
      4. -
    4. Optionally tonemap the result with qtpfsgui[*]. -
      5. -
    +
    1. Take bracketed shots of your scene.
      2. +
    2. Open bracketed images in Hugin. Align - let's say - the middle exposures together and set the stacks in the Images tab. +
      1. If your stacks don't align (shot hand-held, sloppy panohead, etc.), set some control points inside stacks and align them too.
      3. +
    3. Stitch the panorama with hugin and enblend to HDR file.
      4. +
    4. Optionally tonemap the result with qtpfsgui[*].

    Laborious and difficult technique

    Preparing the HDR images

    Unless you have an expensive HDR camera, you will be merging bracketed @@ -121,10 +102,10 @@ fulla using pre-calibrated data for your lens, it doesn't really work later on.

    Merging bracketed shots with PFScalibration

    -

    There are other tools for merging bracketed images, but PFScalibration[*] is Free +

    There are other tools for merging bracketed images, but PFScalibration[*] is Free Software and does the job.

    The steps outlined below for assembling HDR images can also be -performed with the qtpfsgui[*] GUI tool. +performed with the qtpfsgui[*] GUI tool.

    Calibrating the camera response curve

    Generally when a digital camera creates a JPEG or TIFF file, it takes a @@ -165,14 +146,8 @@

    Stitching with hugin

    The RGBE images can be loaded into hugin as per usual with a couple of caveats:

    -
      -
    • Everything may appear very dark since our images represent linear sensor data. The display of HDR images can be configured in the Hugin Preferences. -
      • -
    -
      -
    • Information about the Field of View was lost, so this will need to be re-entered manually or re-optimised. -
      • -
    +
    • Everything may appear very dark since our images represent linear sensor data. The display of HDR images can be configured in the Hugin Preferences.
    +
    • Information about the Field of View was lost, so this will need to be re-entered manually or re-optimised.

    Stitch the images as per usual into a TIFF file, you can use enblend as the final step.

    @@ -184,9 +159,9 @@ 3d rendering, in which case you are now done.

    Adjusting in a GUI tool

    -

    There are various image editors that can open this file such as cinepaint[*], -krita[*], vips[*] and HDRIE[*]. The capabilities vary so you need to experiment. -

    Alternatively, use pfstools[*] to manipulate the image: pfstools has the +

    There are various image editors that can open this file such as cinepaint[*], +krita[*], vips[*] and HDRIE[*]. The capabilities vary so you need to experiment. +

    Alternatively, use pfstools[*] to manipulate the image: pfstools has the facility to read HDR TIFF files.

    An HDR image can be viewed using pfstools using:

    @@ -196,34 +171,40 @@ adjust the exposure slider until you see a good range of shadows and highlights, zoom 1:1 and save as PNG.

    Tone mapping

    -

    tone mapping operations use HDR compression[*] to compress high dynamic range images. +

    tone mapping operations use HDR compression[*] to compress high dynamic range images.

    Note that local tone mapping operators produce strange artefacts in the zenith and -nadir of equirectangular images. So either choose a global tone mapping operator or +nadir of equirectangular images. So either choose a global tone mapping operator or retouch the poles afterwards. -

    A related package to pfstools[*] called pfstmo can do automatic tone mapping +

    A related package to pfstools[*] called pfstmo can do automatic tone mapping of an HDR image and compress it into a low dynamic range output. There are many options and techniques available, commands look like this: 

     pfsinrgbe stitch.hdr | pfstmo_drago03 | pfsgamma -g 2.2 | pfsout stitch.png
    -

    qtpfsgui[*] is an open source GUI for pfstools[*] and can perform +

    qtpfsgui[*] is an open source GUI for pfstools[*] and can perform tone mapping interactively. -

    Photomatix[*] also can perform tone mapping. +

    Photomatix[*] also can perform tone mapping.

    - +
    This article is out of date. You can help Panotools Wiki by expanding it. -
    +

    Once the article is ok feel free to remove the {{Outdated}} template -

    +

    + +
- -
- Retrieved from "http://wiki.panotools.org/index.php?title=HDR_workflow_with_hugin&oldid=12428[*]"
-
\ No newline at end of file +
+ Retrieved from "https://wiki.panotools.org/index.php?title=HDR_workflow_with_hugin&oldid=12428"
+
\ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk 2019-01-05 17:42:52.000000000 +0000 @@ -456,6 +456,11 @@
  • + + + + +
  • @@ -862,6 +867,13 @@ + + + +
  • + + +
  • @@ -952,13 +964,13 @@
  • - - + +
  • - - + +
  • diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc 2019-01-05 17:43:05.000000000 +0000 @@ -69,6 +69,10 @@ +
  • + + +
  • @@ -216,6 +220,10 @@
  • + + + +
    • @@ -346,8 +354,8 @@
    • - - + +
  • diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html 2017-04-22 17:02:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Horizontal_control_points.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,49 +1,50 @@ - + Horizontal control points - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Horizontal control points

    -
    -
    From PanoTools.org Wiki
    +

    Horizontal control points

    +
    From PanoTools.org Wiki
    - -


    +


    The panorama tools optimizer understands various different schemes for aligning photos using control points: Normal points are t0 points, horizontal control points are t1 points, vertical control points are t2 points, and straight line control points are t3, t4, etc... points. -

    The main use of horizontal control points is to change the perspective of the output panorama such that the marked structures are horizontal in the output projection[*]. In a multi image panorama this is only possible if the optimization of Roll and Pitch is allowed for all images and of Yaw for all but the anchor image. -

    You set horizontal control points on a horizontal structure apart from each other. However, be careful in a cylindrical or equirectangular panorama not to set them 180° apart, since this won't level the horizon. -

    Please note that all real world horizontal lines only stay horizontal in rectilinear[*] projection. In cylindrical, equirectangular and fisheye[*] projections only the horizon itself stays horizontal. -

    More details in Perspective correction and Panotools internals[*] +

    The main use of horizontal control points is to change the perspective of the output panorama such that the marked structures are horizontal in the output projection[*]. In a multi image panorama this is only possible if the optimization of Roll and Pitch is allowed for all images and of Yaw for all but the anchor image. +

    You set horizontal control points on a horizontal structure apart from each other. However, be careful in a cylindrical or equirectangular panorama not to set them 180° apart, since this won't level the horizon. +

    Please note that all real world horizontal lines only stay horizontal in rectilinear[*] projection. In cylindrical, equirectangular and fisheye[*] projections only the horizon itself stays horizontal. +

    More details in Perspective correction and Panotools internals[*]

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Horizontal_control_points&oldid=12316[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Horizontal_control_points&oldid=12316"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,43 +1,39 @@ - + Hugin Assistant tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Assistant tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Assistant tab

    +
    From PanoTools.org Wiki
    - -

    The Hugin assistant automates nearly everything needed to create +

    The Hugin assistant automates nearly everything needed to create a panorama; just follow the three steps described below the partial screen capture of the top half of the screen: -

    Hugin2013 assistant tab tophalf.png[*] +

    Hugin2013 assistant tab tophalf.png[*]

    1. Load images...

    Click on the Load images... button to select the photos you want to use in your panorama. -

    This tries to identify the field of view[*] of your photos by looking at (EXIF) information stored by +

    This tries to identify the field of view[*] of your photos by looking at (EXIF) information stored by the camera itself. If this fails, you need to enter the field of view manually, or let Hugin calculate it from the Focal Length and Focal length multiplier.

    Also select a matching Lens type from the drop-down list. If you are unsure, try the default Normal (rectilinear).

    @@ -50,7 +46,7 @@ quality settings. If you click the Create panorama button the new stitch popup sub-screen will be displayed. This will give you an easy to understand overview of the options.

    -
    [*]
    [*]
    Screenshot of the Create Panorama popup; click for larger versions
    +
    [*]
    [*]
    Screenshot of the Create Panorama popup; click for larger versions


    Note that in Simple User interface mode only the top option Exposure corrected, low dynamic range is enabled.

    @@ -63,7 +59,7 @@


    Overview

    -
    [*]
    [*]
    Screenshot of Overview in Panosphere mode
    +
    [*]
    [*]
    Screenshot of Overview in Panosphere mode

    The Overview represents an interactive preview of the panorama.

    Note: Slightly above the image of the sphere you see a dropdown currently mentioning mode: Panosphere (which is the default mode). This dropdown menu is only available in Expert mode. In Expert mode you can choose between the default Panosphere and the Mosaic plane mode.

    To show or hide the docked Overview window, check or uncheck the "Overview" checkbox option from the "View" menu. Zoom it by dragging the handle located at the center of the border to the preview canvas. @@ -76,8 +72,13 @@

    The preview canvas displays a representation of the final stitched output panorama. Use the scroll bars to change the horizontal and vertical Field of View.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Assistant_tab&oldid=15003[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Assistant_tab&oldid=15003"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,40 +1,36 @@ - + Hugin Batch Processor - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Batch Processor

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Batch Processor

    +
    From PanoTools.org Wiki
    - -

    Batch Processor is a component of hugin that provides functionality to stitch multiple projects in a batch queue. Its goal is to make stitching of multiple projects faster. The process of stitching multiple projects is simplified using a queue of projects. User can add/edit/delete projects in the queue. +

    Batch Processor is a component of hugin that provides functionality to stitch multiple projects in a batch queue. Its goal is to make stitching of multiple projects faster. The process of stitching multiple projects is simplified using a queue of projects. User can add/edit/delete projects in the queue. The Batch Processor can also queue the creation of the final project. In this case it runs the same steps as in the Hugin Assistant tab.

    Hugin Batch Processor consists of a list of projects. Projects in the list are ordered in sequential order. By default, the list is reinstated every time you open the application. What is more, entire queue of projects can be saved and reopened later using buttons Clear Batch, Open Batch, Save Batch.

    -

    Contents

    +

    Contents

    • 1 Installation on Mac OS X
    • 2 Usage
      • @@ -64,61 +60,36 @@

      Just create several project files (do everything and just skip the export step), load them in the batch processor and start the process. This way you can run several large projects unattended. The output file name will be the same as the name of the corresponding project file (xyz.pto -> xyz.tif) and is saved in the same folder.

      At least on Mac OS X there are some minor issues to pay attention to (This should be fixed in 2011.1, rev. 43043d2742e4):

      -
        -
      • You should only add the project files you want to process by using the "add project" (see below) or the menu "File - Add Project". Be aware that you will not be able to delete or deactivate a single project from the list - you will have to clean up the whole list using the menu "File - Clean List".
        If you want to process all projects inside a folder, just use the "folder search" (see below). -
        • -
      • Some older entries in PTBatcherGUI's list view (those with status "File missing") may not be removable by clicking the 'minus' symbol or the "Remove complete" button.
        To remove those just close PTBatcherGui, open it again and immediately select one of the missing pto files and start deleting them using the 'minus' symbol. As an alternative, use the button "Remove completed" on the right side which will remove all completed projects in one go. -
        • -
      +
      • You should only add the project files you want to process by using the "add project" (see below) or the menu "File - Add Project". Be aware that you will not be able to delete or deactivate a single project from the list - you will have to clean up the whole list using the menu "File - Clean List".
        If you want to process all projects inside a folder, just use the "folder search" (see below).
        • +
      • Some older entries in PTBatcherGUI's list view (those with status "File missing") may not be removable by clicking the 'minus' symbol or the "Remove complete" button.
        To remove those just close PTBatcherGui, open it again and immediately select one of the missing pto files and start deleting them using the 'minus' symbol. As an alternative, use the button "Remove completed" on the right side which will remove all completed projects in one go.


      Apart from this, all works fine.

      Flag options

      Batch process is also influenced by the following check boxes:

      -
        -
      • parallel execution: Execute stitching of projects in the list parallel rather than in sequential order. Check this only if you are certain your computer is up for the task of stitching multiple projects at the same time. -
        • -
      • overwrite always: Always(for each project) overwrite output filename if it exists. Otherwise, you will get a dialog box whether you want to overwrite files or not. -
        • -
      • Shutdown when done: Turn off computer when batch process ends. -
        • -
      • Remove finished projects: If checked successful finished projects will be automatic removed from the queue. Otherwise the items remains in the queue and the user is responsible for the queue management. -
        • -
      • Automatic stitch after assistant: If checked successful detected projects (projects in the assistant queue) will be added the stitching queue and will therefore automatically stitched. -
        • -
      +
      • parallel execution: Execute stitching of projects in the list parallel rather than in sequential order. Check this only if you are certain your computer is up for the task of stitching multiple projects at the same time.
        • +
      • overwrite always: Always(for each project) overwrite output filename if it exists. Otherwise, you will get a dialog box whether you want to overwrite files or not.
        • +
      • Shutdown when done: Turn off computer when batch process ends.
        • +
      • Remove finished projects: If checked successful finished projects will be automatic removed from the queue. Otherwise the items remains in the queue and the user is responsible for the queue management.
        • +
      • Automatic stitch after assistant: If checked successful detected projects (projects in the assistant queue) will be added the stitching queue and will therefore automatically stitched.

      Functions

      Queue management

      The management of the queue can done by the appropriate menu items or by the corresponding toolbar buttons.

      -
        -
      • Add project files to queue -
        • -
      • Remove project file from queue (you need to select the project file in the list) -
        • -
      • The complete queue list can be saved and loaded from disc (The current active list is automatically saved at the end. You don't need to save it explicitly.) -
        • -
      • The complete list can be cleared. -
        • -
      +
      • Add project files to queue
        • +
      • Remove project file from queue (you need to select the project file in the list)
        • +
      • The complete queue list can be saved and loaded from disc (The current active list is automatically saved at the end. You don't need to save it explicitly.)
        • +
      • The complete list can be cleared.

      Item management

      The single items in the queue can be modified by the buttons on the right side of the window

      -
        -
      • Remove complete will remove all items form the queue which were successfully finished. -
        • -
      • Change prefix will change the output prefix. This is only possible if the item is in the stitching queue. It does not work for items in the assistant queue. -
        • -
      • Reset project/Reset all resets the status of the selected project/all projects to default value. This allows to execute the stitching again. -
        • -
      • Edit with Hugin opens the selected in Hugin to modify it. -
        • -
      • The order of the items can be change with Move project up and Move project down -
        • -
      • You can also add an arbitrary command to the queue with Add application. -
        • -
      +
      • Remove complete will remove all items form the queue which were successfully finished.
        • +
      • Change prefix will change the output prefix. This is only possible if the item is in the stitching queue. It does not work for items in the assistant queue.
        • +
      • Reset project/Reset all resets the status of the selected project/all projects to default value. This allows to execute the stitching again.
        • +
      • Edit with Hugin opens the selected in Hugin to modify it.
        • +
      • The order of the items can be change with Move project up and Move project down
        • +
      • You can also add an arbitrary command to the queue with Add application.

      Executing queue

      The queue can be started, paused/resumed and stopped with the toolbar buttons. You can also skip one project. @@ -129,37 +100,24 @@

      Existing project files

      With File->Search directory for...->Projects you can search recursively in the given folder for (existing) project files and appends them to (stitching) queue.

      -

      Image sets (create project files)

      +

      Image sets (create project files)

      First select a folder in which PTBatcherGui should search for image sets. After pressing start it will search for image files in the folder (and optionally its sub folders). It uses the information stored in the EXIF data to decide which images could belong to a an image set forming a panorama. This works only in one folder level, it does not match images in different folders. (The algorithm uses camera maker, camera model, focal length, image size and date/time for this decision.)

      After the search has finished it shows a list of the found panoramas. With Send selected panoramas to queue the project files are created and sent to the assistant queue. You can deselect individual panoramas from this processing step by untick the panorama.

      The project files are named with the selected name scheme

      -
        -
      • PanoramaXX.pto: This will generate project files: panorama0.pto, panorama1.pto,... -
        • -
      • First file - last file.pto: The project files will by named by the first and last image of the panorama. -
        • -
      • Foldername.pto: In this case the project file is named like the containing folder. -
        • -
      • Template from preferences: This will use the template defined in the preferences of Hugin. -
        • -
      +
      • PanoramaXX.pto: This will generate project files: panorama0.pto, panorama1.pto,...
        • +
      • First file - last file.pto: The project files will by named by the first and last image of the panorama.
        • +
      • Foldername.pto: In this case the project file is named like the containing folder.
        • +
      • Template from preferences: This will use the template defined in the preferences of Hugin.

      Existing project files will not be overwritten, instead it appends an increasing number.

      If the images are shot with auto bracketing it tries to generate the appropriate stacks. In this case check that your default control point generator setting is such that it works with stacks (check Preferences in Hugin and control point detector parameters).

      On the options tab you can fine-tune the algorithm:

      -
        -
      • Minimum number of images: This is the minimal number of images a sequence of consecutive images must have to be detected as panorama. -
        • -
      • Maximum time difference: The maximal time between 2 images to be detected as consecutive/related images. -
        • -
      • Create links: Select this option, if you shoot from a tripod. This will link the positions of all images of one stack. If you deselect this option, it will create the stacks but will not link the positions of the images (e.g. when shooting free hand). -
        • -
      • Load distortion data: Try to automatic load distortion data from lens database. Otherwise the distortion values are initialized to zero and will be calculated by the optimizer. -
        • -
      • Load vignetting data: Try to automatic load vignetting data from lens database. Otherwise the distortion values are initialized to zero and are calculated by the optimizer. -
        • -
      +
      • Minimum number of images: This is the minimal number of images a sequence of consecutive images must have to be detected as panorama.
        • +
      • Maximum time difference: The maximal time between 2 images to be detected as consecutive/related images.
        • +
      • Create links: Select this option, if you shoot from a tripod. This will link the positions of all images of one stack. If you deselect this option, it will create the stacks but will not link the positions of the images (e.g. when shooting free hand).
        • +
      • Load distortion data: Try to automatic load distortion data from lens database. Otherwise the distortion values are initialized to zero and will be calculated by the optimizer.
        • +
      • Load vignetting data: Try to automatic load vignetting data from lens database. Otherwise the distortion values are initialized to zero and are calculated by the optimizer.

      If you set the tickmark Automatic stitch after assistant, PTBatcherGui will first run the assistant on all found panoramas, thereby creating the complete project files, and then stitch all created projects.

      Command line switches

      @@ -193,27 +151,22 @@

      Some of the above described options can be accessed also by command line switches:

      -
        -
      • /h, --help show this help message -
        • -
      • /b, --batch run batch immediately -
        • -
      • /p, --parallel run batch projects in parallel -
        • -
      • /d, --delete delete *.pto files after stitching -
        • -
      • /o, --overwrite overwrite previous files without asking -
        • -
      • /s, --shutdown shutdown computer after batch is complete -
        • -
      • /v, --verbose show verbose output when processing projects -
        • -
      +
      • /h, --help show this help message
        • +
      • /b, --batch run batch immediately
        • +
      • /p, --parallel run batch projects in parallel
        • +
      • /d, --delete delete *.pto files after stitching
        • +
      • /o, --overwrite overwrite previous files without asking
        • +
      • /s, --shutdown shutdown computer after batch is complete
        • +
      • /v, --verbose show verbose output when processing projects

      Please keep in mind that only one instance of PTBatcherGUI can run at one time. Starting PTBatcherGUI a second time with command line switches will influence the already running instance and not start a second instance with own options.

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Batch_Processor&oldid=15612[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Batch_Processor&oldid=15612"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Control Points tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Control Points tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Control Points tab

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    About Control points

    -

    Control points are central to Panorama Tools[*] and hugin, because they are used to estimate the position of image position and lens parameters described above. +

    Control points are central to Panorama Tools[*] and hugin, because they are used to estimate the position of image position and lens parameters described above. A control point specifies a corresponding point between two images. Using these corresponding points, the Optimiser tab can estimate the image position and lens parameters. It is therefore important that the control points are accurate and usually at least 3 well distributed control points should be used to estimate the image position (yaw, roll and pitch) and maybe the HFOV. For accurate estimation of the a,b,c distortion parameters, many well distributed control points, and a large overlap (up to 50%) are required. @@ -77,18 +73,13 @@ This is very useful if control points are set using the 100% zoom level.

    Control point creation is also influenced by the following check boxes:

    -
      -
    • auto fine tune hugin helps you to find the second point by looking for it in a search region (shown by a rectangle around the cursor). This might not always work, but usually is reliable, if the image distortions are not too big. Try and play with it. -
      • -
    • auto add A control point is automatically added when both points are known. You won't have time to refine the selection before adding the point. -
      • -
    • auto estimate Tries to estimate the position of the second point by estimating the rotation between the two images. -
      • -
    +
    • auto fine tune hugin helps you to find the second point by looking for it in a search region (shown by a rectangle around the cursor). This might not always work, but usually is reliable, if the image distortions are not too big. Try and play with it.
      • +
    • auto add A control point is automatically added when both points are known. You won't have time to refine the selection before adding the point.
      • +
    • auto estimate Tries to estimate the position of the second point by estimating the rotation between the two images.

    All these flags can be combined. I typically use auto fine tune and auto estimate at the same time. Then hugin usually automatically selects the second point correctly, at least for normal, Rectilinear Projection images that are not rotated too much.

    hugin also includes an experimental control points creation algorithm. -It can be invoked by pressing the g key. Corners in the currently selected image are detected, and corresponding control points are set based on the current relative positions of the two images. The images need to be approximately aligned already for this to be useful. Note that these points then need to be aligned by eye, with the Fine-tune button or with the Fine-tune all Points function in the Edit menu of the Panorama editor. +It can be invoked by pressing the g key. Corners in the currently selected image are detected, and corresponding control points are set based on the current relative positions of the two images. The images need to be approximately aligned already for this to be useful. Note that these points then need to be aligned by eye, with the Fine-tune button or with the Fine-tune all Points function in the Edit menu of the Panorama editor.

    Control point modes

    Use the mode pull down menu to change the type of an existing pair of control points. @@ -107,19 +98,13 @@ if they are in different photos then you will need to set the mode manually. To put two control points in the same image, select that image in both the left and right viewing panes.

    To manually create vertical control points or horizontal control points,

    -
      -
    1. Click on one image to create a control point, and put it at one end of the line (eg, the top of the line or the left hand end of the line). -
      2. -
    2. Create a point in the other image, but don't put it in the location that corresponds to the first control point. Instead, put it at the other end of the line (eg, the bottom of the line, or its right hand end). -
      3. -
    3. Click "Add" to add the pair of control points. -
      4. -
    4. In the list of control points, select the pair that you just created, and use the mode pull down menu to select either "Horizontal Line" or "Vertical Line". -
      5. -
    +
    1. Click on one image to create a control point, and put it at one end of the line (eg, the top of the line or the left hand end of the line).
      2. +
    2. Create a point in the other image, but don't put it in the location that corresponds to the first control point. Instead, put it at the other end of the line (eg, the bottom of the line, or its right hand end).
      3. +
    3. Click "Add" to add the pair of control points.
      4. +
    4. In the list of control points, select the pair that you just created, and use the mode pull down menu to select either "Horizontal Line" or "Vertical Line".

    If the same image is shown on both side, vertical and horizontal control points can be added by dragging a line with pressed alt key. The line is automatically added, the auto add option is ignored in this case. -

    Typically horizontal and vertical points are used either to level a spherical panorama[*] +

    Typically horizontal and vertical points are used either to level a spherical panorama[*] or to correct perspective.

    Straight line control points

    @@ -135,54 +120,36 @@

    Here is a summary of the keyboard shortcuts available in the Control Point tab:

    Key Function

    -
      -
    • a add a new point that has been selected in both images, and the auto add is switched off. -
      • -
    • f fine tune currently selected control point pair. Same as the Fine Tune button -
      • -
    • g experimental control point generation algorithm. -
      • -
    • Del Remove currently selected control point. -
      • -
    • 0 Zoom out to full view. -
      • -
    • 1 100% view. -
      • -
    • 2 200% view. -
      • -
    • arrow keys nudge a selection point or selected control point around pixel-by-pixel. -
      • -
    • shift + arrow keys scroll both images at the same time. -
      • -
    • Ctrl + left arrow and Ctrl + right arrow switch to the next pair of photos. -
      • -
    +
    • a add a new point that has been selected in both images, and the auto add is switched off.
      • +
    • f fine tune currently selected control point pair. Same as the Fine Tune button
      • +
    • g experimental control point generation algorithm.
      • +
    • Del Remove currently selected control point.
      • +
    • 0 Zoom out to full view.
      • +
    • 1 100% view.
      • +
    • 2 200% view.
      • +
    • arrow keys nudge a selection point or selected control point around pixel-by-pixel.
      • +
    • shift + arrow keys scroll both images at the same time.
      • +
    • Ctrl + left arrow and Ctrl + right arrow switch to the next pair of photos.

    Mouse function Function

    -
      -
    • control key + mouse movement Scroll image under cursor -
      • -
    • shift key + mouse movement Scroll both images -
      • -
    • left button Use left mouse button to select new points or drag existing points. -
      • -
    • right mouse button Add control point, if auto add is switched off -
      • -
    • middle mouse button Scroll image under cursor -
      • -
    • shift key + middle mouse button Scroll both images -
      • -
    • control key + right mouse button Remove control points in selected rectangle -
      • -
    • alt key + drag left mouse button Add line control point (only if the same image is displayed on both sides) -
      • -
    +
    • control key + mouse movement Scroll image under cursor
      • +
    • shift key + mouse movement Scroll both images
      • +
    • left button Use left mouse button to select new points or drag existing points.
      • +
    • right mouse button Add control point, if auto add is switched off
      • +
    • middle mouse button Scroll image under cursor
      • +
    • shift key + middle mouse button Scroll both images
      • +
    • control key + right mouse button Remove control points in selected rectangle
      • +
    • alt key + drag left mouse button Add line control point (only if the same image is displayed on both sides)


    On Mac OS use the command key instead of the control key.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Control_Points_tab&oldid=15763[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Control_Points_tab&oldid=15763"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,53 +1,41 @@ - + Hugin Control Points table - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Control Points table

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Control Points table

    +
    From PanoTools.org Wiki
    - -

    The hugin Control Points table is an optional pop-up window listing all the control points +

    The hugin Control Points table is an optional pop-up window listing all the control points in the project, whereas the hugin Control Points tab shows only those points joining a pair of images.

    The list of points can be sorted by clicking on one of the column titles, clicking twice will reverse the sort:

    -
      -
    • G CP#, the global (project-wide) index number of the control point pair, deleting points will renumber the list. -
      • -
    • Left Img., the index number of the first image in the pair (left/right has no significance except that this is the order they are shown in the hugin Control Points tab). -
      • -
    • Right Img., the index number of the second image in the pair. -
      • -
    • P CP#, the local index number (of two images shown in the Hugin Control Points tab) of the control point pair, deleting points will renumber the list. -
      • -
    • Alignment, the type of control point, these can be normal control points, horizontal control points, vertical control points or straight line control points. -
      • -
    • Distance, the distance in pixels between a perfect alignment and the actual alignment achieved by the optimiser. Otherwise, after selecting Fine-tune all Points from the Edit menu, this column shows the correlation between the points (0.0 indicates no correlation and 1.00 indicates 100% correlation) - Typically values over 0.8 show that the image areas around each point of the pair are very similar (an 80% correlation). -
      • -
    +
    • G CP#, the global (project-wide) index number of the control point pair, deleting points will renumber the list.
      • +
    • Left Img., the index number of the first image in the pair (left/right has no significance except that this is the order they are shown in the hugin Control Points tab).
      • +
    • Right Img., the index number of the second image in the pair.
      • +
    • P CP#, the local index number (of two images shown in the Hugin Control Points tab) of the control point pair, deleting points will renumber the list.
      • +
    • Alignment, the type of control point, these can be normal control points, horizontal control points, vertical control points or straight line control points.
      • +
    • Distance, the distance in pixels between a perfect alignment and the actual alignment achieved by the optimiser. Otherwise, after selecting Fine-tune all Points from the Edit menu, this column shows the correlation between the points (0.0 indicates no correlation and 1.00 indicates 100% correlation) - Typically values over 0.8 show that the image areas around each point of the pair are very similar (an 80% correlation).

    Selecting a row in the table will display the relevant pair of images in the hugin Control Points tab and highlight the control point in red.

    Clicking delete will remove any selected points/rows from the project. @@ -55,18 +43,17 @@ can select a range of rows with the Shift key.

    Clicking Select by Distance allows you to select all the points depending on the value in the Distance column, eg:

    -
      -
    • Enter 10 to select all the points with an optimiser error greater than ten pixels. -
      • -
    • Enter -5 to select all points with an optimiser error less than five pixels. -
      • -
    • Enter -0.8 to select all points with a fine-tune correlation less than 80%. -
      • -
    - - +
    • Enter 10 to select all the points with an optimiser error greater than ten pixels.
      • +
    • Enter -5 to select all points with an optimiser error less than five pixels.
      • +
    • Enter -0.8 to select all points with a fine-tune correlation less than 80%.
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Control_Points_table&oldid=11394[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Control_Points_table&oldid=11394"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,49 +1,50 @@ - + Hugin Crop tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Crop tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Crop tab

    +
    From PanoTools.org Wiki
    - -

    Use the Crop tab to indicate the area of the panorama that should be used as output. This crop tab doesn't work on the individual images but on the entire panorama. +

    Use the Crop tab to indicate the area of the panorama that should be used as output. This crop tab doesn't work on the individual images but on the entire panorama.

    -
    [*]
    [*]
    Screenshot of the Crop tab; click for larger image
    +
    [*]
    [*]
    Screenshot of the Crop tab; click for larger image


    The "Autocrop" and "HDR Autocrop" buttons will adjust the crop rectangle so that it is entirely within the image area, i.e. there will be no "black" borders in the final stitched image (In other words: it determines the maximum number of pixels having no empty, black space). It does this by maximising the area of the rectangle rather than the width or height. This is automatically done when running the Hugin Assistant tab.

    To change the cropping at each edge, move the mouse towards that edge until a semi-transparant white box appears along it; then drag with the left mouse button until the edge is where you want it. The area outside the dragging rectangle represents the areas that will be cropped off the panorama. You can move two edges at once by moving the mouse towards the corner shared by the edges until both white boxes appear. If you wish to move the whole region at once, move the mouse into the middle so that all four edges have boxes along them and drag. -

    This Hugin Crop tab also has the option to display guides in the preview to help you crop the panorama until the composition applies to for example the "rule of thirds." +

    This Hugin Crop tab also has the option to display guides in the preview to help you crop the panorama until the composition applies to for example the "rule of thirds."

    Note: Cropping the panorama shouldn't be confused with a camera's Crop factor, which is something else entirely. -

    Note 2: This Hugin Crop tab is not for cropping individual images, like you would do for e.g. fisheye Projection images having a circular area in the middle with a useless black area outside or scanned images that might have edges that need to +

    Note 2: This Hugin Crop tab is not for cropping individual images, like you would do for e.g. fisheye Projection images having a circular area in the middle with a useless black area outside or scanned images that might have edges that need to be cropped away.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Crop_tab&oldid=14943[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Crop_tab&oldid=14943"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_executor.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_executor.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_executor.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_executor.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,37 +1,33 @@ - + Hugin executor - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin executor

    -
    -
    From PanoTools.org Wiki
    +

    Hugin executor

    +
    From PanoTools.org Wiki
    - -

    hugin_executor is a tool for command line stitching or for running the assistant from the command line. It generates a set of commands and subsequently runs the commands. -

    It is available in Hugin 2015.0 and later. (Hugin versions up to 2014.0 use pto2mk[*] for command line stitching.) +

    hugin_executor is a tool for command line stitching or for running the assistant from the command line. It generates a set of commands and subsequently runs the commands. +

    It is available in Hugin 2015.0 and later. (Hugin versions up to 2014.0 use pto2mk[*] for command line stitching.)

    Command line stitching

    To stitch a project file from the command line use @@ -40,7 +36,7 @@

    It will use the settings in the project file and also in Hugins preferences dialog (e.g. exiftool settings). This is the same as using "Stitch!" from the stitcher tab.

    When no prefix is specified it will use the output prefix found in Hugin's preferences dialog. The default value for the output prefix is the filename (inclusive path) of the project file. -

    When adding the switch --user-defined-output=executor_file the default stitching is disabled and the steps defined in the executor_file are used instead (see user defined output sequence for more details). +

    When adding the switch --user-defined-output=executor_file the default stitching is disabled and the steps defined in the executor_file are used instead (see user defined output sequence for more details).

    Command line assistant

    The assistant can run on the command line with @@ -52,16 +48,16 @@

    The settings of the assistant can be changed in Hugins preferences dialog.

    Advanced options

    -
      -
    • --threads=NUM: Many of the individual tools are using as much threads as possible, e.g. on a 4 core processor it will use 4 threads. This behavior can be changed by setting the environment variable OMP_NUM_THREADS or set the switch --threads to reduce the CPU load. By default, all available threads will be used. -
      • -
    • --dry-run: By default hugin_executor executes all commands in sequence. For special scripting purposes you may need the individual commands. For this use case call hugin_executor with --dry-run switch. This will print all commands to the console, from where you can use them in your own scripts. -
      • -
    - - +
    • --threads=NUM: Many of the individual tools are using as much threads as possible, e.g. on a 4 core processor it will use 4 threads. This behavior can be changed by setting the environment variable OMP_NUM_THREADS or set the switch --threads to reduce the CPU load. By default, all available threads will be used.
      • +
    • --dry-run: By default hugin_executor executes all commands in sequence. For special scripting purposes you may need the individual commands. For this use case call hugin_executor with --dry-run switch. This will print all commands to the console, from where you can use them in your own scripts.
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_executor&oldid=15911[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_executor&oldid=15976"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,40 +1,36 @@ - + Hugin Exposure tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Exposure tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Exposure tab

    +
    From PanoTools.org Wiki
    - -

    As explained on the Hugin Photos tab, hugin has a brightness and colour correction system using the default nona stitching tool. +

    As explained on the Hugin Photos tab, hugin has a brightness and colour correction system using the default nona stitching tool.

    Hugin comes with an extended set of predefined settings for photometric optimisation. If these predefined options do not give the desired results you can define your custom parameters in this Hugin Exposure tab.

    The images list behaves very similar like the image list on the Photos tab. So can also in this tab add/remove images, change the lens or stack assignments, link or unlink image variables,... Beside the features of the list on the Photos tab it provides also in-place editing of single image variables. (Note: If you want to modify a value for a lens, you need to single-click the value, not double-click it.) If you want to change image variables from several images at once, select all affected images and choice Edit image variables... from the context menu.

    -

    Contents

    +

    Contents

    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Exposure_tab&oldid=14984[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Exposure_tab&oldid=14984"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html 2017-12-21 15:16:30.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,37 +1,32 @@ - + Hugin FAQ - PanoTools.org Wiki - + - + + + - -
    -
    -
    - - - -

    Hugin FAQ

    - -
    -
    From PanoTools.org Wiki
    - - - - -

    Contents

    + + +
    + + +

    Hugin FAQ

    +
    From PanoTools.org Wiki
    + +

    Contents

    • 1 Common error messages @@ -143,14 +139,14 @@

      enblend: excessive overlap detected

      This is an error new to enblend-4.0. Photos that nearly entirely overlap won't blend very well, enblend now fails instead of attempting to blend them. There are various workarounds:

      -
      • Follow the error message and remove the suggested image from the set, you probably don't need it to complete the panorama.
        • -
      • Switch back to enblend-3.2.
        • -
      • Hugin will merge stacked images before blending if you select 'Exposure fusion' in the Hugin Stitcher tab. This error will go away, but Hugin will take a very different approach to variable exposure between photos.
        • -
      • Mask out major parts of one image.
      +
      • Follow the error message and remove the suggested image from the set, you probably don't need it to complete the panorama.
        • +
      • Switch back to enblend-3.2.
        • +
      • Hugin will merge stacked images before blending if you select 'Exposure fusion' in the Hugin Stitcher tab. This error will go away, but Hugin will take a very different approach to variable exposure between photos.
        • +
      • Mask out major parts of one image.

      enblend: error writing to image swap file

      enblend needs a lot of memory and uses its own swap routine to store picture data on the disk, this message indicates that you have run out of disk space. The data is stored in the system temp folder which is specified by TMP, TEMP or TMPDIR environment variables, note that this temp folder may be on a different physical disk to your photos and panorama output.

      -

      Enblend error: Mask is entirely black, but white image was not identified as redundant

      +

      Enblend error: Mask is entirely black, but white image was not identified as redundant

      This is a well known "error" for enblend. Try to use the additional enblend parameter "--fine-mask" to get rid of the error. The parameter will result in generation of masks in higher resolution that will fix the problem in most cases. Sometimes the "--fine-mask" parameter may result in memory errors (malloc: ...), which are the result of not enough memory available due to the (much) bigger masks that are used.

      An alternative workaround would be to set the enblend --no-optimize parameter, this will place the seam directly along the middle of the image overlaps regardless of image content. This option is also considerably faster and uses less memory.

      This error also occurs when one photo is completely covered by another, try removing redundant photos. @@ -160,15 +156,14 @@

      enblend: Error -1073741795

      See #Enblend: The system cannot execute the specified command, in particular if you are a Windows user try switching to the 'nosse' enblend-enfuse.

      -

      nona: GL error: Framebuffer incomplete, incomplete attachment in:

      +

      nona: GL error: Framebuffer incomplete, incomplete attachment in:

      This is a message generated by nona when using the GPU for stitching (feature available starting with Hugin-2009.2.0). See section below about GPU-stitching.

      -

      Hugin Quits (Seg Faults) at Launch (Linux)

      +

      Hugin Quits (Seg Faults) at Launch (Linux)

      There may be many reasons why a program dies before it has even started.

      One possibility is bad configuration or installation of the video drivers. See this ticket. To diagnose, try running glxgears. On Ubuntu (the package is probably available on most Linux distributions):

      -
      -sudo apt-get mesa-utils
+
      sudo apt-get mesa-utils
 glxgears
 
      
 
      If glxgears does not run on your system, Hugin will not run either.  See your Linux distribution's instruction on how to fix the video drivers.
@@ -176,8 +171,8 @@
 
      Simple user interface can not selected
      
 
      There are two possible causes for this.
 
      
-
      •  Cause 1: your computer (exactly the graphic system) does not support the necessary OpenGL sub system. This may be the cause for some simple graphic chips or the driver does not implement the features. In the latter try to update your graphic driver.
        • 
-
      •  Cause 2: you have disabled the fast preview window during the last run of Hugin.
      
+
      • Cause 1: your computer (exactly the graphic system) does not support the necessary OpenGL sub system. This may be the cause for some simple graphic chips or the driver does not implement the features. In the latter try to update your graphic driver.
        • 
+
      • Cause 2: you have disabled the fast preview window during the last run of Hugin.
      
 
      To reactivate the fast preview window and therefore the simple user interface start Hugin with pressed control key and activate the fast preview window again. You may switch to simple user interface once.
 
      
 
      Known Limitations
      
@@ -202,14 +197,12 @@
 the project file.
 
      A partial workaround on Linux is to start Hugin from a terminal with
 
      
-
      -TMPDIR=/media/disk-2/tmp hugin &
+
      TMPDIR=/media/disk-2/tmp hugin &
 
      
 
      A workaround on Windows is to create a batch file which sets the temp folder before running Hugin.
 eg using notepad, create a file called HuginWithNewTemp.cmd with the following in it:
 
      
-
      -REM Create a folder on C Drive called Temp for this to work
+
      REM Create a folder on C Drive called Temp for this to work
 
 REM Set the temp file environment variables for hugin
 set temp=c:\temp
@@ -227,7 +220,7 @@
 
      OS X and iPhoto
      
 
      Dragging the photos from iPhoto to Hugin works perfectly as long as there is no forward slash in the Name of the events in iPhoto (which translates to folders inside the iPhoto Database).
 
      
-
      OS X 10.7 and Enblend / Enfuse
      
+
      OS X 10.7 and Enblend / Enfuse
      
 
      When using Hugin on Mac OS X 10.7 Lion with the built-in versions of enblend and enfuse (i.e. those packaged inside the hugin bundle) the stitching process will stop abruptly with an error. See bug 814280. The workaround is to use the enblend and enfuse versions for Mac OS X 10.4 Tiger that are inside the dmg in the enblend-enfuse-4.0 folder.
      
 Note: Development versions as of version hugin-mac-2011.5.0.5723 and newer can be run on Lion as they are. They contain openmp enabled enblend/enfuse binaries that run on Lion.
 
      
@@ -242,22 +235,21 @@
 
      This isn't so bad, the nadir-in-the-middle image looks a bit weird, you can just reload the stitched equirectangular Projection result into a new single-photo project and straighten it there.
 
      
 
      Python Scripting
      
-
      What is Python Scripting?
      
+
      What is Python Scripting?
      
 
      Python is a powerful scripting language.  Starting with Hugin 2011.2, Hugin exposes the panorama object through hsi.py in Python.  It must be explicitly activated at build time with the CMake boolean parameter -DBUILD_HSI:BOOL=ON.  It is currently untested / unavailable on OS X.
 
      
-
      How do I start Scripting?
      
-
      -$ python
+
      How do I start Scripting?
      
+
      $ python
 Python 2.7.1+ (r271:86832, Apr 11 2011, 18:13:53) 
 [GCC 4.5.2] on linux2
 Type "help", "copyright", "credits" or "license" for more information.
 >>> import hsi
 >>> help (hsi)
 
      
-
      What is the difference between a Plugin and a Script?
      
+
      What is the difference between a Plugin and a Script?
      
 
      Strictly speaking, they are both Python scripts.  A Plugin runs inside Hugin, while a Script runs in a shell or desktop.
 
      
-
      Where Are the Plugins in Hugin and how do I use them?
      
+
      Where Are the Plugins in Hugin and how do I use them?
      
 
      If Hugin was compiled with HSI, a menu Action will list categories of system-wide plugins.  Just select one to run it.  Moreover, you can write your own plugins and run them with the menu Edit -> Run User Python Plugin.  The default location for user plugins is set in the preferences.
 
      
 
      Script Returned -10
      
@@ -270,7 +262,7 @@
 sudo apt-get install libtiff-tools
 
      To find other errors start hugin from the Terminal, then repeat ysour steps and check the output in the Terminal.
 
      
-
      Why do I read of users having access to a certain action and I don't see it on my system?
      
+
      Why do I read of users having access to a certain action and I don't see it on my system?
      
 
      Some actions only work with specific versions of Hugin or operating systems.  It is possible that they have a different system than yours and that the plugin in question does not support your system.  Often times this is just a matter of lack of testing resources on a particular platform.  Help test the plugin and it may become accessible on your system as well.
 
      
 
      Control Point creation
      
@@ -296,10 +288,10 @@
 
      
 
      Click on left image. The image will be shown in 100% view. Within the detailed view, click on a prominent feature. If the image pair already contains control points, hugin will try to select the point in the other image. If its the first point in this pair, click near the same feature on the right image. The point will be placed and fine tuned automatically. If you are not happy with the placement, both points can be moved by clicking at the desired position. Move the point close to the desired feature and press the "f" key to fine tune the point. When the points are on the same feature, press the right mouse button, or press the "a" key to add the control point pair. It will then be shown in the list below the image.
 
      
-
      How do I scroll both images at the same time?
      
+
      How do I scroll both images at the same time?
      
 
      Try pressing the shift key while moving the mouse. The control key or the middle mouse button can be used to scroll only the image under the mouse cursor.
 
      
-
      How do I stop Hugin pausing for a moment after every click?
      
+
      How do I stop Hugin pausing for a moment after every click?
      
 
      The preview window updates continuously whenever anything changes, so disable the preview auto-update, close it or make it smaller if you don't need it.
 
      Otherwise, picking control points with auto fine tune selected can involve a lot
 of processing.  You can reduce this by selecting File -> Preferences -> Finetune and
@@ -307,7 +299,7 @@
 This means you can't be so sloppy when clicking to create control points, but the results will
 be the same.
 
      
-
      Windows: when user is not admin, not all cp-creators are available to choose from
      
+
      Windows: when user is not admin, not all cp-creators are available to choose from
      
 
      Preferences are stored in the registry on Windows. Every users has their own. To have all the cp-creator pre-sets like the admin users, hit the "Load defaults" button on the Control Points tab in the Preferences dialog.
 
      
 
      cpfind: not enough control points generated
      
@@ -326,13 +318,13 @@
 tab. Probably the problem is caused by bad alignment, you can
 identify 'bad' Control points in the Hugin Control Points table, delete them and re-optimise.
 
      
-
      How can I reuse a project as a template?
      
+
      How can I reuse a project as a template?
      
 
      If you copy a .pto project to a different folder and open it with hugin, you will be prompted for the 'missing' images.  You should delete any control points from this template project since they won't be relevant to the new photos.
 
      Alternatively you can load your images as normal, then Apply template
 from the File menu, this will import image settings and parameters
 from a previous project.
 
      
-
      How do I straighten a curved horizon?
      
+
      How do I straighten a curved horizon?
      
 
      If the panorama looks nice but the horizon is curved, there are various ways to improve the image and straighten the horizon.
 
      First, try clicking the Straighten button in the Hugin Fast Preview window.
 
      If this doesn't work then you can use the Move/Drag tab of the Hugin Fast Preview window to visually straighten the panorama, drag the photos with the mouse, use the right mouse button to rotate.  One useful tip is to drag the panorama so a vertical feature is in the middle, rotate it so the feature lines up with the 'cross hair', then drag the panorama up or down until all the vertical features in the scene are vertical on the screen (holding down the shift key while dragging limits the motion to just up/down or left/right).
@@ -340,17 +332,17 @@
 
      See also the related perspective correction tutorials: hugin tutorial on perspective correction, Perspective correction, Leveling a Finished Panorama[*]. While these are concerned with correction of the perspective in one image, the same technique can be used for
 leveling a panorama.
 
      
-
      Half the panorama is black, my pictures fill only the right half of the output
      
+
      Half the panorama is black, my pictures fill only the right half of the output
      
 
      Hugin uses the first photo as the anchor image and puts it in the middle by default.  This means that if you shot a sequence from left to right, the images will fill the right hand side of the panorama.  There are three ways to fix this:
 
      
-
      •  Open the preview window and click the center button.
        • 
-
      •  or select the middle photo, hit anchor this image for position and reset in the images tab, then reoptimise.
        • 
-
      •  In the 'Fast Panorama Preview' window select 'Drag'. Left mouse drags the image, right mouse rotates the image.
      
-
      I get visible bands in the sky and other flat areas, what can I do?
      
+
      • Open the preview window and click the center button.
        • 
+
      • or select the middle photo, hit anchor this image for position and reset in the images tab, then reoptimise.
        • 
+
      • In the 'Fast Panorama Preview' window select 'Drag'. Left mouse drags the image, right mouse rotates the image.
      
+
      I get visible bands in the sky and other flat areas, what can I do?
      
 
      If the banding looks like posterization[*] then this is likely due to a error with estimation of the camera response curve.  To get an accurate response curve, Hugin needs significant vignetting and/or bracketed exposures. The workaround is to Reset... the Camera Response in the Hugin Camera and Lens tab[*] and stitch again - Hugin usually produces acceptable results for a simple panorama when the camera response parameters are all zero.
 
      If there is a wave of light and dark patches in the sky this could be due to vignetting in the source photos, you can deal with this by optimising Vignetting (Vb, Vc, Vd) in the Hugin Exposure tab.  Another workaround is to increase the number of enblend blending levels, try setting '-l 29' as the enblend Command line options in the Hugin Stitcher tab.
 
      
-
      My photos never quite line up, what can I do?
      
+
      My photos never quite line up, what can I do?
      
 
      It is normal to get little stitching parallax errors if
 the camera moves between photos.  The solution is to rotate the camera around
 the no-parallax point using a panoramic head[*] or philopod[*].
@@ -365,20 +357,20 @@
 The shear tool is ideal for bending the lines and
 getting them to line up[*].
 
      
-
      I have extracted and edited cubefaces and want to merge them together again. How do I do that ?
      
+
      I have extracted and edited cubefaces and want to merge them together again. How do I do that ?
      
 
      Manually enter the values for yaw and pitch for each of the photos.  When you stitch set the enblend options in the Hugin Stitcher tab to -l1 --fine-mask --no-optimize
 
      
-
      Can I stitch my HDR images ?
      
+
      Can I stitch my HDR images ?
      
 
      Yes. If you already have merged your HDR stacks, follow the Normal Output on the Stitcher tab (HDR merging is for stacks that will be merged by Hugin). In the Processing step the output will be an HDR in TIFF format.
 
      
-
      Why is my panorama upside down ?
      
+
      Why is my panorama upside down ?
      
 
      Hugin stitches the panorama on a sphere and can't determine what is up or what is down. Even if vertical control points are assigned, there is still no notion of up and down, so the panorama can flip upside down. The solution for that is to open the Preview window, click on the Num. Trans. button in the toolbar, enter 180 in the roll field and apply. This will flip the panorama back to the right orientation.
 
      
-
      Why do multi-lens projects end up distorted/broken?
      
+
      Why do multi-lens projects end up distorted/broken?
      
 
      You have probably optimized 'Everything'. This will cause the optimizer to try to optimize lens parameters for each of the different lenses, and there may not be a big enough spread of control points for the optimization to work well.
 When stitching photos from different lenses, or when you don't have a good spread of control points, optimize 'Position, view & Barrel (y,p,r,v,b).
 
      
-
      Why does my output covers only 180°?
      
+
      Why does my output covers only 180°?
      
 
      Did you observe that the output is cropped at the +-90° borders? (e.g. saw teeth like borders in the fast preview window)
 
      Then you have probably used the translation parameters X/Y/Z. This behaviour is a fundamental limitation of the used approach of the translation parameters. It is (internal) working in the rectilinear space, which is limited to maximal FOV of 180°, and therefore also the output is limited to FOV<180° (for more information see Stitching a photo-mosaic).
 
      The solution/workaround is to set all X/Y/Z values to zero or to limit the horizontal field of view (HFOV) to a value smaller than 180°.
@@ -390,16 +382,16 @@
 
      To fix the issue there are several ways: In an existing project you can select reset from the context menu on the Photos tab.
 For a permanent fix you can manually save a correct lens information in the database (Photos tab, context menu Lens>Save lens to database). These manually save information will get a higher weight than the automatically saved information. If this does not help delete the database file, when Hugin is closed. You will find the filename in the Help>About screen, on the tab system. But keep in mind that these changes does not affect existing project files. You have to add the image (again) to a (new) project file (because the information is only read from the database when you add an images).
 
      
-
      GPU-stitching (nona)
      
+
      GPU-stitching (nona)
      
 
      Starting with Hugin-2009.2 nona has a new, experimental feature: it can use the video card (GPU) to accelerate the stitching. How much acceleration you will get, if any, depends on the combination of video card and driver.
 
      
-
      I get a nona: GL error. Does this mean that I found a bug?
      
+
      I get a nona: GL error. Does this mean that I found a bug?
      
 
      Not necessarily. This functionality is highly experimental. It may be that you have an outdated driver, or that the functionality is not supported on your video card. Note down the version of the driver you are using and the specs of your video card (GPU and RAM). Then update to the latest driver from nVidia or AMD (ATI has been bought by AMD). Currently only these two families of GPUs support the functionality.
 
      
-
      How can I know if nona-GPU works on my system?
      
+
      How can I know if nona-GPU works on my system?
      
 
      At the moment we have too little information to predict this. We know that only nVidia and AMD(ATI) powered video cards work, and not all of them. The more recent the video card, the higher the likelihood that it works. Improve your chances by updating to the latest driver for your GPU. Look at experience reports from other users and report your experience here[*].
 
      
-
      What speed improvement can I expect?
      
+
      What speed improvement can I expect?
      
 
      It depends on the video card. Bandwidth is mostly the bottleneck, specifically getting the transformed data from the GPU back to the main system memory.
 
      
 
      Bug Reporting
      
@@ -409,8 +401,8 @@
 
      Why do I need to give 2 file names
      
 
      The batch processor needs a project file with the settings how it should be stitch a panorama.
 
      
-
      •  So you will be first asked for a project file name (extension pto). 
        • 
-
      •  Afterwards you can specify the file name for the final panorama image file.
      
+
      • So you will be first asked for a project file name (extension pto).
        • 
+
      • Afterwards you can specify the file name for the final panorama image file.
      
 
      Why does PTBatcherGUI disappear after 10 s
      
 
      PTBatcherGUI does not disappear. Only the icon in the tray bar is automatically hidden by Windows.
 Click on the chevron beside the tray bar and configure it display PTBatcherGUI always (the exact settings depends on the Windows version.)
@@ -418,66 +410,74 @@
 
      PTBatcherGUI does not stitch
      
 
      In this case you need to check the batch processor settings:
 
      
-
      •  First check the preferences: on the tab stitching the processor PTBatcherGUI should be selected and the option immediately start shout
      
+
      • First check the preferences: on the tab stitching the processor PTBatcherGUI should be selected and the option immediately start shout
      
 
      be checked. (or press "Load defaults"). 
 
      
-
      •  Then start PTBatcherGUI (File->Run batch processor"). If you don't see a window, check the tray area (beside the clock) and open PTBatcherGUI from the context menu on the icon. Probably the batch queue is mixed up. Delete the queue (File->Clear batch). 
        • 
-
      •  Now go back to Hugin and press stitch. After specify the output prefix, the project should appear in PTBatcherGUI and the stitching starting. 
      
+
      • Then start PTBatcherGUI (File->Run batch processor"). If you don't see a window, check the tray area (beside the clock) and open PTBatcherGUI from the context menu on the icon. Probably the batch queue is mixed up. Delete the queue (File->Clear batch).
        • 
+
      • Now go back to Hugin and press stitch. After specify the output prefix, the project should appear in PTBatcherGUI and the stitching starting.
      
 
      How do I clean up the batch queue
      
-
      •  If PTBatcherGUI is running, select File->Clear batch.
        • 
-
      •  If PTBatcherGUI is not running, start PTBatcherGUI from the "File->Run batch processor" or from the start menu. During the starting hold down the control key. You there will be ask to skip the loading of the batch queue. Confirm yes to clean up the batch queue.
      
+
      • If PTBatcherGUI is running, select File->Clear batch.
        • 
+
      • If PTBatcherGUI is not running, start PTBatcherGUI from the "File->Run batch processor" or from the start menu. During the starting hold down the control key. You there will be ask to skip the loading of the batch queue. Confirm yes to clean up the batch queue.
      
 
      Postprocessing
      
-
      How can I postprocess the image using multiple layers in The Gimp?
      
-
      •  Use the nona stitcher on the command-line, to output to a multilayer TIFF format:
      
+
      How can I postprocess the image using multiple layers in The Gimp?
      
+
      • Use the nona stitcher on the command-line, to output to a multilayer TIFF format:
      
 
       nona -m TIFF_multilayer -o multi_layer.tif project.pto
 
      
 
      This will will produce a multi_layer.tif file, that contains all remapped images, cropped to their bounding box.
 
      
-
      •  Alternatively select the Remapped Images option in the Hugin Stitcher tab, this will create each layer as a separate file.  Then use the tiffcp command-line tool (part of libtiff) to join them together into a multi-page TIFF:
      
+
      • Alternatively select the Remapped Images option in the Hugin Stitcher tab, this will create each layer as a separate file.  Then use the tiffcp command-line tool (part of libtiff) to join them together into a multi-page TIFF:
      
 
       tiffcp project0000.tif project0001.tif project0002.tif multi_layer.tif
 
      
-
      •  You can also use tif2xcf[*], to combine the Remapped Images TIFF output into a multilayer XCF.
      
+
      • You can also use tif2xcf[*], to combine the Remapped Images TIFF output into a multilayer XCF.
      
 
      Unfortunately this requires a lot of memory because it stores each remapped image in a layer with the size of the final panorama.
 
      
-
      Why doesn't the remapped images align when loading in an image processing software?
      
+
      Why doesn't the remapped images align when loading in an image processing software?
      
 
      By default nona creates cropped TIFF files for the remapped files. Here only the rectangle which contains image information is saved and the offset is saved in the metadata. Some image processing software (e.g. The Gimp) does not read the offset when loading these images and so the images do not align perfectly here.
 
      If you want to process the remapped images in another program switch off the cropped output. For existing projects go to the stitcher tab, select blender, options and deselect cropped output.
 In the Hugin Preferences on program tab you can change the default for all new projects.
 
      
 
      Installation
      
-
      Where can I download hugin installers
      
+
      Where can I download hugin installers?
      
 
      Official releases are available from hugin.sf.net.
 
      
-
      How can I compile Hugin.app on my OSX machine?
      
+
      Why do you provide only a msi installer for Windows?
      
+
      The official binaries are compiled with MS Visual C++. They need the so called Visual C++ Redistributable for Visual Studio to run. These are helper libraries (DLL) provided by Microsoft. Maybe you have they already installed, because other programs may also depend on them. But often they are missing on your computer. The installer takes care of them and install the Visual C++ Redistributable for you when you install Hugin with the msi installer. (There are different Redistributable versions available for different versions of the compiler. The installer does contain the currently needed version.)
+
      For experts: You can extract the files from the installer without installing with msiexec:
+
      
+
       msiexec /a Hugin-2018.0-win64.msi /qb TARGETDIR=c:\path\to\directory
+
      
+
      This will extract all files into c:\path\to\directory. You will get 2 subfolders: Hugin and System64. Keep the sub-structure of the Hugin folder intact. You can copy this folder to any place on your hard disc. The System64 folders contains the files from the Visual C++ Redistributable for Visual Studio. Either install the correct Visual C++ Redistributable for Visual Studio (preferred way, for Hugin 2017.0 and 2018.0 the correct version is "Visual C++ Redistributable für Visual Studio 2015") or copy the dll from System64 to Hugin\bin.
+
      
+
      How can I compile Hugin.app on my OSX machine?
      
 
      See Hugin Compiling OSX[*], Autopano-sift-C Compiling OSX[*] and Enblend Compiling OSX[*].
 
      
-
      How do I compile hugin on my linux machine?
      
+
      How do I compile hugin on my linux machine?
      
 
      See Hugin Compiling Fedora[*], Hugin Compiling Gentoo[*], Hugin Compiling OpenSuse[*] and Hugin Compiling Ubuntu[*]
 
      
-
      make[2]: *** No rule to make target `/usr/lib/libGL.so', needed by `src/hugin_base/libhuginbase.so.0.0'.  Stop.
      
+
      make[2]: *** No rule to make target `/usr/lib/libGL.so', needed by `src/hugin_base/libhuginbase.so.0.0'.  Stop.
      
 
      So you're trying to build from source.  Most likely you have proprietary nVidia or ATI drivers.  They are a moving target and so is X.  On debian based systems including Ubuntu, diagnose with `dpkg -S /usr/lib/libGL.so` and check that the linked library exist (i.e. it is not listed in red when doing `ll /usr/lib/mesa/libGL.so`).  If it is listed in red, check where the library is (`ll /usr/lib/libGL*` is a good start on Ubuntu) and link it properly.
 
      
-
      How do I compile hugin on my Windows machine?
      
+
      How do I compile hugin on my Windows machine?
      
 
      See Hugin Compiling Windows[*]
 
      
-
      Enblend-Enfuse OpenMP SSE GPU: which one is the right one for me?
      
+
      Enblend-Enfuse OpenMP SSE GPU: which one is the right one for me?
      
 
      Enblend and Enfuse can be optimized at build time for different hardware configurations. This yields four categories of Enblend-Enfuse builds, with a few variations. If you build Enblend-Enfuse from source, check the build options in the README file. If you download a binary, you can find out how it has been built with the following command:
 
      
 
       enblend -v -V
 
      
 
      look for the following in the output text:
 
      
-
      1.  Extra feature: OpenMP: yes this version has OpenMP.
        2. 
-
      2.  Extra feature: image cache: yes this version has image cache
        3. 
-
      3.  Extra feature: GPU acceleration: yes this version has GPU support
        4. 
-
      4.  SSE-support is not mentioned, you'll find out if you have an unsupported CPU and the binary will refuse to run.
      
+
      1. Extra feature: OpenMP: yes this version has OpenMP.
        2. 
+
      2. Extra feature: image cache: yes this version has image cache
        3. 
+
      3. Extra feature: GPU acceleration: yes this version has GPU support
        4. 
+
      4. SSE-support is not mentioned, you'll find out if you have an unsupported CPU and the binary will refuse to run.
      
 
      These are approximate guidelines to help you choose what may work for you:
 
      
-
      •  if you have a recent, multi-core / multi-thread CPU, you probably want the OpenMP-enabled version. Note however that speed improvement does not scale well, so don't expect a 6 cores CPU to be 3x faster than a 2 cores one.
        • 
-
      •  if you have a recent, fast video card, you probably want the GPU-enabled version.   This is not mutually exclusive with OpenMP and a good builder will add both features to his binaries.  If speed is important to you, you want to test which of the two is faster on your system.  If system responsiveness is important to you, the GPU-enabled version frees CPU resources for your other tasks.  Note that even if your binary is GPU-enabled, the GPU will not be used unless you specify the option `--gpu`.
        • 
-
      •  if you have an old CPU without SSE2 support, you want a NOSSE build.  This is the least performing version.
        • 
-
      •  Last but not least, if blending fails because of large images, try the image cache variation.  The image cache allows for processing of large project when memory is scarce but images are large (and disk is large enough too).  Image cache is incompatible with OpenMP, but a good bilder will make this version GPU-enabled too, so test it with `--gpu` if speed is important.
      
-
      Selecting right version of enblend-enfuse binary for Debian/Ubuntu
      
+
      • if you have a recent, multi-core / multi-thread CPU, you probably want the OpenMP-enabled version. Note however that speed improvement does not scale well, so don't expect a 6 cores CPU to be 3x faster than a 2 cores one.
        • 
+
      • if you have a recent, fast video card, you probably want the GPU-enabled version.   This is not mutually exclusive with OpenMP and a good builder will add both features to his binaries.  If speed is important to you, you want to test which of the two is faster on your system.  If system responsiveness is important to you, the GPU-enabled version frees CPU resources for your other tasks.  Note that even if your binary is GPU-enabled, the GPU will not be used unless you specify the option `--gpu`.
        • 
+
      • if you have an old CPU without SSE2 support, you want a NOSSE build.  This is the least performing version.
        • 
+
      • Last but not least, if blending fails because of large images, try the image cache variation.  The image cache allows for processing of large project when memory is scarce but images are large (and disk is large enough too).  Image cache is incompatible with OpenMP, but a good bilder will make this version GPU-enabled too, so test it with `--gpu` if speed is important.
      
+
      Selecting right version of enblend-enfuse binary for Debian/Ubuntu
      
 
      At the time of writing the official Debian/Ubuntu package ships with one executable only, however in July 2010 a change has been committed to debian-unstable that delivers two binaries:
 
      1. enblend/enfuse
 
      These executables are the standard release.  They are using one processor core and the image cache for processing very big images. 
@@ -489,28 +489,31 @@
 
      Reporting Bugs
      
 
      If you think you have found a bug in Hugin, please report it on Launchpad to help us make Hugin better.  Before reporting a bug, try a few things to make sure it is really a bug.  Then collect the following information and transmit it to the developers via the bug tracker.
 
      
-
      1.  What version of Hugin are you using?  Consider upgrading and try to reproduce the bug.  Maybe it was fixed in a more recent version.
        2. 
-
      2.  read the output log.  Are there any suggested actions or messages in there?  If so, follow the advice and try again.  Save the output log to a text file and attach it to the report if you file a bug report. 
        3. 
-
      3.  Attach the .pto file to the bug report.
        4. 
-
      4.  Use a meaningful title for the bug report.  The line reporting the error in the output log is a good place to start.  Before filing a new bug report, check for duplicates.  Launchpad does already a little bit so.  If the bug is already known, add yourself and you files with a comment to the bug.  This will give your report and your log more visibility than if somebody looking at your bug has to mark it as duplicate.
      
-
      Why is my Bug Report marked Invalid?
      
+
      1. What version of Hugin are you using?  Consider upgrading and try to reproduce the bug.  Maybe it was fixed in a more recent version.
        2. 
+
      2. read the output log.  Are there any suggested actions or messages in there?  If so, follow the advice and try again.  Save the output log to a text file and attach it to the report if you file a bug report.
        3. 
+
      3. Attach the .pto file to the bug report.
        4. 
+
      4. Use a meaningful title for the bug report.  The line reporting the error in the output log is a good place to start.  Before filing a new bug report, check for duplicates.  Launchpad does already a little bit so.  If the bug is already known, add yourself and you files with a comment to the bug.  This will give your report and your log more visibility than if somebody looking at your bug has to mark it as duplicate.
      
+
      Why is my Bug Report marked Invalid?
      
 
      We trust you that you are experiencing the issue on your end and that it bugs you, but most likely the solution lies not in the Hugin codebase.  If you feel that your report has been marked Invalid by mistake, feel free to reply and to set the status back to New for a re-evaluation.  Somebody may explain to you why the report was marked as Invalid and what you can do.
 
      
-
      Why is my Bug Report marked Incomplete?
      
+
      Why is my Bug Report marked Incomplete?
      
 
      Every system is different and those trying to help fixing the bugs do not see and experience what you do.  In order to help you, they are likely to need more information.  Without that information the bug report is of little use.  We mark as Incomplete reports that require additional information.  Once you provide it, please mark the report status as New again
 
      
-
      How do I Change the Status of my Report?
      
-
      •  If you reply via the web interface:  hit the yellow round button next to the current status to get a selection of stati.  Unless you know what you are doing, set it to New to attract developer's attention.
        • 
-
      •  If you reply by email: at the bottom of your email enter a line starting with one single space and the following words:  status new.  Read more about the email interface.
      
+
      How do I Change the Status of my Report?
      
+
      • If you reply via the web interface:  hit the yellow round button next to the current status to get a selection of stati.  Unless you know what you are doing, set it to New to attract developer's attention.
        • 
+
      • If you reply by email: at the bottom of your email enter a line starting with one single space and the following words:  status new.  Read more about the email interface.
      
 
      User Support: Mailing List
      
 
      Hugin has a lively and friendly user groups.  Connect with expert users and ask questions on the Hugin-PTX mailing list.  To subscribe send an empty email to hugin-ptx+subscribe@googlegroups.com and follow the instructions in the email you receive back.
 To ask questions, send an email to hugin-ptx@googlegroups.com
 Your first emails will be moderated, so be patient if you don't see your message right away.
 
      
 
+
+
    - - -
    -Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_FAQ&oldid=16007"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_FAQ&oldid=16018"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Fast Preview window - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Fast Preview window

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Fast Preview window

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    • 1 Distinction
    • 2 General features @@ -84,29 +80,18 @@

      Distinction

      Like the more accurate Hugin Preview window, the fast preview shows something similar to the final stitched output, but with a few important differences:

      -
        -
      • The window features a row of tabs at the top, clicking on a tab switches between modes that allow you to interact with the panorama in different ways. -
        • -
      • Reduced resolution input images are used, so some areas can appear blurred that will be sharp in the final output. -
        • -
      • Seams are not created, images are simply overlaid with the first image at the bottom of the stack and the last at the top. -
        • -
      • Blending by a tool such as enblend isn't shown. -
        • -
      • The brightness display of HDR and 16bit images is controlled by settings in the hugin Preferences, these settings are not used when stitching. The colouring of these images will also be inaccurate when using exposure or white balance correction. For HDR panoramas, the Hugin Preview window is recommended instead. -
        • -
      • Only the first photo from each stack is visible (the others are hidden behind), if you want to see the combined stack then use the HDR mode of the Hugin Preview window instead. -
        • -
      • Photometric correction only includes white balance and exposure, unless full photometric correction is enabled with the the Photometrics button. -
        • -
      • The remappings are approximate, the output by a tool such as nona is more accurate. If this concerns you more than speed, use the Hugin Preview window instead. -
        • -
      • It's much faster ;-) -
        • -
      +
      • The window features a row of tabs at the top, clicking on a tab switches between modes that allow you to interact with the panorama in different ways.
        • +
      • Reduced resolution input images are used, so some areas can appear blurred that will be sharp in the final output.
        • +
      • Seams are not created, images are simply overlaid with the first image at the bottom of the stack and the last at the top.
        • +
      • Blending by a tool such as enblend isn't shown.
        • +
      • The brightness display of HDR and 16bit images is controlled by settings in the hugin Preferences, these settings are not used when stitching. The colouring of these images will also be inaccurate when using exposure or white balance correction. For HDR panoramas, the Hugin Preview window is recommended instead.
        • +
      • Only the first photo from each stack is visible (the others are hidden behind), if you want to see the combined stack then use the HDR mode of the Hugin Preview window instead.
        • +
      • Photometric correction only includes white balance and exposure, unless full photometric correction is enabled with the the Photometrics button.
        • +
      • The remappings are approximate, the output by a tool such as nona is more accurate. If this concerns you more than speed, use the Hugin Preview window instead.
        • +
      • It's much faster ;-)

      General features

      Overview

      -
      [*]
      [*]
      Screenshot of docked Overview in Panosphere mode
      +
      [*]
      [*]
      Screenshot of docked Overview in Panosphere mode

      The Overview introduced in Hugin 2011.0 represents an interactive preview of the panorama.

      Just click the button 'Show/Hide' to toggle the display the docked Overview window. Zoom it by dragging the handle located at the center of the border to the preview canvas.

      The 'Grid' checkbox can be used to toggle the grid overlay in both overview and the preview canvas. @@ -118,11 +103,11 @@

      Every input image in the preview has toggle button where display can be disabled or enabled.

      In addition, this display also controls the behaviour of the Optimiser tab and the Stitcher tab - Any photos disabled here are not used in optimisation or stitching.

      -

      Hugin preview show all.png[*] All

      +

      Hugin preview show all.png[*] All

      By default all input images are shown in the preview, however individual images can be enabled and disabled in the Displayed images section. Use the All button to return to the default and display all the images.

      -

      Hugin preview show none.png[*] None

      +

      Hugin preview show none.png[*] None

      Similarly, hide all images with the None button, use this if you want to enable preview images one by one.

      Preview canvas

      @@ -132,17 +117,17 @@


      Preview tab

      -

      Fast preview icon identify.svg[*] Identify

      +

      Fast preview icon identify.svg[*] Identify

      Using this tool you can find where your images are, and match them to their number. You can also edit control points.

      Move the mouse over the visibility buttons for the images (the numbers at the top of the preview) and the corresponding image lights up red in the preview. When this tool is turned on, moving the mouse over the panorama highlights all the images under the mouse in different colours. The buttons for those images lights up in matching colours. The same can be achieved when holding the Control key and moving the mouse over the panorama.

      When the mouse is on the overlap of two images, click to edit the control points between those images.

      -

      Fast preview icon photometric.svg[*] Photometrics

      +

      Fast preview icon photometric.svg[*] Photometrics

      Enables full photometric correction. When turned on, this will cause significant delay when changing photometric parameters. It also takes a while to turn on and off. However, with it enabled you get much better representation of the colours in the output. With it turned off, you get correction only for exposure and white balance. With it turned on, you also get vignetting and colour response correction. The Hugin Preview window does all these things by default, so you may wish to use that instead.

      -

      Show Control Points Button.svg[*] Show control points

      +

      Show Control Points Button.svg[*] Show control points

      When this tool is turned on, all Control points are drawn as lines with crosses at each end. Green, yellow, orange, and red lines and their crosses indicate 'normal' control points. A red control point is misaligned (the ends of the line are father apart), and a green control point is well aligned (the ends of the line are almost in the same position). Blue indicates horizontal control points, vertical control points or straight line control points.

      Blend mode

      @@ -164,9 +149,9 @@

      However, often the first photo, or even none of the photos, in the project has the wanted white balance. You can use the Grey Picker button to adjust the white balance of the whole panorama by using any 'neutral' colour object in the scene as a sample. Just push the button and then click on the object in the preview canvas.

      An ideal neutral colour object is white or grey, this could be a test card, an overcast sky, snow, or a white object - It is important to remember that white paint and paper comes in lots of colour shades so it really isn't very reliable, prefer a transparent material that is white due to light diffusion such as etched glass or polystyrene foam. Avoid objects that are 'blown out', or which are in shade and illuminated only by secondary light sources in the scene.

      -

      Preview layout.svg[*]Layout tab

      +

      Preview layout.svg[*]Layout tab

      The Layout tab shows the entire project as a diagram with colour-coded lines connecting each of the photographs. -

      Layout-small.png[*] +

      Layout-small.png[*]

      Green lines connecting images show the control points have a small error, red lines show a large error. Grey lines show no control points connecting the images.

      You can see where the project is OK and where there are problems if it isn't quite right. Just click on any connection and Hugin jumps to the Control Points tab to edit that pair of photos.

      Use the Scale slider to change the size of the photo thumbnails, this only effects the Layout display and won't change the final panorama. @@ -174,7 +159,7 @@

      Projection tab

      This tab is for adjusting projection of the panorama, some projections have adjustable parameters which will appear when selected.

      -

      Hugin fit pano.png[*] Fit

      +

      Hugin fit pano.png[*] Fit

      This doesn't change any input image parameters, it just readjusts the output Field of View such that all the input images are visible. If the images are all off-centre, then there will be a lot of black space.

      Field of View

      @@ -186,80 +171,68 @@ Field of View are disabled. If you are having trouble, switch to Equirectangular Projection, adjust the field of view and switch back.

      -

      Fast preview icon drag.svg[*] Move/Drag tab

      +

      Fast preview icon drag.svg[*] Move/Drag tab

      Using this tool you can recentre the panorama interactively. With it turned on, try the following:

      -
        -
      • Drag the panorama with the left mouse button to rotate the panorama's images. The centre of rotation is the point where you pushed the mouse button down. -
        • -
      • Hold shift when doing the above to constrain movement to yaw or pitch. Note pitch is affected by the centre of rotation. -
        • -
      • Drag the panorama with the right mouse button or hold control and drag with the left to roll the panorama (rotate around the middle) -
        • -
      +
      • Drag the panorama with the left mouse button to rotate the panorama's images. The centre of rotation is the point where you pushed the mouse button down.
        • +
      • Hold shift when doing the above to constrain movement to yaw or pitch. Note pitch is affected by the centre of rotation.
        • +
      • Drag the panorama with the right mouse button or hold control and drag with the left to roll the panorama (rotate around the middle)

      If the panorama contains unconnected components (i.e. not connected by control points), they will move individually. There is also an Individual Drag mode, see below.

      Drag mode

      This determines what parameters that are changed when the images are dragged.

      -
        -
      • Normal - When dragged left-right, the yaw parameter is changed and when dragged up-down the pitch parameter is changed. I.e. the camera is tilted in the yaw and pitch angles. -
        • -
      • Normal, individual - Adds checkboxes to the displayed images buttons, here you can select which images to drag individually or together. With this mode selected the control point connections between photos are ignored. -
        • -
      • Mosaic - When dragged left-right, X parameter is changed and when dragged up-down the Y parameter is changed. I.e. the camera is moved in the X and Y dimensions. -
        • -
      • Mosaic, individual - Allows selected photos to be dragged in mosaic mode. -
        • -
      +
      • Normal - When dragged left-right, the yaw parameter is changed and when dragged up-down the pitch parameter is changed. I.e. the camera is tilted in the yaw and pitch angles.
        • +
      • Normal, individual - Adds checkboxes to the displayed images buttons, here you can select which images to drag individually or together. With this mode selected the control point connections between photos are ignored.
        • +
      • Mosaic - When dragged left-right, X parameter is changed and when dragged up-down the Y parameter is changed. I.e. the camera is moved in the X and Y dimensions.
        • +
      • Mosaic, individual - Allows selected photos to be dragged in mosaic mode.

      In individual mode you can select the images to drag with the checkboxes. You can also add images to the selection group by clicking on the image with pressed Control key on the image in the panorama. By clicking on an image with Control and Shift key pressed it is removed from the selection group.

      -

      Hugin center pano.png[*] Center

      +

      Hugin center pano.png[*] Center

      This button horizontally pans the output, changing the yaw of the remapped images so they fit to the centre of the output frame. This is useful if there is a lot of black space on the left or right of the output. This also performs a Fit, equivalent to the next button.

      Note that centering a Rectilinear Projection or Fisheye Projection panorama will change the perspective, this may be unwanted.

      -

      Hugin fit pano.png[*] Fit

      +

      Hugin fit pano.png[*] Fit

      This doesn't change any input image parameters, it just readjusts the output Field of View such that all the input images are visible. If the images are all off-centre, then there will be a lot of black space.

      -

      Hugin straighten pano.png[*] Straighten

      +

      Hugin straighten pano.png[*] Straighten

      Straightening the panorama optimises the roll and pitch of the input images without changing their relative positions, levelling the panorama in the process. This normally produces good results, if you need more accurate positioning, try adding vertical control points in the hugin Control Points tab and reoptimise.

      Numeric Transform

      Enter a numerical transform to rotate the input images without changing their relative positions - Effectively this rotates the entire panorama. Enter roll, pitch and yaw values in degrees.

      -

      Fast preview icon crop.svg[*] Crop tab

      +

      Fast preview icon crop.svg[*] Crop tab

      Using this tool you can set the output cropping region interactively. To do this precisely instead, use the Stitcher tab. Initially, the entire panorama is in the output region (i.e. nothing is cropped).

      To change the cropping at each edge, move the mouse towards that edge until a white box appears along it, then drag with the left mouse button until the edge is where you want it. The darker areas represent the region that is cropped off. You can move two edges at once by moving the mouse towards the corner shared by the edges until both white boxes appear. If you wish to move the whole region at once, move the mouse into the middle so that all four edges have boxes along them and drag.

      -

      Fast preview icon autocrop.svg[*] Autocrop

      +

      Fast preview icon autocrop.svg[*] Autocrop

      The autocrop button adjusts the crop rectangle so that it is entirely within the image area, i.e. there will be no 'black' borders in the final stitched image. It does this by maximising the area of the rectangle rather than the width or height.

      In practice

      -
      [*]
      [*]
      A panorama with unconnected image groups after optimisation.
      +
      [*]
      [*]
      A panorama with unconnected image groups after optimisation.

      Let's try using this preview to help with a panorama where automatic alignment failed. This panorama was taken where a lot of things were blowing around in the wind, and the clouds were changing quickly, so it is not surprising that it aligning it is a struggle. The Assistant tab tells us there are multiple unconnected image groups. We can optimise the panorama and end up with a images correctly positioned amongst the group they are in, but the groups themselves are not aligned. Try this first.

      -
      [*]
      [*]
      Dragging images with the drag tool.
      +
      [*]
      [*]
      Dragging images with the drag tool.

      Using the Drag tool, we can roughly align the groups together:

      -
        -
      1. Turn on the tool with the Drag button. -
        2. -
      2. Drag each component so the horizon is in the middle, using the left mouse button. -
        3. -
      3. Drag with the right mouse button (or hold control and drag with the left) to level the horizon.
        [*]
        [*]
        Rotating images with the drag tool.
        -
        4. -
      4. Hold shift and drag with the left mouse button sideways to approximately line up the image with the other groups. -
        5. -
      -
      [*]
      [*]
      Two images highlighted in the preview window.
      +
      1. Turn on the tool with the Drag button.
        2. +
      2. Drag each component so the horizon is in the middle, using the left mouse button.
        3. +
      3. Drag with the right mouse button (or hold control and drag with the left) to level the horizon.
        [*]
        [*]
        Rotating images with the drag tool.
        4. +
      4. Hold shift and drag with the left mouse button sideways to approximately line up the image with the other groups.
      +
      [*]
      [*]
      Two images highlighted in the preview window.

      When we have the images in approximately the right position, we can begin placing control points to guide the optimiser. The Identify tool lends a hand here. Firstly, turn on the identify tool. Move the mouse on an overlap that was recently created between two image groups. The images in the overlap light up. Move the mouse to a place where there is only two images in that overlap, and click. The two images are opened in the control point editor (there may be a short pause while the images are loaded). Once you have placed control points manually, you can return to the preview to find some more image pairs.

      -
      [*]
      [*]
      Adjusting the cropping region.
      +
      [*]
      [*]
      Adjusting the cropping region.

      When you are happy that your panorama contains sufficient control points, optimise it again. The panorama will likely have the horizon at the wrong angle, in this case press Straighten on the preview window. You can then frame the panorama using the drag tool (hold shift so you don't make it wonky again!). Use your artistic judgement here. If you want to crop your panorama, click Crop and drag the edges of the cropping rectangle.

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Fast_Preview_window&oldid=15080[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Fast_Preview_window&oldid=15080"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp 2019-01-05 17:43:30.000000000 +0000 @@ -90,8 +90,10 @@ Hugin_Preview_tab.html Hugin_Projection_tab.html Hugin_Preview_window.html +Hugin_Raw_Import.html Hugin_Reset_Values_window.html Hugin_Scripting_Interface.html +Hugin_stacker.html Hugin_stitch_project.html Hugin_Stitcher_tab.html Hugin_Trackers.html @@ -162,7 +164,7 @@ The_General_Panini_Projection.html TIFF.html Tone_mapping.html -User_defined_output_sequence_and_user_defined_assistant.html +User_defined_output_sequence.html Using_Celeste_with_hugin.html Verdandi.html Vertical_control_points.html diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,39 +1,35 @@ - + Hugin - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin

    -
    -
    From PanoTools.org Wiki
    +

    Hugin

    +
    From PanoTools.org Wiki
    - -

    Hugin +

    Hugin is an Open Source panorama stitcher and graphical user interface (GUI) for Panorama tools. It also provides a number of additional components and command line tools.

    -

    Contents

    +

    Contents

    About Hugin

    -

    Although Hugin is essentially a panorama stitcher, like other GUI front-ends[*] it has a range of advanced features: -

    Among the Hugin workflow options, it is possible to correct exposure[*], Vignetting and White balance[*] between photos; generate HDR, exposure fused[*] or focus stacked[*] output from bracketed photos; or use 16bit and HDR input data natively. -

    Photos can be digital or scanned, and taken with any kind of camera. A full range of lenses are supported, from simple cameraphones to obscure fisheye[*] lenses. Hugin supports various output projections including a range of spherical, cartographic, and camera projections. +

    Although Hugin is essentially a panorama stitcher, like other GUI front-ends[*] it has a range of advanced features: +

    Among the Hugin workflow options, it is possible to correct exposure[*], Vignetting and White balance[*] between photos; generate HDR, exposure fused[*] or focus stacked[*] output from bracketed photos; or use 16bit and HDR input data natively. +

    Photos can be digital or scanned, and taken with any kind of camera. A full range of lenses are supported, from simple cameraphones to obscure fisheye[*] lenses. Hugin supports various output projections including a range of spherical, cartographic, and camera projections.

    Hugin supports panoramas taken with multiple rows of photos, with or without bracketing. Bracketed photos can be handheld, taken using a DSLR bracketing function, or as consecutive panoramas shot at different EV exposure levels. Hugin can produce successful panoramas shot with cameras that always shoot using auto-exposure and auto-whitebalance.

    Hugin also supports the use of masks which means that you can exclude parts of images you don't want to appear in your panoramas, or include parts of image you specifically want to appear in your panoramas.

    Hugin also uses a separate (background) panorama stitcher. This means that you can render a panorama in the PTBatcherGUI stitch window, while working on the next panorama in Hugin.

    Starting with version 2011.2.0, Hugin is scriptable in Python. The scripting functionality is still in its infancy and requires more development and testing. For now it is available only in Linux and Windows, and currently there is no feedback from the plugin apart from it's success or failure, which is communicated in a dialog. If you're on Linux, you can start Hugin from the command line and switch to the window you started it from while the plugin is running - then you'll see any console output it may produce.

    - +

    User interface

    The Hugin version as of version 2013.0.0 (to be released early 2013) consists of three User interfaces: Simple, Advanced and Expert.

    -
      -
    • Simple: This user interface consists of all basic functionality to create a panorama and will suffice in 90% of all cases. -
      • -
    • Advanced: This user interface will start Hugin in the Panorama Editor screen; the simple interface is available in the background. -
      • -
    • Expert: This user interface also starts Hugin in the Panorama Editor screen and will unleash all the power and options of Hugin. -
      • -
    -

    (Go to Version 2012 and older Gui[*] to read about the "old" gui which is being used in the current stable release. Note that all Hugin 2012 and older versions come with the help screens installed. You can read the same texts as in this wiki by simply opening Hugin and clicking the "Help" option from the "Help" menu) +

    • Simple: This user interface consists of all basic functionality to create a panorama and will suffice in 90% of all cases.
      • +
    • Advanced: This user interface will start Hugin in the Panorama Editor screen; the simple interface is available in the background.
      • +
    • Expert: This user interface also starts Hugin in the Panorama Editor screen and will unleash all the power and options of Hugin.
    +

    (Go to Version 2012 and older Gui[*] to read about the "old" gui which is being used in the current stable release. Note that all Hugin 2012 and older versions come with the help screens installed. You can read the same texts as in this wiki by simply opening Hugin and clicking the "Help" option from the "Help" menu)


    Simple User Interface

    - +

    Advanced User Interface

    - +

    The Panorama Editor window "takes" the foreground, but you can still switch to the Simple User interface which is started as a "background" screen of the Panorama Editor.

    @@ -128,111 +93,68 @@

    Hugin components

    The following tools are part of the Hugin suite:

    -
      -
    • Hugin the gui front end. -
      • -
    • nona a command-line remapper which supports also photometric corrections (exposure, vignetting, white balance). -
      • -
    • fulla correction of barrel distortion, chromatic aberration and vignetting. -
      • -
    • autooptimiser a tool with the same interface as PTOptimizer except using pairwise optimization which doesn't require any manual pre-placement. -
      • -
    • align_image_stack a tool to automate the process to align a stack of photos. -
      • -
    • tca_correct a tool to automatically generate chromatic aberration correction parameters for use with fulla. -
      • -
    • hugin_executor a tool for command-line stitching and running the assistant. -
      • -
    • pto_gen command line tool to generate project file from images -
      • -
    • cpfind command line tool to find control points -
      • -
    • linefind command line tool to find vertical features for leveling -
      • -
    • geocpset command line tool to connect featureless images by "geometric" control points -
      • -
    • icpfind command line tool for using heuristic control point matching like inside Hugin -
      • -
    • cpclean command line tool to remove control points with improbable error distances -
      • -
    • checkpto command line tool to examine project file and reports back the number of image chains present -
      • -
    • pto_var command line tool to manipulate image variables -
      • -
    • pto_lensstack command line tool to manipulate lens and stacks -
      • -
    • pto_mask command line tool to add mask to project file -
      • -
    • pto_template command line tool to apply template to project file -
      • -
    • calibrate_lens_gui automatic lens calibration using straight-line detection -
      • -
    • vig_optimize command line tool to estimate photometric parameters. -
      • -
    • hugin_hdrmerge[*] merges multiple exposures to HDR using Khan anti-ghosting algorithm -
      • -
    • verdandi merges different images to a single image without seams. -
      • -
    • hugin_stitch_project a GUI tool to stitch a single Hugin .pto project. -
      • -
    • celeste_standalone removes cloud-like control points from project files. -
      • -
    • PTBatcherGUI a GUI queue manager for stitching multiple Hugin projects. -
      • -
    • deghosting_mask[*] Creates mask for removing ghosting in bracketed images -
      • -
    • pano_modify Change output parameters of project file -
      • -
    • pano_trafo[*] Transform image coordinates -
      • -
    • pto_merge Merges two or more Hugin project files -
      • -
    • pto_move Moves Hugin project files with associated images -
      • -
    • hugin_lensdb Maintenance of Hugins camera and lens database -
      • -
    +
    • Hugin the gui front end.
      • +
    • nona a command-line remapper which supports also photometric corrections (exposure, vignetting, white balance).
      • +
    • fulla correction of barrel distortion, chromatic aberration and vignetting.
      • +
    • autooptimiser a tool with the same interface as PTOptimizer except using pairwise optimization which doesn't require any manual pre-placement.
      • +
    • align_image_stack a tool to automate the process to align a stack of photos.
      • +
    • tca_correct a tool to automatically generate chromatic aberration correction parameters for use with fulla.
      • +
    • hugin_executor a tool for command-line stitching and running the assistant.
      • +
    • pto_gen command line tool to generate project file from images
      • +
    • cpfind command line tool to find control points
      • +
    • linefind command line tool to find vertical features for leveling
      • +
    • geocpset command line tool to connect featureless images by "geometric" control points
      • +
    • icpfind command line tool for using heuristic control point matching like inside Hugin
      • +
    • cpclean command line tool to remove control points with improbable error distances
      • +
    • checkpto command line tool to examine project file and reports back the number of image chains present
      • +
    • pto_var command line tool to manipulate image variables
      • +
    • pto_lensstack command line tool to manipulate lens and stacks
      • +
    • pto_mask command line tool to add mask to project file
      • +
    • pto_template command line tool to apply template to project file
      • +
    • calibrate_lens_gui automatic lens calibration using straight-line detection
      • +
    • vig_optimize command line tool to estimate photometric parameters.
      • +
    • hugin_hdrmerge[*] merges multiple exposures to HDR using Khan anti-ghosting algorithm
      • +
    • verdandi merges different images to a single image without seams.
      • +
    • hugin_stacker stack overlapping images to a single image.
      • +
    • hugin_stitch_project a GUI tool to stitch a single Hugin .pto project.
      • +
    • celeste_standalone removes cloud-like control points from project files.
      • +
    • PTBatcherGUI a GUI queue manager for stitching multiple Hugin projects.
      • +
    • deghosting_mask[*] Creates mask for removing ghosting in bracketed images
      • +
    • pano_modify Change output parameters of project file
      • +
    • pano_trafo[*] Transform image coordinates
      • +
    • pto_merge Merges two or more Hugin project files
      • +
    • pto_move Moves Hugin project files with associated images
      • +
    • hugin_lensdb Maintenance of Hugins camera and lens database

    More information, documentation and tutorials are available on the project website. -

    Like other GUI front-ends[*], Hugin provides an easy-to-use unified point-and-click interface to a whole range of other command-line tools including: +

    Like other GUI front-ends[*], Hugin provides an easy-to-use unified point-and-click interface to a whole range of other command-line tools including:

    - +

    The Hugin project also provides open source replacements for the small number of closed source components of Panorama tools, especially PTStitcher. A PTStitcher replacement called nona and a PTOptimizer replacement called autooptimiser have been developed, supporting their most important features.

    Development

    -

    Hugin is Open Source, and like every community-developed software very much dependent on voluntary contributions of resources. If you have coding skills, you are welcome to look at the source code and contribute to it. Even if you don't have coding skills, you most likely have some skills that the project could use and you are more than welcome to contribute your time. The tasks requiring attention change frequently and so do the required skillset and resources. Find more about the development process[*]. +

    Hugin is Open Source, and like every community-developed software very much dependent on voluntary contributions of resources. If you have coding skills, you are welcome to look at the source code and contribute to it. Even if you don't have coding skills, you most likely have some skills that the project could use and you are more than welcome to contribute your time. The tasks requiring attention change frequently and so do the required skillset and resources. Find more about the development process[*].

    External links

    - +

    Supported operating systems

    -
      -
    • Windows[*] -
      • -
    • Linux and Unix[*] -
      • -
    • Mac OS X[*] -
      • -
    - + + +
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin&oldid=15724[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin&oldid=15980"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html 2017-04-22 17:02:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,77 +1,60 @@ - + Hugin Keyboard shortcuts - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Keyboard shortcuts

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Keyboard shortcuts

    +
    From PanoTools.org Wiki
    - -

    General shortcuts

    +

    General shortcuts

    The following keyboard shortcuts are available anywhere in hugin:

    -
      -
    • Ctrl-N, discard the current project and start a new empty project. -
      • -
    • Ctrl-O, open an existing hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file. -
      • -
    • Ctrl-S, save the current project as a hugin pto file. -
      • -
    • Ctrl-Q, quit hugin. -
      • -
    • Ctrl-Z, undoes the most recent change to the current project. -
      • -
    • Ctrl-R, redoes an undo. -
      • -
    • Ctrl-T, re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab. -
      • -
    • Ctrl-P, shows the Preview window. -
      • -
    • Ctrl-A, selects all photos in the Photos tab, selects all points in the Control Points table. -
      • -
    • Delete and Insert in the Photos tab removes and adds photos to the project. -
      • -
    • <F1>, opens the hugin manual. -
      • -
    • <F3>, shows the Control Points table. -
      • -
    • <F11>, toggles Full Screen mode. Note that the Main window and the Fast Preview window can be maximised to full screen independently. -
      • -
    • Shift-<F1>, Shift-<F2>,...Shift-<F6> switches between the tabs in the main window. -
      • -
    • Ctrl-Tab, Ctrl-Shift-Tab, jumps from tab to tab to the right and to the left in the main window (if frontmost). -
      • -
    +
    • Ctrl-N, discard the current project and start a new empty project.
      • +
    • Ctrl-O, open an existing hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file.
      • +
    • Ctrl-S, save the current project as a hugin pto file.
      • +
    • Ctrl-Q, quit hugin.
      • +
    • Ctrl-Z, undoes the most recent change to the current project.
      • +
    • Ctrl-R, redoes an undo.
      • +
    • Ctrl-T, re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab.
      • +
    • Ctrl-P, shows the Preview window.
      • +
    • Ctrl-A, selects all photos in the Photos tab, selects all points in the Control Points table.
      • +
    • Delete and Insert in the Photos tab removes and adds photos to the project.
      • +
    • <F1>, opens the hugin manual.
      • +
    • <F3>, shows the Control Points table.
      • +
    • <F11>, toggles Full Screen mode. Note that the Main window and the Fast Preview window can be maximised to full screen independently.
      • +
    • Shift-<F1>, Shift-<F2>,...Shift-<F6> switches between the tabs in the main window.
      • +
    • Ctrl-Tab, Ctrl-Shift-Tab, jumps from tab to tab to the right and to the left in the main window (if frontmost).

    Additional shortcuts

    In addition to this there are a number of keyboard shortcuts available only in the hugin Control Points tab.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Keyboard_shortcuts&oldid=15081[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Keyboard_shortcuts&oldid=15081"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_lensdb.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_lensdb.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_lensdb.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_lensdb.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin lensdb - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin lensdb

    -
    -
    From PanoTools.org Wiki
    +

    Hugin lensdb

    +
    From PanoTools.org Wiki
    - -

    hugin_lensdb is a maintenance tool for Hugins camera and lens database. +

    hugin_lensdb is a maintenance tool for Hugins camera and lens database.

    The database is automatically filled when stitching a project file from Hugin. Entries can also manually added from Hugin and calibrate_lens_gui.

    The information are used when adding image files to a project. Distortion and vignetting data can also manually loaded inside Hugin.

    @@ -63,8 +59,12 @@

    Removes all entries for the given camera from the database.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_lensdb&oldid=15722[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_lensdb&oldid=15941"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,43 +1,32 @@ - + Hugin Main window - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Main window

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Main window

    +
    From PanoTools.org Wiki
    - -
    - - - -
    2013-01-23: - Currently these pages are completely rewritten to reflect the state of the new designed GUI which will be released in 2013 -
    -

    Contents

    +

    Contents

    • 1 Tabs
        @@ -65,14 +54,14 @@

        Although there are many other uses, Hugin is primarily a tool for assembling multiple photos and creating a "seamless" panorama.

        Hugin is a program that is "tab" based. Below you see a partial example screen of Hugin showing the tabs. -

        Hugin2013 tabs.png[*] +

        Hugin2013 tabs.png[*]

        This process of assembling multiple photos and creating a "seamless" panorama is completely automatic if you use the Hugin Assistant tab, which is the default tab, but Hugin also allows full manual control of every stage. For this, Hugin provides three user interface options: Simple, Advanced and Expert. The Hugin simple mode consists of the Hugin Assistant tab and a few other tabs (as displayed above) that give you simple but effective control on what you are doing.

        This is a quick overview of this tab system for the Simple interface. It isn't a step by step tutorial. You can find these tutorials on the Hugin website. -

        For this same overview regarding the "old" user interface (but still the user interface of the current stable release), you can start with Hugin Main window old gui[*]. +

        For this same overview regarding the "old" user interface (but still the user interface of the current stable release), you can start with Hugin Main window old gui[*].

        Assistant

        The Hugin Assistant tab is the fully automatic part of Hugin; here you can @@ -90,7 +79,7 @@

        Layout

        The Layout tab shows the entire project as a diagram with colour-coded lines connecting each of the photographs.

        -
        [*]
        [*]
        Screenshot of Layout tab; click for larger versions
        +
        [*]
        [*]
        Screenshot of Layout tab; click for larger versions


        Green lines connecting images show the control points have a small error; red lines show a large error. Grey lines show no control points connecting the images.

        You can see where the project is OK and where there are problems if it isn't quite right. Just click on any connection and Hugin jumps to the Control Points tab to edit that pair of photos. @@ -99,7 +88,7 @@

        Projection

        The Hugin Projection tab is for adjusting the projection of the panorama; some projections have adjustable parameters that will appear when selected.

        -

        Move/Drag

        +

        Move/Drag

        The Hugin Move/Drag tab is used to recentre the panorama interactively (or place it for whatever reason off centre).

        Crop

        @@ -107,68 +96,42 @@

        Menus

        File

        -
          -
        • New: Discard the current project and start a new empty project. -
          • -
        • Open an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file. -
          • -
        • Save the current project as a Hugin pto file. -
          • -
        • Save as a pto file with a different name. -
          • -
        • Most recently used projects shows a list of recent Hugin projects. -
          • -
        • Run Batch Processor launches the Hugin Batch Processor GUI queue manager; note that the queue won't be processed unless this queue manager is running. -
          • -
        • Preferences opens the Hugin Preferences window. -
          • -
        • Quit Hugin. -
          • -
        +
        • New: Discard the current project and start a new empty project.
          • +
        • Open an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file.
          • +
        • Save the current project as a Hugin pto file.
          • +
        • Save as a pto file with a different name.
          • +
        • Most recently used projects shows a list of recent Hugin projects.
          • +
        • Run Batch Processor launches the Hugin Batch Processor GUI queue manager; note that the queue won't be processed unless this queue manager is running.
          • +
        • Preferences opens the Hugin Preferences window.
          • +
        • Quit Hugin.

        Edit

        -
          -
        • Undo undoes the most recent change to the current project. -
          • -
        • Redo redoes an undo. -
          • -
        +
        • Undo undoes the most recent change to the current project.
          • +
        • Redo redoes an undo.

        View

        -
          -
        • Panorama Editor opens the Editor window where you have control over the various states a workflow is going through from a set of source images to the panorama. -
          • -
        • Full Screen shows this Hugin Main window using as much screen space as possible without any window decorations. Note that the Hugin Fast Preview window can also be set as full screen. -
          • -
        • Overview checkbox: Shows or hides the (docked) overview in the screen. -
          • -
        • Grid checkbox: Shows or hides the grid in the overview and preview canvas (see Hugin Assistant tab). -
          • -
        +
        • Panorama Editor opens the Editor window where you have control over the various states a workflow is going through from a set of source images to the panorama.
          • +
        • Full Screen shows this Hugin Main window using as much screen space as possible without any window decorations. Note that the Hugin Fast Preview window can also be set as full screen.
          • +
        • Overview checkbox: Shows or hides the (docked) overview in the screen.
          • +
        • Grid checkbox: Shows or hides the grid in the overview and preview canvas (see Hugin Assistant tab).

        Interface

        -
          -
        • Simple: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases. -
          • -
        • Advanced: This user interface starts Hugin in the Panorama Editor screen. The Simple interface is available in the background. -
          • -
        • Expert: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin. -
          • -
        +
        • Simple: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases.
          • +
        • Advanced: This user interface starts Hugin in the Panorama Editor screen. The Simple interface is available in the background.
          • +
        • Expert: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin.

        Help

        - - +
        • Help opens the Hugin manual.
          • +
        • Tip of the day
          • +
        • Keyboard Shortcuts
          • +
        • FAQ: Hugin Frequently asked questions
          • +
        • About shows the Hugin About window[*].
          • +
        • Donate opens the Hugin donation page; there is no obligation to donate. Any donations are used for travel and promotion costs related to Hugin development.
        + +
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Main_window&oldid=14937[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Main_window&oldid=16081"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,38 +1,34 @@ - + Hugin Mask tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Mask tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Mask tab

    +
    From PanoTools.org Wiki
    - -
    - -

    Contents

    +
    + +

    Contents

    -
    +

    Hugin Masks tab

    The Hugin Masks tab has two functions:

    -
      -
    • Creating masks for individual images that include or exclude specific parts of these individual images in your final panorama. -
      • -
    • Cropping one or more of your individual images, as you would do for, e.g., fisheye Projection images having a circular area in the middle with a useless black area outside, or scanned images that might have edges that need to be cropped away. -
      • -
    +
    • Creating masks for individual images that include or exclude specific parts of these individual images in your final panorama.
      • +
    • Cropping one or more of your individual images, as you would do for, e.g., fisheye Projection images having a circular area in the middle with a useless black area outside, or scanned images that might have edges that need to be cropped away.

    The top-left side of the masks window shows a list of all images in the current project.

    The Masks tab has in the mid-section on the left side two sub-tabs Masks and Crop, each with its own functionality. Note that you have to select an image in the top left before the functionality of both will be enabled.

    @@ -86,25 +78,20 @@

    Selecting a mask

    There are 3 ways to select a mask:

    -
      -
    • left mouse click inside polygon -
      • -
    • use rubberband around polygon, this works only when the active polygon has no selected points -
      • -
    • click on the polygon in the listbox on the left -
      • -
    +
    • left mouse click inside polygon
      • +
    • use rubberband around polygon, this works only when the active polygon has no selected points
      • +
    • click on the polygon in the listbox on the left

    De-selecting a mask

    Click somewhere not on the mask's row in the listbox on the left.

    -

    Selecting point(s)

    +

    Selecting point(s)

    You can select points of the active polygon by clicking on it. To select several points use a rubberband around all points. When holding down the shift key, the newly selected points are added to the existing selection.

    Note that Hugin uses some "fuzzy" logic when working with mask points. If your masks get too small, you may see some unusual behavior when editing masks. Since masks do not have to be extremely precise, this should not cause any major problems, but it is good to keep in mind.

    -

    De-selecting point(s)

    +

    De-selecting point(s)

    Click in the image away from the mask, or re-click on the mask in the listbox on the left side. The mask will remain selected, but individual points will not be.

    -

    Moving point(s)

    +

    Moving point(s)

    To move a point, simply drag it after clicking on it with the left mouse button. This also works when more then one point is selected.

    Moving the whole mask

    @@ -120,36 +107,23 @@

    Masks and Control Points

    While control points inside masks are still used in geometric optimization, you can use masks to eliminate unwanted control points:

    -
      -
    • Create a mask before calling cpfind. Cpfind will respect the masks and will not create cp in these areas. This is the preferred way, because cpfind will now distribute all control points in unmasked area only. -
      • -
    • Remove control points within masks with the menu command: Edit > Remove control points in mask. As a result it can be possible to remove all control points between one image pair. -
      • -
    +
    • Create a mask before calling cpfind. Cpfind will respect the masks and will not create cp in these areas. This is the preferred way, because cpfind will now distribute all control points in unmasked area only.
      • +
    • Remove control points within masks with the menu command: Edit > Remove control points in mask. As a result it can be possible to remove all control points between one image pair.

    The photometric optimizer takes the masks automatically into account.

    Cropping images

    Image cropping shouldn't be confused with a camera's Crop factor, which is something else entirely. Use the Crop tab to indicate the areas of the input images that hugin should exclude from the stitching output. There are three situations where you might want to use crop parameters:

    -
      -
    • With a scanned input image, there are usually black edges or marks along the sides of the image. -
      • -
    • With a circular Fisheye Projection image there are black unexposed areas outside the image circle. -
      • -
    • Some lenses have a lot of flaring around the edges which you don't want to keep. -
      • -
    +
    • With a scanned input image, there are usually black edges or marks along the sides of the image.
      • +
    • With a circular Fisheye Projection image there are black unexposed areas outside the image circle.
      • +
    • Some lenses have a lot of flaring around the edges which you don't want to keep.

    Select the image to be cropped in the list to the left, you can adjust the position of the crop area by dragging the perimeter in the image preview on the right. Multiple images can be selected by holding down the Shift or Ctrl keys while clicking in the image list. Then the selected crop is applied to all images. -

    Note that unlike PTGui[*], setting crop parameters[*] in hugin doesn't change the Field of View or optical centre of your images, it simply indicates areas of the image to be masked out, so you can change the cropping for photos in your project at any stage of the stitching process. +

    Note that unlike PTGui[*], setting crop parameters[*] in hugin doesn't change the Field of View or optical centre of your images, it simply indicates areas of the image to be masked out, so you can change the cropping for photos in your project at any stage of the stitching process. In detail, hugin uses the S 'selection' parameter in the i and o script lines instead of the C 'crop' parameter.

    Depending on the input image type, cropping has two different behaviours:

    -
      -
    • For circular fisheye photos the crop area is a circle. -
      • -
    • For any other input image, the crop area is a rectangle. -
      • -
    +
    • For circular fisheye photos the crop area is a circle.
      • +
    • For any other input image, the crop area is a rectangle.

    Change the input image type in the Hugin Photos tab or in the Hugin Assistant tab.

    The Crop tab features four text boxes for Left, Top, Right and Bottom where you can manually enter the positions of the four edges. The origin is top-left and numbers indicate the distance in pixels from this origin.

    Note that numbers can be negative and can extend beyond the width and height of the photo, this is primarily useful for partial fisheye images where the full circle is not visible, in this case the crop circle extends beyond the picture frame. @@ -162,8 +136,12 @@

    The lens description file is a plain text file with a .ini extension.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Mask_tab&oldid=15671[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Mask_tab&oldid=15671"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_move_drag_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_move_drag_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_move_drag_tab.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_move_drag_tab.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin move drag tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin move drag tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin move drag tab

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    -

    Move/Drag tab

    -
    [*]
    [*]
    Screenshot of Move/Drag tab; click for enlarged image
    +

    Move/Drag tab

    +
    [*]
    [*]
    Screenshot of Move/Drag tab; click for enlarged image


    Using this tool you can recentre the panorama interactively. With it turned on, try the following:

    -
      -
    • Drag the panorama with the left mouse button to rotate the panorama's images. The centre of rotation is the point where you pushed the mouse button down. -
      • -
    • Hold shift when doing the above to constrain movement to yaw or pitch. Note that pitch is affected by the centre of rotation. -
      • -
    • Drag the panorama with the right mouse button or hold control and drag with the left to roll the panorama (rotate around the middle) -
      • -
    +
    • Drag the panorama with the left mouse button to rotate the panorama's images. The centre of rotation is the point where you pushed the mouse button down.
      • +
    • Hold shift when doing the above to constrain movement to yaw or pitch. Note that pitch is affected by the centre of rotation.
      • +
    • Drag the panorama with the right mouse button or hold control and drag with the left to roll the panorama (rotate around the middle)

    If the panorama contains unconnected components (i.e. not connected by control points), they will move individually. There is also an Individual Drag mode (see below).

    Drag mode

    This determines what parameters that are changed when the images are dragged.

    -
      -
    • Normal: When dragged left-right, the yaw parameter is changed, and when dragged up-down, the pitch parameter is changed (i.e. the camera is tilted in the yaw and pitch angles). -
      • -
    • Normal, individual adds checkboxes to the displayed images buttons; here you can select which images to drag individually or together. With this mode selected, the control point connections between photos are ignored. -
      • -
    +
    • Normal: When dragged left-right, the yaw parameter is changed, and when dragged up-down, the pitch parameter is changed (i.e. the camera is tilted in the yaw and pitch angles).
      • +
    • Normal, individual adds checkboxes to the displayed images buttons; here you can select which images to drag individually or together. With this mode selected, the control point connections between photos are ignored.

    In individual mode, you can select the images to drag with the checkboxes. You can also add images to the selection group by clicking on the image in the panorama while pressing the Control key. When clicking on an image with the Control and Shift keys pressed, the image is removed from the selection group.


    In Expert mode it is also possible to change the translation parameters X and Y by dragging.

    -
      -
    • Mosaic: When dragged left-right, X parameter is changed, and when dragged up-down, the Y parameter is changed (i.e. the camera is moved in the X and Y dimensions). -
      • -
    • Mosaic, individual allows selected photos to be dragged in mosaic mode. -
      • -
    -

    Hugin center pano.png[*] Centre

    +
    • Mosaic: When dragged left-right, X parameter is changed, and when dragged up-down, the Y parameter is changed (i.e. the camera is moved in the X and Y dimensions).
      • +
    • Mosaic, individual allows selected photos to be dragged in mosaic mode.
    +

    Hugin center pano.png[*] Centre

    This button horizontally pans the output, changing the yaw of the remapped images so they fit to the centre of the output frame. This is useful if there is a lot of black space on the left or right of the output. This also performs a Fit, equivalent to the next button.

    Note that centering a Rectilinear Projection or Fisheye Projection panorama will change the perspective; this may be unwanted.

    -

    Hugin fit pano.png[*] Fit

    +

    Hugin fit pano.png[*] Fit

    This doesn't change any input image parameters; it just readjusts the output Field of View such that all the input images are visible. If the images are all off-centre, then there will be a lot of black space.

    -

    Hugin straighten pano.png[*] Straighten

    +

    Hugin straighten pano.png[*] Straighten

    Straightening the panorama optimises the roll and pitch of the input images without changing their relative positions, levelling the panorama in the process. This normally produces good results; if you need more accurate positioning, try adding vertical control points in the Hugin Control Points tab and reoptimise.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_move_drag_tab&oldid=14942[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_move_drag_tab&oldid=15942"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimiser_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimiser_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimiser_tab.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimiser_tab.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,42 +1,38 @@ - + Hugin Optimiser tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Optimiser tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Optimiser tab

    +
    From PanoTools.org Wiki
    - -

    As explained on the Hugin Photos tab, hugin uses a photo alignment scheme where it adjusts image orientation and lens settings of source photos +

    As explained on the Hugin Photos tab, hugin uses a photo alignment scheme where it adjusts image orientation and lens settings of source photos until the control points line-up. This process is called (geometric) optimisation. Normally you will use the Hugin Assistant tab where control points are automatically generated, or use the Feature matching option from the Hugin Photos tab to generate control points.

    You can manually create individual control points in the Control Points tab, and you can manage them in both the Photos tab and Control Points table.

    Geometric Optimizer

    The pre-set optimisation options are useful for most situations, but sometimes it is necessary to switch to Custom parameters. -

    For example, when shooting hand-held panoramas, some of the position variation between shots can be resolved by using different d and e Image Center Shift parameters for each shot. Select Custom parameters, and pick the d and e parameters for optimisation on this hugin Optimiser tab. +

    For example, when shooting hand-held panoramas, some of the position variation between shots can be resolved by using different d and e Image Center Shift parameters for each shot. Select Custom parameters, and pick the d and e parameters for optimisation on this hugin Optimiser tab.

    Similarly, the translation parameters could be used to correct a wonky shot. However, they were meant for linear panoramas which expand to infinite distance at 180 degrees field of view, so you must make sure any images with non-zero translation (X, Y, or Z parameters) are in the middle of the panorama (y and p should all be around zero, and the field of view shouldn't be large enough to make them expand more than 180 degrees). This can be used to patch in the floor after you have removed the tripod that was obscuring it. You can take a shot of the floor where the tripod was at an angle (therefore you can avoid casting a shadow on the image in most cases). You can then optimise X,Y,Z on only this image. However, the floor must be flat for this to work, and this shot must be in the middle of the panorama. You can make down the middle by rotating the panorama on either of the previews. Alternatively you could try to optimize the translation plane parameters yaw and pitch to rotate the remapping plane into the right direction.

    Be careful not to optimize more parameters than you need. This can cause problems. For example, when stitching a map or when all is on the same plane you don't need to optimize plane yaw/plane pitch. These variables should only used when there are several remapping planes in the pictures are needed (e.g. for patching a nadir image). For stitching images on the same plane, you have only one defined remapping plane.

    The images list behaves very similar to the image list on the Photos tab. So you can also in this tab add or remove images, change the lens or stack assignments, link or unlink image variables, and so on. In addition to the features on the list on the Photos tab, it also provides in-place editing of single image variables. (Note: If you want to modify a value for a lens, you need to single-click the value, not double-click it.) If you want to change image variables from several images at once, select all affected images and choice Edit image variables... from the context menu. @@ -44,27 +40,23 @@

    Image Orientation

    Depending on the User Interface mode, you can modify:

    -
      -
    • Yaw (y), Pitch (p) and Roll (r) in Simple and Advanced mode. -
      • -
    • Yaw (y), Pitch (p), Roll (r), TranslationX (TrX), TranslationY (TrY), TranslationZ (TrZ), Translation plane yaw (Tpy) and Translation plane pitch (Tpp) in Expert mode. -
      • -
    +
    • Yaw (y), Pitch (p) and Roll (r) in Simple and Advanced mode.
      • +
    • Yaw (y), Pitch (p), Roll (r), TranslationX (TrX), TranslationY (TrY), TranslationZ (TrZ), Translation plane yaw (Tpy) and Translation plane pitch (Tpp) in Expert mode.

    With Ctrl+Left click you define which parameters will be optimised. The context menu provides short cuts to select the parameters of all images, of all images of a selected lens or of all image of a single stack.

    Lens parameters

    Depending on the User Interface mode, you can modify:

    -
      -
    • Radial distortions (a, b, c) and horizontal and vertical image center shift (d, e) in Simple and Advanced mode. -
      • -
    • Radial distortions (a, b, c), horizontal and vertical image center shift (d, e) and horizontal and vertical image shearing (g, t) in Expert mode. -
      • -
    - - +
    • Radial distortions (a, b, c) and horizontal and vertical image center shift (d, e) in Simple and Advanced mode.
      • +
    • Radial distortions (a, b, c), horizontal and vertical image center shift (d, e) and horizontal and vertical image shearing (g, t) in Expert mode.
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Optimiser_tab&oldid=15652[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Optimiser_tab&oldid=15652"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Panorama Editor window - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Panorama Editor window

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Panorama Editor window

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    Tabs

    -

    The Panorama Editor window is also "tab" based. Below you see a partial example screen of the Panorama Editor window showing the tabs with the button bar above them. -

    Hugin2013 panorama editor menu.png[*] +

    The Panorama Editor window is also "tab" based. Below you see a partial example screen of the Panorama Editor window showing the tabs with the button bar above them. +

    Hugin2013 panorama editor menu.png[*]

    Photos

    The Photos tab is used to:

    -
      -
    • Manage the images in a Hugin project -
      • -
    • Edit the positions of the images in the final panorama -
      • -
    • Edit the lens settings -
      • -
    • Edit photometrics settings -
      • -
    • Edit/Create stacks -
      • -
    +
    • Manage the images in a Hugin project
      • +
    • Edit the positions of the images in the final panorama
      • +
    • Edit the lens settings
      • +
    • Edit photometrics settings
      • +
    • Edit/Create stacks

    Masks

    Often photos contain parts which should not be used in the final panorama (e.g. moving objects); alternatively you may need to specifically include a distinctive feature (e.g. persons) in the final panorama. @@ -118,147 +107,102 @@

    Menus

    File

    -
      -
    • New: Discard the current project and start a new empty project. -
      • -
    • Open an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file. -
      • -
    • Save the current project as a Hugin pto file. -
      • -
    • Save as a pto file with a different name. -
      • -
    • Write PTStitcher script saves a simplified project file suitable for batch stitching with PTStitcher, nona or PTmender. Note that nona can stitch a Hugin project file directly, so this step is unnecessary when using nona. -
      • -
    • Most recently used projects shows a list of recent Hugin projects. -
      • -
    • Run Batch Processor launches the Hugin Batch Processor GUI queue manager; note that the queue won't be processed unless this queue manager is running. -
      • -
    • Merge project can be used to merge another project with the current project. New photos will be added to the list of images; for duplicate photos, only the control points are merged. -
      • -
    • Apply Template assigns parameters from an existing pto project to the current set of photos. Only position and lens parameters are transferred; control points are ignored. -
      • -
    • Preferences opens the Hugin Preferences window. -
      • -
    • Quit Hugin. -
      • -
    +
    • New: Discard the current project and start a new empty project.
      • +
    • Open an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file.
      • +
    • Save the current project as a Hugin pto file.
      • +
    • Save as a pto file with a different name.
      • +
    • Write PTStitcher script saves a simplified project file suitable for batch stitching with PTStitcher, nona or PTmender. Note that nona can stitch a Hugin project file directly, so this step is unnecessary when using nona.
      • +
    • Most recently used projects shows a list of recent Hugin projects.
      • +
    • Run Batch Processor launches the Hugin Batch Processor GUI queue manager; note that the queue won't be processed unless this queue manager is running.
      • +
    • Merge project can be used to merge another project with the current project. New photos will be added to the list of images; for duplicate photos, only the control points are merged.
      • +
    • Apply Template assigns parameters from an existing pto project to the current set of photos. Only position and lens parameters are transferred; control points are ignored.
      • +
    • Preferences opens the Hugin Preferences window.
      • +
    • Quit Hugin.

    Edit

    -
      -
    • Undo undoes the most recent change to the current project. -
      • -
    • Redo redoes an undo. -
      • -
    -
      -
    • Add Image to the current project. -
      • -
    • Run Assistant will run the automised panorama creator by finding control points, aligning and optimising. -
      • -
    • Send to assistant queue will run the automised panorama creator via the batch processor in case you want to create multiple panoramas after each other. -
      • -
    • Optimize re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab. -
      • -
    -
      -
    • Fine-tune all Points does the same as Fine-tune in the Hugin Control Points tab, except that all control points in the project are adjusted. Fine tune settings are set in the Hugin Preferences. -
      • -
    • Remove control points in masks removes all control points in regions which are masked on the Hugin Mask tab. -
      • -
    • Run Python script will run one of the installed or self-created python scripts. This option is only available when Python support has been compiled into your Hugin build. -
      • -
    +
    • Undo undoes the most recent change to the current project.
      • +
    • Redo redoes an undo.
    +
    • Add Image to the current project.
      • +
    • Import Raw Image... converts raw image(s) to TIFF format and adds them to current project. (see raw import for more details)
      • +
    • Run Assistant will run the automised panorama creator by finding control points, aligning and optimising.
      • +
    • Send to assistant queue will run the automised panorama creator via the batch processor in case you want to create multiple panoramas after each other.
      • +
    • Optimize re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab.
    +
    • Fine-tune all Points does the same as Fine-tune in the Hugin Control Points tab, except that all control points in the project are adjusted. Fine tune settings are set in the Hugin Preferences.
      • +
    • Remove control points in masks removes all control points in regions which are masked on the Hugin Mask tab.
      • +
    • Run Python script will run one of the installed or self-created python scripts. This option is only available when Python support has been compiled into your Hugin build.

    View

    - +

    Actions

    The Action menu list all install Python plugins for Hugin. It is therefore only available if Hugin is compiled with Python support.

    Interface

    -
      -
    • Simple: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases. -
      • -
    • Advanced: This user interface starts Hugin in the Panorama Editor screen. The simple interface is available in the background. -
      • -
    • Expert: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin. -
      • -
    +
    • Simple: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases.
      • +
    • Advanced: This user interface starts Hugin in the Panorama Editor screen. The simple interface is available in the background.
      • +
    • Expert: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin.

    Help

    - +
    • Help opens the Hugin manual.
      • +
    • Tip of the day
      • +
    • Keyboard Shortcuts
      • +
    • FAQ: Hugin Frequently asked questions
      • +
    • About shows the Hugin About window[*].
      • +
    • Donate opens the Hugin donation page; there is no obligation to donate. Any donations are used for travel and promotion costs related to Hugin development.


    Buttons

    Above the row of tabs are a series of buttons for common commands:

    -

    Hugin filenew.png[*] New project

    +

    Hugin filenew.png[*] New project

    Discards the current project and starts a new empty project.

    -

    Hugin fileopen.png[*] Open project

    -

    Opens an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file. +

    Hugin fileopen.png[*] Open project

    +

    Opens an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file.

    -

    Hugin filesave.png[*] Save project

    +

    Hugin filesave.png[*] Save project

    Saves the current project as a Hugin .pto file.

    -

    Hugin filesaveas.png[*] Save project as

    +

    Hugin filesaveas.png[*] Save project as

    Saves as a .pto file with a different name.

    -

    Hugin undo.png[*] Undo

    +

    Hugin undo.png[*] Undo

    Undoes the most recent change to the current project.

    -

    Hugin redo.png[*] Redo

    +

    Hugin redo.png[*] Redo

    Redoes an undo.

    -

    Hugin edit add.png[*] Add image

    +

    Hugin edit add.png[*] Add image

    Adds an image or photo to the current project.

    -

    Hugin optimize.png[*] Re-optimize

    +

    Hugin optimize.png[*] Re-optimize

    Re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab.

    -

    Gl preview.png[*] Fast Preview panorama

    +

    Gl preview.png[*] Fast Preview panorama

    Shows the Hugin Fast Preview window.

    -

    Hugin preview.png[*] Preview panorama

    +

    Hugin preview.png[*] Preview panorama

    Shows the Hugin Preview window.

    -

    Hugin list.png[*] Show control points

    +

    Hugin list.png[*] Show control points

    Shows the Hugin Control Points table.

    -

    Hugin info.png[*] About Hugin

    +

    Hugin info.png[*] About Hugin

    Shows the Hugin About pop-up window; this displays the current version and a list of contributors.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Panorama_Editor_window&oldid=15082[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Panorama_Editor_window&oldid=16066"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Workflow.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Workflow.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Workflow.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Panorama_Workflow.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,48 +1,40 @@ - + Hugin Panorama Workflow - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Panorama Workflow

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Panorama Workflow

    +
    From PanoTools.org Wiki
    - -

    Hugin provides different work flows for generating panoramas. This page will list some possibility and give you some suggestions for your own work flow. +

    Hugin provides different work flows for generating panoramas. This page will list some possibility and give you some suggestions for your own work flow.

    This is not a step by step instruction. Not all projects will need all steps. It will give you some ideas for your own projects.

    The panorama creating consists of two major steps:

    -
      -
    1. generating project file and align images -
      2. -
    2. stitching of project file -
      3. -
    -

    The following chapters will give you some details for both steps. You can combine both steps as you like. You can run all full automatic, or you can run all manual, or you can generate the project on the command line and stitch with PTBatcherGUI[*], or you can all do on the command line, or or or... +

    1. generating project file and align images
      2. +
    2. stitching of project file
    +

    The following chapters will give you some details for both steps. You can combine both steps as you like. You can run all full automatic, or you can run all manual, or you can generate the project on the command line and stitch with PTBatcherGUI[*], or you can all do on the command line, or or or...

    -

    Contents

    +

    Contents

    • 1 Generating project file
        @@ -63,7 +55,7 @@

        Generating project file

        Fully automatic generation

        -

        PTBatcherGUI[*] provides an option to create a project file and run the assistant on these generated project files. +

        PTBatcherGUI[*] provides an option to create a project file and run the assistant on these generated project files. Go to File>Search directory for...>Images and select the path to your images. After pressing Start PTBatcherGUI will search for possible projects depending on the EXIF information in the images. When the search is finished, the bottom list box displays all found panoramas. Select the panoramas you want to process and then click Send selected panoramas to queue to send these panoramas to the assistant queue. When you now start the batch processing, the assistant is running on all project files.

        If you tick the option Automatic stitch after assistant the panoramas will be stitched after running the assistant. This will give you a full automatic panorama processing from the input images to the final panorama.

        Also in Hugin an automatic alignment can be achieved. After adding the images (and checking projections and focal length) run the assistant on this project. You can also send the projects to the assistant queue and process the project files later (e.g. during night). @@ -71,22 +63,13 @@

        Manual generation

        Project file can be generated and aligned in Hugin. A possible work flow would be

        -
          -
        1. Add images. -
          2. -
        2. Assign lens and stacks. -
          3. -
        3. Find control points, e.g. with cpfind. -
          4. -
        4. Control point checking (celeste, cpclean, manual) -
          5. -
        5. Geometric optimisation (yaw, pitch, roll, lens parameters). -
          6. -
        6. Photometric optimisation (exposure values, vignetting, white balance[*]). -
          7. -
        7. Select output parameters (projection, canvas size, ...) -
          8. -
        +
        1. Add images.
          2. +
        2. Assign lens and stacks.
          3. +
        3. Find control points, e.g. with cpfind.
          4. +
        4. Control point checking (celeste, cpclean, manual)
          5. +
        5. Geometric optimisation (yaw, pitch, roll, lens parameters).
          6. +
        6. Photometric optimisation (exposure values, vignetting, white balance[*]).
          7. +
        7. Select output parameters (projection, canvas size, ...)

        Scripting

        The project can also be created and aligned with command line tools (see here for more details).

        A work flow similar to the assistant would be like: @@ -117,7 +100,7 @@

        All stitching engines use the same code base. So there is no preference for one or the other. It is a matter of taste, which one you use.

        PTBatcherGUI

        -

        The default stitching engine is PTBatcherGUI[*]. You can add different projects to a queue and process the queue later without control. But it can also be configured to start immediately. +

        The default stitching engine is PTBatcherGUI[*]. You can add different projects to a queue and process the queue later without control. But it can also be configured to start immediately.

        You can also stitch all project files in a given directory: After select the directory in File>Search directory for...>Project all project files in the given folder will be added to the queue.

        Hugin_stitch_project

        @@ -135,8 +118,12 @@

        The switch --batch starts the processing immediately.

        + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Panorama_Workflow&oldid=15868[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Panorama_Workflow&oldid=15868"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,39 +1,35 @@ - + Hugin Parameters for Control Point Detectors dialog - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Parameters for Control Point Detectors dialog

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Parameters for Control Point Detectors dialog

    +
    From PanoTools.org Wiki
    - -

    This dialog is accessible from the Control Point Detectors tab of the Hugin Preferences and is used to change the parameters of the control point detectors. +

    This dialog is accessible from the Control Point Detectors tab of the Hugin Preferences and is used to change the parameters of the control point detectors.

    This page gives a description of all options. Control point detector parameters site gives an overview about the settings for the different control point detectors and for different use cases.

    -

    Contents

    +

    Contents

    • 1 Description
    • 2 Type @@ -63,7 +59,7 @@

      All images at once

      With this setting all images are transferred at once to the control point detector. This was the default setting of Hugin versions before 2010.2.

      -

      Autopano (by A. Jenny)

      +

      Autopano (by A. Jenny)

      This is the same procedure as All images at once with some modifications for using autopano by Alexandre Jenny (only Windows and Linux, there is no MacOS version).

      Panorama with stacks

      @@ -99,25 +95,23 @@

      Detector for stacks

      Here you can define the control points detector which works on stacks (in setting Panorama with stacks and Multi-row panorama with stacks only). You can use e. g. Align image stack for aligning the stack. -If you used a tripod, you can leave this field empty. Then the detector does not run on the stacks. In this case you can use linking of the image positions on the Hugin Images tab[*]. +If you used a tripod, you can leave this field empty. Then the detector does not run on the stacks. In this case you can use linking of the image positions on the Hugin Images tab[*].

      Hints

      Typical tweaks might be to:

      -
        -
      • Set --noransac for autopano-sift when using non-rectilinear Projection input images. -
        • -
      • Set --size for autopano-sift which by default downsizes images to 700 pixels before matching. -
        • -
      • Some operating systems have problems supplying more than 120 or so photos at one time to these external tools, with autopano-sift-C 2.5.1 or later you can use these alternative arguments to specify input via a project file: --maxmatches %p %o %s -
        • -
      • MacOS only: If you are using control point detector which are contained in the bundle, give only the program name (without path). Hugin tries to find the program then inside the bundle. -
        • -
      - +
      • Set --noransac for autopano-sift when using non-rectilinear Projection input images.
        • +
      • Set --size for autopano-sift which by default downsizes images to 700 pixels before matching.
        • +
      • Some operating systems have problems supplying more than 120 or so photos at one time to these external tools, with autopano-sift-C 2.5.1 or later you can use these alternative arguments to specify input via a project file: --maxmatches %p %o %s
        • +
      • MacOS only: If you are using control point detector which are contained in the bundle, give only the program name (without path). Hugin tries to find the program then inside the bundle.
      + +
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Parameters_for_Control_Point_Detectors_dialog&oldid=14918[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Parameters_for_Control_Point_Detectors_dialog&oldid=14918"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Photos_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Photos_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Photos_tab.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Photos_tab.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Photos tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Photos tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Photos tab

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Hugin Photos tab

    The Photos tab is used to:

    -
      -
    • Manage the images in a hugin project. -
      • -
    • Edit the positions of the images in the final panorama. -
      • -
    • Edit the lens settings. -
      • -
    • Edit photometrics settings. -
      • -
    • Edit/Create stacks. -
      • -
    +
    • Manage the images in a hugin project.
      • +
    • Edit the positions of the images in the final panorama.
      • +
    • Edit the lens settings.
      • +
    • Edit photometrics settings.
      • +
    • Edit/Create stacks.

    Multi-selection can be used to change the parameters for multiple images.

    -
    [*]
    [*]
    Screenshot of Photos tab; click for enlarged image
    +
    [*]
    [*]
    Screenshot of Photos tab; click for enlarged image


    Layout and usage

    @@ -125,19 +115,12 @@

    The photos tab is a tab with a lot of options and possibilities, which will be explained on this page. However, the simplest use of this tab is:

    -
      -
    1. Use the Hugin filenew.png[*] New project button, if you have already images loaded. -
      2. -
    2. Use the Add images button to add images to your (new) project. -
      3. -
    3. Click the Create control points button in the Feature Matching[*] section to start detecting the pairs of same points in overlapping images. -
      4. -
    4. Click under Optimise[*] the Calculate button behind Geometric: (incremental, starting from anchor). -
      5. -
    5. Click under Optimise[*] the Calculate button behind Photometric: (Low dynamic range). -
      6. -
    -

    This is the most basic usage of this tab. The next step would be to improve "the scene" by centering, Fitting, straightening, etc. in e.g. the Hugin move drag tab in the Gl preview.png[*] Fast Preview window, which is the Hugin Main window in the Simple User interface mode. +

    1. Use the Hugin filenew.png[*] New project button, if you have already images loaded.
      2. +
    2. Use the Add images button to add images to your (new) project.
      3. +
    3. Click the Create control points button in the Feature Matching[*] section to start detecting the pairs of same points in overlapping images.
      4. +
    4. Click under Optimise[*] the Calculate button behind Geometric: (incremental, starting from anchor).
      5. +
    5. Click under Optimise[*] the Calculate button behind Photometric: (Low dynamic range).
    +

    This is the most basic usage of this tab. The next step would be to improve "the scene" by centering, Fitting, straightening, etc. in e.g. the Hugin move drag tab in the Gl preview.png[*] Fast Preview window, which is the Hugin Main window in the Simple User interface mode.

    User interface modes

    The User interface modes, being Simple, Advanced and Expert determine the layout and (number of) options in this tab. @@ -147,64 +130,58 @@ The available options are displayed in the table below.

    - - - + - - - - - - - - - - - -
    "Group by:" options per user interface mode +"Group by:" options per user interface mode
    Simple +
    Simple Advanced +Advanced Expert +Expert
    None +None None +None None +None
    Lens +Lens Lens +Lens Lens +Lens
    Stacks +Stacks Stacks +Stacks
    Output layers +Output layers
    Output stacks -
    +Output stacks +

    Images table options

    The images table has a few events ("mouse action options").

    -
      -
    • a single-click action, with or without Ctrl/Shift, to (de)select one or multiple images. -
      • -
    • a double-click action which opens the Edit image variables popup where the image parameters can be examined and/or edited. -
      • -
    • a right-click action inside the table which opens a Context menu is opened. -
      • -
    • you can drag and drop images to change the image order or to change the lens or stack assignment of single images. -
      • -
    +
    • a single-click action, with or without Ctrl/Shift, to (de)select one or multiple images.
      • +
    • a double-click action which opens the Edit image variables popup where the image parameters can be examined and/or edited.
      • +
    • a right-click action inside the table which opens a Context menu is opened.
      • +
    • you can drag and drop images to change the image order or to change the lens or stack assignment of single images.

    Edit image variables popup

    This popup gives you a lot of options and functionality depending whether you work in the Simple, Advanced or Expert User interface mode. This is explained in the Edit image variables section. @@ -213,191 +190,132 @@

    This tab contains a "Context menu", sometimes better known as a "right-click menu" which is accessible in the images table.

    Depending on the selected images and where you click you get only these commands offered which applies to the current selection:

    -
      -
    • None image, one image or multiple images selected. -
      • -
    • Click on empty area or click on an image variable (only when Grouped by Lens or Stacks selected). -
      • -
    +
    • None image, one image or multiple images selected.
      • +
    • Click on empty area or click on an image variable (only when Grouped by Lens or Stacks selected).
    - - - + - - - - - - - - - - - - - - - - - - - - - - -
    Context menu options in the images table; bulleted options are sub-menu options +Context menu options in the images table; bulleted options are sub-menu options
    No image selected +
    No image selected One image selected +One image selected Multiple images selected +Multiple images selected
    Link/Unlink +Link/Unlink
    Edit image variables... +Edit image variables... Edit image variables... +Edit image variables...
    Add individual images... +Add individual images... Add individual images... +Add individual images... Add individual images... +Add individual images...
    Add time-series of images... +Add time-series of images... Add time-series of images... +Add time-series of images... Add time-series of images... +Add time-series of images...
    Remove selected image(s) +Remove selected image(s) Remove selected image(s) +Remove selected image(s)
    Anchor this image for position +Anchor this image for position
    Anchor this image for exposure +Anchor this image for exposure
    Lens -
      -
    • New lens -
      • -
    • Load lens from ini file -
      • -
    • Load lens from lens database -
      • -
    • Save lens to ini file -
      • -
    • Save lens parameters to lens database -
      • -
    +    		Lens +
    • New lens
      • +
    • Load lens from ini file
      • +
    • Load lens from lens database
      • +
    • Save lens to ini file
      • +
    • Save lens parameters to lens database
    		 Lens -
      -
    • New lens -
      • -
    • Load lens from ini file -
      • -
    • Load lens from lens database -
      • -
    +    		Lens +
    • New lens
      • +
    • Load lens from ini file
      • +
    • Load lens from lens database
    Control points -
      -
    • Remove control points -
      • -
    +    		Control points +
    • Remove control points
    		 Control points -
      -
    • Remove control points -
      • -
    +    		Control points +
    • Remove control points
    		 Control points -
      -
    • Remove control points -
      • -
    +    		Control points +
    • Remove control points
    Reset -
      -
    • Reset positions -
      • -
    • Reset lens parameters -
      • -
    • Reset photometric parameters -
      • -
    • Reset user defined... -
      • -
    +    		Reset +
    • Reset positions
      • +
    • Reset lens parameters
      • +
    • Reset photometric parameters
      • +
    • Reset user defined...
    		 Reset -
      -
    • Reset positions -
      • -
    • Reset lens parameters -
      • -
    • Reset photometric parameters -
      • -
    • Reset user defined... -
      • -
    +    		Reset +
    • Reset positions
      • +
    • Reset lens parameters
      • +
    • Reset photometric parameters
      • +
    • Reset user defined...
    		 Reset -
      -
    • Reset positions -
      • -
    • Reset lens parameters -
      • -
    • Reset photometric parameters -
      • -
    • Reset user defined... -
      • -
    -
    +Reset +
    • Reset positions
      • +
    • Reset lens parameters
      • +
    • Reset photometric parameters
      • +
    • Reset user defined...
    +

    Adding images

    Images can either be added with:

    -
      -
    • the button Add individual images... -
      • -
    • via the context menu (Add individual images... and Add time series of images...) -
      • -
    • via drag and drop. -
      • -
    +
    • the button Add individual images...
      • +
    • via the context menu (Add individual images... and Add time series of images...)
      • +
    • via drag and drop.

    Add time series of images... adds all images with a similar file modification time as the selected image; if the the project is empty then a file dialogue opens to allow you to pick this initial file.

    Lens type

    The most important parameters are the Horizontal field of view and the Lens type. Hugin supports the following projections in input images:

    -
      -
    • Normal (rectilinear) - The projection used by most standard cameras. It keeps straight lines straight. The maximum horizontal field of view is 180 degrees (for an image of infinite size, that is). Also cubes (e.g. rendered in a special application) use this type. -
      • -
    • Panoramic (cylindrical) - This type is often simply called cylindrical projection. Usually used by panoramic cameras, such as the Horizon, Roundshot and Spheron cameras; sometimes output generated with early stitching software such as QTVRAS that only copes with single row panoramas. -
      • -
    • Circular fisheye - Used by many fisheye lenses. If the image is circular or the corners of the image are black, use this type of fisheye lens. A circular crop in the Hugin Crop tab can be used for cutting away the edge borders. -
      • -
    • Full frame fisheye - Exactly the same projection as the above circular fisheye, but the crop option will crop to a rectangle instead of a circle. This should be used for full frame fisheye images. A typical example for this type is a 15 mm fisheye on a full frame DSLR. -
      • -
    • Equirectangular - A full spherical projection. These are not from real world lenses but generally created as the result of the stitching process; useful to reload a finished panorama to extract further images. -
      • -
    • Orthographic - A projection that is e.g. used in cartography. A rare example for a fisheye lens that uses this projection is Nikon's early 10mm f5.6 OP. -
      • -
    • Stereographic - Special fisheye lenses such as the Samyang 8 mm use this projection. -
      • -
    • Equisolid - Try this projection if your image is e.g. the reflection of a mirrorball or from the visor of an astronaut's helmet. -
      • -
    • Fisheye Thoby is modeling the Nikkor 10.5 mm fisheye lens. -
      • -
    -

    After the lens type has been specified, an estimate for the horizontal field of view[*] (HFOV) is required. The HFOV specifies the horizontal opening angle of the image in degrees. Since most photographers are more familiar with Focal Length as a measure for the HFOV, it can be entered into hugin, and hugin will compute the HFOV from it. For this calculation the actual focal length and the crop factor of the camera are required. If the 35mm film equivalent focal length is known, a crop factor of 1 should be used. +

    • Normal (rectilinear) - The projection used by most standard cameras. It keeps straight lines straight. The maximum horizontal field of view is 180 degrees (for an image of infinite size, that is). Also cubes (e.g. rendered in a special application) use this type.
      • +
    • Panoramic (cylindrical) - This type is often simply called cylindrical projection. Usually used by panoramic cameras, such as the Horizon, Roundshot and Spheron cameras; sometimes output generated with early stitching software such as QTVRAS that only copes with single row panoramas.
      • +
    • Circular fisheye - Used by many fisheye lenses. If the image is circular or the corners of the image are black, use this type of fisheye lens. A circular crop in the Hugin Crop tab can be used for cutting away the edge borders.
      • +
    • Full frame fisheye - Exactly the same projection as the above circular fisheye, but the crop option will crop to a rectangle instead of a circle. This should be used for full frame fisheye images. A typical example for this type is a 15 mm fisheye on a full frame DSLR.
      • +
    • Equirectangular - A full spherical projection. These are not from real world lenses but generally created as the result of the stitching process; useful to reload a finished panorama to extract further images.
      • +
    • Orthographic - A projection that is e.g. used in cartography. A rare example for a fisheye lens that uses this projection is Nikon's early 10mm f5.6 OP.
      • +
    • Stereographic - Special fisheye lenses such as the Samyang 8 mm use this projection.
      • +
    • Equisolid - Try this projection if your image is e.g. the reflection of a mirrorball or from the visor of an astronaut's helmet.
      • +
    • Fisheye Thoby is modeling the Nikkor 10.5 mm fisheye lens.
    +

    After the lens type has been specified, an estimate for the horizontal field of view[*] (HFOV) is required. The HFOV specifies the horizontal opening angle of the image in degrees. Since most photographers are more familiar with Focal Length as a measure for the HFOV, it can be entered into hugin, and hugin will compute the HFOV from it. For this calculation the actual focal length and the crop factor of the camera are required. If the 35mm film equivalent focal length is known, a crop factor of 1 should be used.

    With JPEG images, hugin can usually automatically calculate the HFOV based on the EXIF information.


    @@ -405,69 +323,59 @@

    Individual control points can be created and edited in the Hugin Control Points tab, here in the Photos tab they can be manipulated together.

    Automatic creation of control points can be done by pressing the Create control Points button (if you select just some images, then control points will only be found for those selected). With the dropdown selector in front of the Create control Points button, you select which control point generator (feature matcher) to use for detecting the control points and adding them to the project. These control point generators (feature matchers) need to be configured in Preferences->Control Point Detectors. Hugin comes standard with cpfind and align_image_stack configured for a number of situations. The Hugin Preferences can be used to set further options and to add new tools to the list or another instance of the same Control Point Detector with other settings (like for rectilinear images or for (full) frame fisheye for example. If you hold down the control key (Command key on Mac OS) when pressing this button. you can specify the number of control points per overlap. Note: Not all control point detectors support this parameter. -

    The Remove control Points option from the context menu[*] option Control Points does exactly what its name suggests, it removes control points between the selected images, or all control points if no image is selected. +

    The Remove control Points option from the context menu[*] option Control Points does exactly what its name suggests, it removes control points between the selected images, or all control points if no image is selected.

    Optimise

    Hugin has two optimising strategies:

    -
      -
    • a Geometric strategy that aligns the photos into the correct position in your final panorama. -
      • -
    • a Photometric strategy that optimises brightness and colours between your images to produce the optimal panorama. -
      • -
    -

    Geometric (Simple and Advanced User interface)

    +
    • a Geometric strategy that aligns the photos into the correct position in your final panorama.
      • +
    • a Photometric strategy that optimises brightness and colours between your images to produce the optimal panorama.
    +

    Geometric (Simple and Advanced User interface)

    Hugin uses a photo alignment scheme where it adjusts image orientation and lens settings of source photos until the control points line-up. This process is called optimisation. -

    You can manually create individual control points in the Control Points tab, and you can manage them in both the Photos tab and Control Points table. +

    You can manually create individual control points in the Control Points tab, and you can manage them in both the Photos tab and Control Points table.

    The following pre-set optimisation schemes are provided in the Simple and Advanced user interface:

    -

    Positions (incremental, starting from anchor)

    +

    Positions (incremental, starting from anchor)

    This is the simplest setting, and is probably sufficient for a lot of purposes. Only the relative orientation of images are optimised, lens parameters are left untouched, this works best if either of the following is true:

    - +

    or

    -
      -
    • Lens calibration[*] has already been performed, saved to a file and loaded into the current project via the right-click option in the Context menu. -
      • -
    +
    • Lens calibration[*] has already been performed, saved to a file and loaded into the current project via the right-click option in the Context menu.

    Note that to align any pair of photos, there should be at least two pairs of control points connecting them.

    -

    Positions (y,p,r)

    +

    Positions (y,p,r)

    This is exactly the same as the incremental setting above except that the parameters are optimised at once, this may confuse the optimiser if the images are not already roughly in the right place. Don't use this setting.

    -

    Positions and View (y,p,r,v)

    +

    Positions and View (y,p,r,v)

    This is the same as optimising Positions except that the lens Field of View is optimised too - Use this if you don't trust the Field of View calculated from the photo's EXIF data.

    Note that for this too work you need at least three well-spaced pairs of control points between any pair of photos. With a 360 degree panorama it is usually beneficial to optimise the Field of View, even if you have already calibrated this beforehand.

    -

    Positions and Barrel Distortion (y,p,r,b)

    +

    Positions and Barrel Distortion (y,p,r,b)

    This is the same as optimising Positions except that an attempt is made to discover the lens barrel distortion at the same time. Only the b parameter of the full lens correction model is varied by this optimisation scheme, as this is a reasonable approximation of the distortion of a typical lens. You should trust the field of view if you use this.

    Again you need at least three well-placed pairs of control points between any pair of photos.

    -

    Positions, View and Barrel (y,p,r,v,b)

    +

    Positions, View and Barrel (y,p,r,v,b)

    As the name suggests this optimises positions, Field of View and barrel distortion all at once.

    Everything

    This optimises image orientation and all geometric parameters in the full lens correction model. It includes more lens distortion parameters. The x shift and y shift (d and e) parameters account for the centre of the projection not being in the centre of the image. This is quite common, and gets very bad if an image is the cropped corner of another image. -

    You will need many control points, the more the better, and preferably a full spherical panorama (360 by 180 degrees) to get the best correction. You should also use a calibrated panoramic head[*]. If the control points are bad (either there are not enough or some are in the wrong place), or your images were not taken around the no-parallax point, this could produce bizarre results. +

    You will need many control points, the more the better, and preferably a full spherical panorama (360 by 180 degrees) to get the best correction. You should also use a calibrated panoramic head[*]. If the control points are bad (either there are not enough or some are in the wrong place), or your images were not taken around the no-parallax point, this could produce bizarre results.

    -

    Geometric (Expert User interface)

    +

    Geometric (Expert User interface)

    The following pre-set optimisation schemes are provided in the Simple and Advanced user interface:

    -

    Positions and Translations (y,p,r,x,y,z)

    +

    Positions and Translations (y,p,r,x,y,z)

    This will optimise image orientation and the translation you get when moving the camera for a linear panorama. This is great for stitching images of the same flat surface taken from different places, for example when you couldn't fit a painting or the front of a building into one picture. Again it isn't ideal if the lens information such as the field of view is wrong.

    -

    Positions, Translation and View (y,p,r,x,y,z,v)

    +

    Positions, Translation and View (y,p,r,x,y,z,v)

    This is similar to Positions and Translations, except you can use it when you don't trust the Field of View from the EXIF data.

    -

    Positions, Translation and Barrel (y,p,r,x,y,z,b)

    +

    Positions, Translation and Barrel (y,p,r,x,y,z,b)

    This is the same as optimising Positions and Translation except that an attempt is made to discover the lens barrel distortion at the same time. Only the b parameter of the full lens correction model is varied by this optimisation scheme, as this is a reasonable approximation of the distortion of a typical lens. You should trust the field of view if you use this.

    -

    Positions, Translation, View and Barrel (y,p,r,x,y,z,b,b)

    +

    Positions, Translation, View and Barrel (y,p,r,x,y,z,b,b)

    This is useful when you are optimising a linear panorama, don't trust the field of view, and want to correct barrel distortion.

    The Custom parameters

    @@ -476,7 +384,7 @@

    Similarly, the translation parameters (X, Y, Z) could be used to correct a wonky shot.

    The custom parameters are controlled in detail on the Hugin Optimiser tab.

    -

    Photometric (Simple User interface)

    +

    Photometric (Simple User interface)

    hugin has a brightness and colour correction system using the default nona stitching tool in the hugin Stitcher tab.

    The hugin system works by sampling a spread of points for each pair of overlapping images. The optimiser then tries to model a system of camera response curve, @@ -489,9 +397,9 @@

    This will optimise vignetting, the camera response curve and exposure (EV) for all the photos in your project.

    The exposures for all images (except for the anchor image determined by selecting -Anchor this image for exposure in the hugin Images tab[*]) are optimised. +Anchor this image for exposure in the hugin Images tab[*]) are optimised.

    -

    Low dynamic range, variable white balance

    +

    Low dynamic range, variable white balance

    This will optimise vignetting, the camera response curve, exposure (EV) and white balance for all the photos in your project.

    Similarly to above, the exposures and white balance is optimised for all images except the @@ -502,19 +410,24 @@ Custom parameters. These photometric Custom parameters are controlled in detail on the hugin Exposure tab.

    -

    Photometric (Advanced and Expert User interface)

    -

    Next to the options mentioned above in Photometric (Simple User interface)[*], +

    Photometric (Advanced and Expert User interface)

    +

    Next to the options mentioned above in Photometric (Simple User interface)[*], the Advanced and Expert User interface has the following photometric options.

    -

    High dynamic range, fixed exposure

    +

    High dynamic range, fixed exposure

    This will optimise vignetting and camera response curve for all photos.

    -

    High dynamic range, variable white balance, fixed exposure

    +

    High dynamic range, variable white balance, fixed exposure

    This will optimise vignetting, the camera response curve and white balance for all the photos in your project.

    +

    Linked parameters

    +

    Sometimes it can be helpful to link parameters. A linked parameter is forced to the same value for all images with the same lens number or from the same stack. If a parameter is not linked each images is allowed to have individual values for the respective parameter. +

    By default the HFOV and distortion parameters are linked. Unlinking of image parameters can be useful if a different zoom or focus setting has been used for some images. +

    To link or unlink an image variable use the context when you grouped the images by lens or stacks. +

    Edit image variables

    -

    The Edit image variables option when double-clicking an image in the image table or via the right-click context menu will open a popup with four tabs being Positions[*]. Lens[*], Photometrics[*] and Camera Response[*]. +

    The Edit image variables option when double-clicking an image in the image table or via the right-click context menu will open a popup with four tabs being Positions[*]. Lens[*], Photometrics[*] and Camera Response[*]. The options in the several tabs of this popup are also dependent on the user interface mode.

    Positions

    @@ -531,14 +444,9 @@ The a, b and c parameters are used to remove that distortion. They are applied radially from the image center, which can be moved by changing the d and e parameters. These a, b, c, d and e parameters are the basis of the panotools lens correction model. -

    Scanned images might also suffer from image shearing[*]. This can be corrected using the g and t parameters. +

    Scanned images might also suffer from image shearing[*]. This can be corrected using the g and t parameters.

    The distortion parameters usually vary with the focal length, and to a lesser degree with the focus. -The link checkbox indicates whether the parameter is linked or not. -A linked parameter is forced to the same value for all images with the same lens number. -This is the default for the HFOV and distortion parameters. -If a parameter is not linked each images is allowed to have individual values for the respective parameter. -This is useful if a different zoom or focus setting has been used for some images. -If scanned images are used, they are usually not perfectly centered, and each image should have individual d and e parameters. +

    If scanned images are used, they are usually not perfectly centered, and each image should have individual d and e parameters.

    Photometrics

    hugin models the photometric parameters of a lens/camera combination in a similar way to the lens correction model for Geometric parameters. These parameters can be set manually here in the hugin Photos tab. @@ -568,8 +476,13 @@

    If your images form approximately aligned stacks, you can create stacks as usual, select all the images and then uncheck Link by the image position. Approximately aligned stacks are common when you shoot bracketed sets handheld, or in windy conditions with a light tripod. Hugin will remember that the images form a stack, but does not force the image orientation and translation to be the same across the stack. This is useful for specifying stacks when you have a Panorama with Stacks control point detector configuration before control point generation. You do not have to manually mark approximately aligned stacks in other circumstances, however.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Photos_tab&oldid=15617[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Photos_tab&oldid=15987"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html 2019-02-04 16:08:25.000000000 +0000 @@ -1,82 +1,79 @@ - + Hugin Preferences - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Preferences

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Preferences

    +
    From PanoTools.org Wiki
    - -

    Contents

    +
    @@ -93,6 +90,12 @@

    If the option Copy log messages to clipboard is activated, all log messages (from the control point detector or the assistant) are copied at the end to the clipboard.

    The option Show hints about projections activates or deactivates the hints in the fast preview window.

    +

    Raw converter

    +

    In this section you can provide the paths to the external raw converters (dcraw, RawTherapee and darktable). For RawTherapee and darktable you should use the command line version (as indicated by -cli extension) and not the GUI executable. +

    If you leave these fields empty the default names will be used. (The programs should be in the paths specified by the PATH variable.) +

    Windows: On Windows the paths can be read from registry when the raw converter is installed correctly. (For RawTherapee this works only for version 5.5 or later.) +

    MacOS: For MacOS the paths "/Applications/RawTherapee.app/Contents/MacOS/rawtherapee-cli" und "/Applications/darktable.app/Contents/MacOS/darktable-cli" to the corresponding app images is taken as default. +

    File names

    File options

    Some Hugin actions generate large temporary files, change the Temporary dir to specify an alternative location for writing these files. One reason for setting this independently to the operating system default would be to use a RAM disk to speed up stitching. @@ -147,93 +150,55 @@

    Fine-tune

    Hugin helps position control points to within a fraction of a pixel distance automatically:

    - -
      -
    • Patch width, the size of the square of pixels taken from the left photo to match with the right photo when picking control points, reduce if this is taking a long time on your system. -
      • -
    • Search area width, the percentage area of the right photo that is searched when picking control points, reduce if this is taking a long time on your system. -
      • -
    • Local search area width, the region of the right photo searched when you click Fine-tune in the Hugin Control Points tab or Fine-tune all Points in the Panorama editor window Edit menu. -
      • -
    • Correlation Threshold. For each Fine-tune, Hugin calculates the quality of the control points match, raise this threshold to reject dubious matches. -
      • -
    • Peak Curvature Threshold, Currently unused. -
      • -
    + +
    • Patch width, the size of the square of pixels taken from the left photo to match with the right photo when picking control points, reduce if this is taking a long time on your system.
      • +
    • Search area width, the percentage area of the right photo that is searched when picking control points, reduce if this is taking a long time on your system.
      • +
    • Local search area width, the region of the right photo searched when you click Fine-tune in the Hugin Control Points tab or Fine-tune all Points in the Panorama editor window Edit menu.
      • +
    • Correlation Threshold. For each Fine-tune, Hugin calculates the quality of the control points match, raise this threshold to reject dubious matches.
      • +
    • Peak Curvature Threshold, Currently unused.

    Rotation search

    Enable this if your photos:

    - +


    Control Point Detectors

    Hugin uses an internal or external tool for automatically creating control points for a set of images either when

    - +

    Note: If you have upgraded from an older release of Hugin, you will need to Load Defaults to update these preferences.

    In the Control Point Detector Programs list box you can choose between several presets such as:

    -
      -
    • Hugin's CPFind - This is the internal general purpose control point generator of hugin. -
      • -
    • Hugin's CPFind + Celeste - This is the same as the CPFind setting but it will also remove points in areas of sky using the celeste[*] tool. See Using Celeste with hugin for more details. -
      • -
    • Cpfind (multirow/stacked) - This is the same as the CPFind setting, except that Align image stack is used to match photos in bracketed stacks. -
      • -
    • autopano-sift-C - a C version of autopano-sift, wwhich needs to be installed separately. -
      • -
    • Panomatic (by Anael Orlinski), which needs to be installed separately. -
      • -
    • autopano-sift-c (multirow/stacked) - This is the same as the autopano-sift-C setting, except that Align image stack is used to match photos in bracketed stacks. -
      • -
    • Align image stack - part of Hugin suite. Note that align_image_stack is not a general purpose control point detector, but it is very effective for aligning images within stacks. -
      • -
    • Align image stack FullFrameFisheye - This the same as the Align image stack setting above except with an additional setting suitable for fisheye images. -
      • -
    +
    • Hugin's CPFind - This is the internal general purpose control point generator of hugin.
      • +
    • Hugin's CPFind + Celeste - This is the same as the CPFind setting but it will also remove points in areas of sky using the celeste[*] tool. See Using Celeste with hugin for more details.
      • +
    • Cpfind (multirow/stacked) - This is the same as the CPFind setting, except that Align image stack is used to match photos in bracketed stacks.
      • +
    • autopano-sift-C - a C version of autopano-sift, wwhich needs to be installed separately.
      • +
    • Panomatic (by Anael Orlinski), which needs to be installed separately.
      • +
    • autopano-sift-c (multirow/stacked) - This is the same as the autopano-sift-C setting, except that Align image stack is used to match photos in bracketed stacks.
      • +
    • Align image stack - part of Hugin suite. Note that align_image_stack is not a general purpose control point detector, but it is very effective for aligning images within stacks.
      • +
    • Align image stack FullFrameFisheye - This the same as the Align image stack setting above except with an additional setting suitable for fisheye images.

    Parameters for these tools can be customized in the Hugin Parameters for Control Point Detectors dialog which you can access by clicking one of the buttons Edit... or New....

    These parameters are also helpful if you want to use a similar command line tool that isn't already listed. Click the New... button to configure a new preset to use in the Assistant or the Photos tabs.

    The Set default button will mark the preset selected in this list box to be used automatically in the Assistant tab when clicking the 2. Align... button.

    Stitching

    The Output format defines the default output format for new projects. You can select TIFF, JPEG or PNG and the compression settings depending on the selecting format. -

    Under blender you can select whether enblend or the internal blender is the default blender for new project. You can change it for existing projects on the stitcher tab[*]. +

    Under blender you can select whether enblend or the internal blender is the default blender for new project. You can change it for existing projects on the stitcher tab[*].

    Important note: The settings here are the defaults for new projects, change settings for the current project in the Hugin Stitcher tab.

    The complete stitching process (reprojecting image, blend and fuse images...) can be done by PTBacherGUI or hugin_stitch_project. Select here which processor should be used:

    -
      -
    • PTBatcherGUI[*] can queue several projects and can also work unattended and shutdown the computer at the end (e.g. running over night) -
      • -
    • hugin_stitch_project can only work on one project. It is not recommended to start several processes simultaneously. -
      • -
    +
    • PTBatcherGUI[*] can queue several projects and can also work unattended and shutdown the computer at the end (e.g. running over night)
      • +
    • hugin_stitch_project can only work on one project. It is not recommended to start several processes simultaneously.

    Select Overwrite existing files if existing file should be overwritten, otherwise you will be asked each time.

    PTBatcherGUI has two additional options:

    -
      -
    • Start stitching jobs immediately will start the processing directly after adding a project to the queue. Otherwise you can select several project in the queue and start the processing in PTBatcherGUI at any later time. -
      • -
    • Verbose output will activate an additional log window which will print more details about the process. -
      • -
    -

    Stitching (2)

    +
    • Start stitching jobs immediately will start the processing directly after adding a project to the queue. Otherwise you can select several project in the queue and start the processing in PTBatcherGUI at any later time.
      • +
    • Verbose output will activate an additional log window which will print more details about the process.
    +

    Stitching (2)

    Exiftool options allows you to customize which metadata are copied to intermediate and final image with exiftool. (Metadata can only be copied to blended and/or fused intermediate images, but not to remapped only images.)

    You can specify 2 argfile: The first one is used to copy metadata to all exposure layer or stacks. The second one is used for the final image(s). In the final ExifTool argfile you can also use placeholders to add some information about the panorama into the metadata (e.g. number of images, projections, field of view).

    When the option Create Photo Sphere XMP data is checked, the Photo Sphere XMP are automatically added to equirectangular images. These information are used by some viewer to display the panorama in an interactive viewer. @@ -249,7 +214,7 @@

    Enblend

    The Use alternative Enblend program option allows you to use other tools with a similar interface -such as smartblend[*]. +such as smartblend[*].

    Enblend supports a range of Additional arguments which depend on the actual version of enblend you are using. Since also other features and limitations may change depending on version number and building options it is recommended to download and read the version specific manual from Enblend's home page. An easy way to ask your version of Hugin about Enblend's version number is to add -v or --version to the line of arguments in the Stitcher tab, than stitch a simple panorama and have a look at the stitching log.

    Note that setting Additional arguments here will only effect new projects, to change enblend and enfuse settings for the current project use the Hugin Stitcher tab. @@ -273,21 +238,21 @@

    Troubleshooting

    Sometimes when updating a hugin installation new features such as the settings for a new control point editor won't appear where expected. The cause might be a conflict with the preferences file of a previous version of hugin. A good idea before pressing the "Reset do defaults" button might be to back up the old preferences file since it is a plain text file that contains your specific settings in a readable format. Saving this file gives you the chance to recreate these individual settings later on. The name and location of the preferences file is this for the following platforms:

    -
      -
    • Linux: ".hugin" can be found in your home directory (FIXME) -
      • -
    • Mac OS X: the file "hugin Preferences" can be found in Macintosh HD/Users/<YourUserAccount>/Library/Preferences/. This folder is usually hidden by the system, so in Finder search the "Go to..." menu for the "go to folder..." command - or just use the keyboard shortcut shift+cmd+G. In the dialog insert ~/Library/Preferences/ and press the "open" button. Make sure Hugin isn't open and then either rename, move or delete this file to make Hugin start with the default preferences for that version. -
      • -
    • Windows: (FIXME) -
      • -
    +
    • Linux: ".hugin" can be found in your home directory (FIXME)
      • +
    • Mac OS X: the file "hugin Preferences" can be found in Macintosh HD/Users/<YourUserAccount>/Library/Preferences/. This folder is usually hidden by the system, so in Finder search the "Go to..." menu for the "go to folder..." command - or just use the keyboard shortcut shift+cmd+G. In the dialog insert ~/Library/Preferences/ and press the "open" button. Make sure Hugin isn't open and then either rename, move or delete this file to make Hugin start with the default preferences for that version.
      • +
    • Windows: the preferences are stored in the registry : \HKEY_CURRENT_USER\Software\hugin

    Quit hugin, rename the preferences file (e.g. add the previous version number) and on the next start of hugin a new preferences file will be generated.

    Other fixes for occurring problems can be found in the Hugin FAQ.


    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Preferences&oldid=15892[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Preferences&oldid=16086"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_tab.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_tab.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Preview tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Preview tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Preview tab

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    Preview tab

    -
    [*]
    [*]
    Screenshot of Preview tab; click for enlarged image
    +
    [*]
    [*]
    Screenshot of Preview tab; click for enlarged image


    -

    Fast preview icon identify.svg[*] Identify

    +

    Fast preview icon identify.svg[*] Identify

    Using this tool you can find where your images are and match them to their number. You can also edit control points.

    Move the mouse over the visibility buttons for the images (the numbers at the top left of the preview) and the corresponding image lights up red in the preview. When this tool is turned on, moving the mouse over the panorama highlights all the images under the mouse in different colours. The buttons for those images light up in matching colours. The same can be achieved when holding the Control key and moving the mouse over the panorama. -

    Tip: We are now in the Simple Interface, and when everything runs smoothly you should not need this tip. However, when the mouse is on the overlap of two images, you can click inside the overlap, and the Control Points tab of the Panorama Editor[*] will open to edit the control points between those images. +

    Tip: We are now in the Simple Interface, and when everything runs smoothly you should not need this tip. However, when the mouse is on the overlap of two images, you can click inside the overlap, and the Control Points tab of the Panorama Editor[*] will open to edit the control points between those images.

    Photometrics

    This enables full photometric correction. When turned on, this will cause significant delay when changing photometric parameters. It also takes a while to turn on and off. However, with it enabled you get much better representation of the colours in the output. With it turned off, you get correction only for exposure and white balance. With it turned on, you also get vignetting and colour response correction. @@ -68,7 +64,7 @@

    EV

    EV stands for Exposure Value. Clicking the Reset button will set it to the average of all the input image exposures, or setting it to 0 (zero) -will result in no exposure change being applied to the panorama (note that unless all the photos also have their individual EV set to zero in the Hugin Camera and Lens tab[*], they will likely appear incredibly bright or dark). +will result in no exposure change being applied to the panorama (note that unless all the photos also have their individual EV set to zero in the Hugin Camera and Lens tab[*], they will likely appear incredibly bright or dark).

    EV is a standard photographic scale; each increase or decrease by one unit will change the exposure by the equivalent of one f-stop (i.e. halving or doubling the exposure). It is worth adjusting the exposure here in Hugin rather than later in an external image editor, since Hugin uses the camera response curve @@ -82,8 +78,13 @@

    An ideal neutral colour object is white or grey; this could be a test card, an overcast sky, snow or a white object. It is important to remember that white paint and paper comes in lots of colour shades, so it really isn't very reliable. Prefer a transparent material that is white due to light diffusion, such as etched glass or polystyrene foam. Avoid objects that are "blown out" or which are in shade and illuminated only by secondary light sources in the scene.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Preview_tab&oldid=14940[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Preview_tab&oldid=15943"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,79 +1,69 @@ - + Hugin Preview window - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Preview window

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Preview window

    +
    From PanoTools.org Wiki
    - -

    hugin provides two pop-up windows showing previews of the final stitched result, the difference between these previews that the Hugin Preview window shows a more accurate image but takes time to redraw, the Hugin Fast Preview window shows updates almost instantaneously and has some useful new features. +

    hugin provides two pop-up windows showing previews of the final stitched result, the difference between these previews that the Hugin Preview window shows a more accurate image but takes time to redraw, the Hugin Fast Preview window shows updates almost instantaneously and has some useful new features.

    The preview window is a smaller version of the output created by saving to a file in the hugin Stitcher tab with some differences:

    -
      -
    • Reduced resolution input images are used, so some areas can appear blurred that will be sharp in the final output. -
      • -
    • Seams are not created, images are simply overlaid with the first image at the bottom of the stack and the last at the top. -
      • -
    • Blending by a tool such as enblend isn't shown. -
      • -
    • The brightness display of HDR and 16bit images is controlled by settings in the hugin Preferences, these settings are not used when stitching. -
      • -
    +
    • Reduced resolution input images are used, so some areas can appear blurred that will be sharp in the final output.
      • +
    • Seams are not created, images are simply overlaid with the first image at the bottom of the stack and the last at the top.
      • +
    • Blending by a tool such as enblend isn't shown.
      • +
    • The brightness display of HDR and 16bit images is controlled by settings in the hugin Preferences, these settings are not used when stitching.

    The preview window shows the result of panorama creation with the settings chosen by the software. Through the various buttons and slides of the preview window this settings can be changed according to one's taste and needs. This changes will affect the way the final panorama will be created.

    When satisfied with the preview result, the window can be closed. Attention must be paid not to close the preview window with the preview window not showing what the user wants.

    Buttons

    -

    Hugin center pano.png[*] Center

    +

    Hugin center pano.png[*] Center

    This button horizontally pans the output, changing the yaw of the remapped images so they fit to the centre of the output frame. This is useful if there is a lot of black space on the left or right of the output. This also performs a Fit, equivalent to the next button.

    Note that centering a Rectilinear Projection or Fisheye Projection panorama will change the perspective, this may be unwanted.

    -

    Hugin fit pano.png[*] Fit

    +

    Hugin fit pano.png[*] Fit

    This doesn't change any input image parameters, it just readjusts the output Field of View such that all the input images are visible. If the images are all off-centre, then there will be a lot of black space.

    -

    Hugin straighten pano.png[*] Straighten

    +

    Hugin straighten pano.png[*] Straighten

    Straightening the panorama optimises the roll and pitch of the input images without changing their relative positions, levelling the panorama in the process. This normally produces good results, if you need more accurate positioning, try adding vertical control points in the hugin Control Points tab.

    -

    Hugin preview num transform.png[*] Num. Transf.

    +

    Hugin preview num transform.png[*] Num. Transf.

    This opens up a pop-up window that allows you to enter a numerical transform to rotate the input images without changing their relative positions - Effectively this rotates the entire panorama.

    Enter roll, pitch and yaw values in degrees, note that you can also realign the panorama by left and right-clicking in the preview image itself, though this is not so precise.

    -

    Hugin preview auto update.png[*] Auto

    +

    Hugin preview auto update.png[*] Auto

    Setting Auto will regenerate the preview every time something changes in the project. This can be slow with large preview windows, so you may want to disable Auto or reduce the size of the window.

    -

    Hugin reload.png[*] Update

    +

    Hugin reload.png[*] Update

    When Auto is unset, the preview doesn't regenerate when something changes in the project. Click Update to force a regeneration manually.

    -

    Hugin preview show all.png[*] All

    +

    Hugin preview show all.png[*] All

    By default all input images are shown in the preview, however individual images can be enabled and disabled in the Displayed images section. Use the All button to return to the default and display all the images.

    -

    Hugin preview show none.png[*] None

    +

    Hugin preview show none.png[*] None

    Similarly, hide all images with the None button, use this if you want to enable preview images one by one.

    displayed images

    @@ -95,15 +85,11 @@ the field of view and switch back.

    Blend mode

    -
      -
    • normal blend mode simply shows all selected images as a stack. -
      • -
    • difference blend mode highlights differences between overlapping images. If the images are well aligned, there will be few differences and the overlap will appear mostly black. -
      • -
    +
    • normal blend mode simply shows all selected images as a stack.
      • +
    • difference blend mode highlights differences between overlapping images. If the images are well aligned, there will be few differences and the overlap will appear mostly black.

    Output

    Changing the Output here tells hugin if you intend to create a low dynamic range -(LDR[*]) or high dynamic range (HDR) output panorama - If in doubt select LDR as this is +(LDR[*]) or high dynamic range (HDR) output panorama - If in doubt select LDR as this is the format of a normal photo, HDR images are only viewable with additional specialist processing.

    Selecting HDR will change the preview display to a logarithmic photometric view - This allows you to see something from both dark and bright areas of the scene, though the contrast will be very low. @@ -120,8 +106,12 @@ to the negative of the darkest input image - This has a side-effect of clipping brighter images.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Preview_window&oldid=15790[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Preview_window&oldid=15790"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Projection_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Projection_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Projection_tab.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Projection_tab.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,42 +1,38 @@ - + Hugin Projection tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Projection tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Projection tab

    +
    From PanoTools.org Wiki
    - -

    Projection Tab

    +

    Projection Tab

    This tab is for adjusting projection of the panorama; some projections have adjustable parameters which will appear when selected.

    -
    [*]
    [*]
    Screenshot of top half of Projection tab; click for enlarged image
    +
    [*]
    [*]
    Screenshot of top half of Projection tab; click for enlarged image


    -

    Hugin fit pano.png[*] Fit

    +

    Hugin fit pano.png[*] Fit

    This doesn't change any input image parameters; it just readjusts the output Field of View such that all the input images are visible. If the images are all off-centre, then there will be a lot of black space.

    Field of View

    @@ -53,8 +49,13 @@ Some well known guides are for example the "Rules of thirds" and the "Golden ratio" (also called "golden section").

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Projection_tab&oldid=14941[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Projection_tab&oldid=14941"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Raw_Import.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Raw_Import.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Raw_Import.html 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Raw_Import.html 2019-02-04 16:08:25.000000000 +0000 @@ -0,0 +1,51 @@ + + + + +Hugin Raw Import - PanoTools.org Wiki + + + + + + + + + + + + + + + + + +
    + + +

    Hugin Raw Import

    +
    From PanoTools.org Wiki
    + +

    Hugin is able to use a raw converter to convert raw images to TIFF format and adds the converted images directly to the current project. +

    Currently the following raw converter are supported: +

    +
    • dcraw
      • +
    • RawTherapee
      • +
    • darktable
    +

    These programs needs to be installed separately and you need to give the paths to the programs in the Hugin Preferences. +

    It is recommended to add all raw images of one project at once and not image for image. +

    One image can be marked as white-balance reference. This image is converted first. The white-balance settings are read from this raw file or from the corresponding raw converter settings (e.g. corresponding .pp3 or .xmp file). All further images are then developed with the same settings as the white-balance reference image. +

    The developed TIFF files are stored beside the corresponding raw image with the same filename. Hugins raw import is using the development settings from the corresponding sidecar file. So you can setup your conversion settings in your preferred raw converter and save the settings in the corresponding sidecar file. Refer to the documentation of your raw converter if this is done automatically or how to do this manually. +These settings need only be done for the wb reference image. The settings of this image are used also for the other images. +

    For RawTherapee you can also provide a default processing profile (with your default converter settings) which is used as default when no sidecar file is found. +

    + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Raw_Import&oldid=16085"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,72 +1,56 @@ - + Hugin Reset Values window - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Reset Values window

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Reset Values window

    +
    From PanoTools.org Wiki
    - -

    Sometimes the optimiser can be fouled by some start values. In this case it can be helpful to go back to a defined start value of the parameters. Sometime you want to reset only selected parameters, e.g. you are satisfied with the geometric optimisation, but the photometric optimiser did not found the optimal result. So you can only reset the photometric parameters and leave the geometric parameters as they are. -

    If no image on the hugin Camera and Lens tab[*] is selected, resets affects all images. If you select individual images this function is limited to the selected images. -

    Select the parameters you want to reset: (A more detailed descriptions of the parameters can be found here[*]) +

    Sometimes the optimiser can be fouled by some start values. In this case it can be helpful to go back to a defined start value of the parameters. Sometime you want to reset only selected parameters, e.g. you are satisfied with the geometric optimisation, but the photometric optimiser did not found the optimal result. So you can only reset the photometric parameters and leave the geometric parameters as they are. +

    If no image on the hugin Camera and Lens tab[*] is selected, resets affects all images. If you select individual images this function is limited to the selected images. +

    Select the parameters you want to reset: (A more detailed descriptions of the parameters can be found here[*])

    -
      -
    • Image orientations: This will reset yaw, pitch and roll and also the translation parameters to zero. In case the EXIF data of your images contains information about the orientation of the image, these information will be used to reset the roll value to a sensible start value. -
      • -
    • Field of view: In this case hugin tries to calculate the field of view from the information in the EXIF data. If this fails (e.g. not enough information in the EXIF data) the field of view remains unchanged. -
      • -
    • Lens parameters: This options will reset the radial distortion (parameter a, b, c), image center shift (d, e) and image shearing (g, t) to zero. -
      • -
    • Exposure: Here you can select to which value the exposure value should be set (note that when you use this option Hugin will reset the global exposure of the panorama as a whole to the average of all photos): -
        -
      • To EXIF values: will reset to the exposure value found in the EXIF data -
        • -
      • To zero: will reset the exposure value to zero. This means that hugin is not correcting the exposure. -
        • -
      -
      • -
    • Color: This will reset the white balance factors for all selected images. -
        -
      • To EXIF values: will reset the red and blue multipliers to the values found in the EXIF data and referenced to the exposure anchor. -
        • -
      • To one: will reset the red and blue multipliers to 1 corresponding to no white balance change. -
        • -
      -
      • -
    • Vignetting: This will reset the parameters for vignetting correction and vignetting center shift to zero (parameters Vb, Vc, Vd, Vx and Vy). -
      • -
    • Camera response curve: Resets the values of the camera response curve to achieve a generic response curve. -
      • -
    +
    • Image orientations: This will reset yaw, pitch and roll and also the translation parameters to zero. In case the EXIF data of your images contains information about the orientation of the image, these information will be used to reset the roll value to a sensible start value.
      • +
    • Field of view: In this case hugin tries to calculate the field of view from the information in the EXIF data. If this fails (e.g. not enough information in the EXIF data) the field of view remains unchanged.
      • +
    • Lens parameters: This options will reset the radial distortion (parameter a, b, c), image center shift (d, e) and image shearing (g, t) to zero.
      • +
    • Exposure: Here you can select to which value the exposure value should be set (note that when you use this option Hugin will reset the global exposure of the panorama as a whole to the average of all photos): +
      • To EXIF values: will reset to the exposure value found in the EXIF data
        • +
      • To zero: will reset the exposure value to zero. This means that hugin is not correcting the exposure.
      • +
    • Color: This will reset the white balance factors for all selected images. +
      • To EXIF values: will reset the red and blue multipliers to the values found in the EXIF data and referenced to the exposure anchor.
        • +
      • To one: will reset the red and blue multipliers to 1 corresponding to no white balance change.
      • +
    • Vignetting: This will reset the parameters for vignetting correction and vignetting center shift to zero (parameters Vb, Vc, Vd, Vx and Vy).
      • +
    • Camera response curve: Resets the values of the camera response curve to achieve a generic response curve.


    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Reset_Values_window&oldid=15567[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Reset_Values_window&oldid=15567"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html 2017-04-22 17:02:58.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Scripting_Interface.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Scripting Interface - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Scripting Interface

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Scripting Interface

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    • 1 Introduction
    • 2 HPI @@ -50,12 +46,8 @@

      Introduction

      Scripting has been implemented both ways:

      -
        -
      • HSI (Hugin Scripting Interface): enables calling Hugin functionality from Python scripts -
        • -
      • HPI (Hugin Plugin Interface): enables calling Python functionality from within Hugin -
        • -
      +
      • HSI (Hugin Scripting Interface): enables calling Hugin functionality from Python scripts
        • +
      • HPI (Hugin Plugin Interface): enables calling Python functionality from within Hugin

      If you have access to a Hugin binary that comes with scripting capability, you'll notice a "Run Python script" entry in the Edit menu. You are all set and ready to go. If that menu command is not available, you will need to upgrade your Hugin binary, your system, or both.

      You can call Python from Hugin and just carry on in Python with the same objects, then return to C++. As a user, you are enabled to use and write Python plugins with access to the Hugin dataverse. The plugin interface provided by Hugin now is still experimental. As it attracts interest, we expect it to grow and mature.

      @@ -72,21 +64,18 @@

      HSI is an extension of Python. Import the hsi module and access Hugin functionality from your scripts.

      To see what objects and methods are available, run

      -
      -python -c 'import hsi; help(hsi)' > help.txt
+
      python -c 'import hsi; help(hsi)' > help.txt
 
      
 
      If you're exploring hsi in an interactive Python session, all the wrapped objects will provide some help if you're stuck, but it's admittedly quite basic.
 
      
-
      -$ python
+
      $ python
 >>> from hsi import *
 >>> help(CPoint)
 
      
 
      There is sparse documentation of the hugin data types and their methods beyond call signatures and member lists, so you have to guess your way when you want to use them. Luckily most of them are aptly and expressively named, so you can figure it out. I hope that eventually something like an API documentation will arise.
 
      
 
      Example
      
-
      -#!/usr/bin/env python
+
      #!/usr/bin/env python
 
 from hsi import *         # load the module
 p=Panorama()              # make a new Panorama object
@@ -109,8 +98,12 @@
 
      Hopefully a body of scripts will develop which you can use for templates.
 
      
 
+
+
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Scripting_Interface&oldid=15455[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Scripting_Interface&oldid=15944"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stacker.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stacker.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stacker.html 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stacker.html 2019-01-09 15:36:58.000000000 +0000 @@ -0,0 +1,68 @@ + + + + +Hugin stacker - PanoTools.org Wiki + + + + + + + + + + + + + + + + + +
    + + +

    Hugin stacker

    +
    From PanoTools.org Wiki
    + +

    hugin_stacker stacks overlapping images to a single image. +

    The general usage is +

    +
     hugin_stacker [options] --mode=STRING images
+
    +

    There are several stack modes (switch --mode) available: +

    +
    • min|minimum|darkest: Select the darkest pixel
      • +
    • max|maximum|brightest: Select the brightest pixel
      • +
    • avg|average|mean: Calculate the mean for each position
      • +
    • median: Calculate the median for each position
      • +
    • winsor: Calculate the Winsor trimmed mean for each position. The parameter can be set with --winsor-trim=NUMBER (default: 0.2)
      • +
    • sigma: Calculate the sigma clipped mean for each position. Fine-tune with --max-sigma=NUMBER (default: 2) and --max-iterations=NUMBER (default: 5)
    +

    This is useful for e.g. +

    +
    • automatic tourist removal (not only tourists, also other moving objects ;-))
      • +
    • noise reduction
      • +
    • visualize movement
      • +
    • multiplicity
    +

    Further parameters

    +
    • --output=FILE: Set the filename for the output file (if not given final.tif is used).
      • +
    • --compression=value: Set the compression of the output files +
      • For jpeg files use values between 0 and 100
        • +
      • For tiff files valid values are: PACKBITS, DEFLATE, LZW
    +

    Mask input images

    +

    Beside the stacked output hugin_stacker can also mask the input images (available only for stacking modes median|winsor|clip). This mode is activated with --mask-input. In this case the stacked images is first calculated. Then each pixel is each pixel is checked: if the value of this pixel differs more then mask sigma * standard deviation from the mean/median, this pixel is made visible. If it is in the mentioned range the pixel is masked out. +

    The sigma parameter for this step can be changed with --mask-sigma=NUMBER (default is 2). +

    You can output a single image for each input image. Set the suffix with --mask-suffix=STRING (default is _mask). +Or with the option --multi-layer-output you can output a layered TIFF with the name specified with --output. The file contains the averaged images as layer 0 and all input images as additional layers with the mask as described above. +

    + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_stacker&oldid=15983"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,88 +1,60 @@ - + Hugin Stitcher tab - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Stitcher tab

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Stitcher tab

    +
    From PanoTools.org Wiki
    - -

    The rest of hugin is all about setting up the project and aligning images, the Stitcher tab is where +

    The rest of hugin is all about setting up the project and aligning images, the Stitcher tab is where the final output file is created.

    Projection

    Here you can set the output Projection of your project, there are lots to choose from, each with different advantages and disadvantages:

    -
      -
    • Rectilinear, this is the same projection as a photo taken with a 'normal' camera and lens. Use this if you are just stitching a handful of photographs together with a narrow Field of View or correcting perspective in a single shot. -
      • -
    • Cylindrical, actually a simple Cylindrical Projection as used by traditional rotating panoramic cameras. A good projection for printing a 360 degree panorama, though you may prefer Mercator Projection. -
      • -
    • Equirectangular, the all purpose format for representing an entire spherical scene. It covers 360 degrees horizontally as well as the zenith and nadir. -
      • -
    • Fisheye, the same projection as a photo taken with a fisheye lens. Better for representing a wide Field of View than rectilinear, but in many cases Stereographic Projection gives less distortion than simple fisheye. -
      • -
    • Stereographic, a conformal fisheye image. Objects in a stereographic image keep the same shape and show less distortion than simple fisheye. -
      • -
    • Mercator, a conformal cylindrical image. A good projection for printing a 360 degree panorama. -
      • -
    • Trans Mercator, a mercator image rotated 90 degrees, suitable for displaying tall or overhead objects. -
      • -
    • Sinusoidal, an equal area projection of an entire spherical scene. -
      • -
    • Lambert Cylindrical Equal Area[*] -
      • -
    • Lambert Equal Area Azimuthal[*] -
      • -
    • Albers Equal Area Conic[*] -
      • -
    • Miller Cylindrical[*] -
      • -
    • Panini -
      • -
    • Architectural[*] -
      • -
    • Orthographic -
      • -
    • Equisolid -
      • -
    • Equirectangular Panini -
      • -
    • Biplane[*] -
      • -
    • Triplane[*] -
      • -
    • Panini General -
      • -
    • Thoby Projection, is modeling the 10.5 mm Nikkor fisheye lens and was introduced with hugin 2011.0.0. The projection is called after Michel Thoby who was able to empirically find it. -
      • -
    • Hammer-Aitoff Equal Area Projection -
      • -
    +
    • Rectilinear, this is the same projection as a photo taken with a 'normal' camera and lens. Use this if you are just stitching a handful of photographs together with a narrow Field of View or correcting perspective in a single shot.
      • +
    • Cylindrical, actually a simple Cylindrical Projection as used by traditional rotating panoramic cameras. A good projection for printing a 360 degree panorama, though you may prefer Mercator Projection.
      • +
    • Equirectangular, the all purpose format for representing an entire spherical scene. It covers 360 degrees horizontally as well as the zenith and nadir.
      • +
    • Fisheye, the same projection as a photo taken with a fisheye lens. Better for representing a wide Field of View than rectilinear, but in many cases Stereographic Projection gives less distortion than simple fisheye.
      • +
    • Stereographic, a conformal fisheye image. Objects in a stereographic image keep the same shape and show less distortion than simple fisheye.
      • +
    • Mercator, a conformal cylindrical image. A good projection for printing a 360 degree panorama.
      • +
    • Trans Mercator, a mercator image rotated 90 degrees, suitable for displaying tall or overhead objects.
      • +
    • Sinusoidal, an equal area projection of an entire spherical scene.
      • +
    • Lambert Cylindrical Equal Area[*]
      • +
    • Lambert Equal Area Azimuthal[*]
      • +
    • Albers Equal Area Conic[*]
      • +
    • Miller Cylindrical[*]
      • +
    • Panini
      • +
    • Architectural[*]
      • +
    • Orthographic
      • +
    • Equisolid
      • +
    • Equirectangular Panini
      • +
    • Biplane[*]
      • +
    • Triplane[*]
      • +
    • Panini General
      • +
    • Thoby Projection, is modeling the 10.5 mm Nikkor fisheye lens and was introduced with hugin 2011.0.0. The projection is called after Michel Thoby who was able to empirically find it.
      • +
    • Hammer-Aitoff Equal Area Projection

    Field of View

    This is the horizontal and vertical angle of view of the output image, clicking Calculate Field of View will shrink or enlarge the field of view of the @@ -90,18 +62,11 @@ Hugin Preview window does the same thing.

    Note that some Projections have a limited field of view, notably:

    -
      -
    • Rectilinear has to be less than 180 degrees both vertically and horizontally. -
      • -
    • Panoramic (cylindrical) has to be less than 180 degrees vertically. -
      • -
    • Stereographic has to be less than 360 degrees both vertically and horizontally. -
      • -
    • Mercator has to be less than 180 degrees vertically. -
      • -
    • Transverse Mercator has to be less than 180 degrees horizontally. -
      • -
    +
    • Rectilinear has to be less than 180 degrees both vertically and horizontally.
      • +
    • Panoramic (cylindrical) has to be less than 180 degrees vertically.
      • +
    • Stereographic has to be less than 360 degrees both vertically and horizontally.
      • +
    • Mercator has to be less than 180 degrees vertically.
      • +
    • Transverse Mercator has to be less than 180 degrees horizontally.

    Canvas Size

    Set the width and height of your output panorama in pixels. Calculate Optimal Size will estimate a size that has about the same resolution as your input images. @@ -110,22 +75,18 @@ dimensions of 6000 x 3000 or greater and a gigapixel image has a pixel size of 32768 x 32768.

    Note that the interpolation used by hugin doesn't handle downsampling very well, so output images smaller than about half the size of the Optimal Size will show aliasing artefacts. If you want to create high quality -small images, it is better to create an Optimal Size image in hugin and downsize it later in an image editor such as Gimp[*]. +small images, it is better to create an Optimal Size image in hugin and downsize it later in an image editor such as Gimp[*].

    Crop

    The crop settings allow just a portion of the panorama to be stitched, there are various reasons to do this:

    -
      -
    • When correcting perspective large areas of the panorama output will be empty anyway. -
      • -
    • Large 'gigapixel' style panoramas can be stitched in sections then blended later. -
      • -
    +
    • When correcting perspective large areas of the panorama output will be empty anyway.
      • +
    • Large 'gigapixel' style panoramas can be stitched in sections then blended later.

    The cropped-out areas are shown darkened in the Preview window.

    The Fit Crop to Images button will automatically determine a crop that has a maximum number of pixels and no empty space. This is the same function as the Autocrop button in the Fast Preview window.

    Panorama Outputs

    -

    Hugin can output 'normal' stitched images, exposure fused[*] images or high dynamic range (HDR) images. +

    Hugin can output 'normal' stitched images, exposure fused[*] images or high dynamic range (HDR) images. The following options determine which kind of image is created, and allow keeping the intermediate images created during the process.

    Normal

    @@ -133,48 +94,25 @@

    Enable Exposure corrected, low dynamic range under Remapped Images if you want to keep the intermediate images that enblend uses as input - For example modifying the alpha channel of these images and then blending manually is one technique for including and excluding people or objects that move between shots.

    Exposure fusion

    -

    If Exposure fused from stacks is enabled then hugin will group the input images into exposure stacks by comparing positions, any images with more than 70 % overlap are grouped like this. Each of these bracketed exposure stacks will be exposure fused[*] with enfuse and the results seam blended together into a panorama with enblend. +

    If Exposure fused from stacks is enabled then hugin will group the input images into exposure stacks by comparing positions, any images with more than 70 % overlap are grouped like this. Each of these bracketed exposure stacks will be exposure fused[*] with enfuse and the results seam blended together into a panorama with enblend.

    Notes:

    - -
      -
    • Note also that unlike Normal and HDR merging options where images are exposure corrected as part of the remapping process, enfuse requires that each exposure layer is supplied uncorrected - Hugin takes care of this automatically and will not apply exposure correction in this case. -
      • -
    -
      -
    • If you want to keep the exposure fused stacks for manual blending tick the option Exposure fused stacks from Combined stacks. -
      • -
    -
      -
    • For special cases the percentage for decision for the overlap can be fine-tuned (only in expert). Go to Images tab[*] and select group by output stacks and change the minimum overlap value. If you want to use the already assigned stacks instead of the deduced stacks, set the minimum overlap value to -1. -
      • -
    -

    If Exposure fused from any arrangement is enabled then hugin will seam blend images with similar exposure with enblend and than it will exposure fuse[*] them using enfuse. This variant is often much more successful than Exposure fused from stacks in two situations: -

    -
      -
    • Where entire panoramas have been shot at each EV level consecutively rather than each shot bracketed, in this case it isn't guaranteed that shots will line up into the approximate stacks expected by the Exposure fused from stacks option. -
      • -
    -
      -
    • When the panorama has been shot entirely on automatic exposure, in this situation it is useful to seam blend adjacent photos with small EV differences, but then exposure fuse larger EV differences - As effectively happens with this option. -
      • -
    + +
    • Note also that unlike Normal and HDR merging options where images are exposure corrected as part of the remapping process, enfuse requires that each exposure layer is supplied uncorrected - Hugin takes care of this automatically and will not apply exposure correction in this case.
    +
    • If you want to keep the exposure fused stacks for manual blending tick the option Exposure fused stacks from Combined stacks.
    +
    • For special cases the percentage for decision for the overlap can be fine-tuned (only in expert). Go to Photos tab and select group by output stacks and change the minimum overlap value. If you want to use the already assigned stacks instead of the deduced stacks, set the minimum overlap value to -1.
    +

    If Exposure fused from any arrangement is enabled then hugin will seam blend images with similar exposure with enblend and than it will exposure fuse[*] them using enfuse. This variant is often much more successful than Exposure fused from stacks in two situations: +

    +
    • Where entire panoramas have been shot at each EV level consecutively rather than each shot bracketed, in this case it isn't guaranteed that shots will line up into the approximate stacks expected by the Exposure fused from stacks option.
    +
    • When the panorama has been shot entirely on automatic exposure, in this situation it is useful to seam blend adjacent photos with small EV differences, but then exposure fuse larger EV differences - As effectively happens with this option.

    Note that Hugin uses a default threshold of 0.5 EV exposure difference to determine which photos can be fused into each layer. This threshold can be modified on the Photos tab in the Expert mode (selecting group by Output layers). -

    Enable Blended layers of similar exposure, without exposure correction from Layers to keep exposure layers from the Exposure fused from any arrangement step, these are useful for manual Contrast Blending[*]. +

    Enable Blended layers of similar exposure, without exposure correction from Layers to keep exposure layers from the Exposure fused from any arrangement step, these are useful for manual Contrast Blending[*].

    Enable No exposure correction, low dynamic range from Remapped Images to keep the intermediate images supplied to enblend and enfuse.

    The output format of Normal and Exposure fusion can be in one of several output file types:

    -
      -
    • TIFF, various compression options. 16 bit and 8 bit depth supported. None compression is supported by most other applications, LZW compression is common in Windows/Mac applications and Deflate compression is more common with Linux tools. -
      • -
    • JPG, lossy compression suitable for web/email. Quality can vary from 0 (extremely low quality, small file size) and 100 (high quality, large file size). A typical quality setting for web/email would be between 70 and 80 -
      • -
    • PNG, lossless compression. 16 bit and 8 bit depth supported. -
      • -
    +
    • TIFF, various compression options. 16 bit and 8 bit depth supported. None compression is supported by most other applications, LZW compression is common in Windows/Mac applications and Deflate compression is more common with Linux tools.
      • +
    • JPG, lossy compression suitable for web/email. Quality can vary from 0 (extremely low quality, small file size) and 100 (high quality, large file size). A typical quality setting for web/email would be between 70 and 80
      • +
    • PNG, lossless compression. 16 bit and 8 bit depth supported.

    HDR merging

    The option High dynamic range is only available in Advanced and Expert mode.

    If High dynamic range is enabled then hugin will identify likely bracketed stacks of images, then create remapped HDR images which are then blended with enblend. @@ -183,12 +121,8 @@

    Enable High dynamic range from Remapped Images to keep copies of each image remapped in linear colour space before merging to HDR. High dynamic range Format can be either:

    -
      -
    • floating-point TIFF, various compression options. -
      • -
    • EXR, this is a high dynamic range format which is more compact than a high dynamic range TIFF. -
      • -
    +
    • floating-point TIFF, various compression options.
      • +
    • EXR, this is a high dynamic range format which is more compact than a high dynamic range TIFF.

    Processing

    nona is the default Remapper (stitching engine) supplied with hugin, normally there is no need to change this or any of the options below. @@ -197,8 +131,8 @@ very low quality. The default of Poly3 (bicubic) is generally good for most purposes.

    Cropped TIFF files are smaller and more efficient because unused parts of the image are not stored in the file. You should always save cropped images unless you need to open them in an image editor without Cropped TIFF support. -

    enfuse is the default for Exposure fusion[*], Options are similar to enblend. -

    The default HDR merger is hugin_hdrmerge[*]. +

    enfuse is the default for Exposure fusion[*], Options are similar to enblend. +

    The default HDR merger is hugin_hdrmerge[*].

    enblend is the default Blender for use with hugin, normally there is no need to change this. Additional command-line Options can be set here or in the hugin Preferences for new projects.


    @@ -206,8 +140,12 @@

    Click Stitch! (located in the bottom right corner of the window) to generate output panoramas. With default setting the current project is added to the Hugin Batch Processor stitching queue. Note that the queue won't be processed unless this queue manager is running.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Stitcher_tab&oldid=15673[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Stitcher_tab&oldid=16023"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,51 +1,51 @@ - + Hugin stitch project - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin stitch project

    -
    -
    From PanoTools.org Wiki
    +

    Hugin stitch project

    +
    From PanoTools.org Wiki
    - -

    Hugin_stitch_project stitches a Hugin project file. It provides an GUI interface to select the project file and to select the output folder and output prefix. The project file and the output folder/prefix can also be specified on the command line +

    Hugin_stitch_project stitches a Hugin project file. It provides an GUI interface to select the .pto project file and to select the output folder and output prefix. The project file and the output folder/prefix can also be specified on the command line 

       hugin_stitch_project --output=path/to/output/prefix project.pto

    If you don't need the project file after stitching it can be deleted automatic at the end of the stitching with the switch --delete.

    Hugin_stitch_project checks for the existence of the generated files and ask for confirmation for overwriting these files. This confirmation can be suppressed by supplying the switch /w or --overwrite on the command line. -

    If you want to stitch from the command line without a GUI you can use the following command: +

    If you want to stitch from the command line without a GUI, use hugin_executor instead of hugin_stitch_project: 

        hugin_executor --prefix=prefix project.pto

    Hugin_stitch_project and Hugin_executor makes use of specified alternative programs for enblend and enfuse and their default command line switches as specified in Hugin Preferences. -

    For more control above the stitching an executor file can be specified by --user-defined-output=executor_file for an user defined output sequence. +

    For more control above the stitching an executor file can be specified by --user-defined-output=executor_file for an user defined output sequence.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_stitch_project&oldid=15888[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_stitch_project&oldid=15972"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Trackers.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Trackers.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Trackers.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Trackers.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin Trackers - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Trackers

    -
    -
    From PanoTools.org Wiki
    +

    Hugin Trackers

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    • 1 General
    • 2 Launchpad Account @@ -88,81 +84,55 @@

      Since November 22, 2010 bugs, feature requests and patches for Hugin are tracked in Launchpad, the official tools to communicate bugs, feature requests, and proposed changes to the developers. While bug reports, feature requests, and patches are always welcome over any channel, the Launchpad tracker is the only tools that make sure they will not be forgotten / hidden in the past archives. All users are encouraged to make use of Launchpad. In the following text I explain the basic usage and set some policies with regard to Hugin.

      Moreover, discussion of tracker tickets is welcome on the Mailing List (ML). This includes (non-exhaustive list):

      -
        -
      • requests to test bugs and patches -
        • -
      • requests for opinions on ways to fix bugs and implement new features -
        • -
      • enlarging the base of interested user / tester to encompass a variety of platforms -
        • -
      • insuring follow up on anonymous tickets -
        • -
      +
      • requests to test bugs and patches
        • +
      • requests for opinions on ways to fix bugs and implement new features
        • +
      • enlarging the base of interested user / tester to encompass a variety of platforms
        • +
      • insuring follow up on anonymous tickets

      Launchpad Account

      Launchpad tickets can be viewed anonymously but to interact with the tracker you will need to register an account. It is a straight forward process. Once registered you can:

      -
        -
      • submit a new ticket -
        • -
      • comment on existing tickets -
        • -
      • vote on tickets -
        • -
      +
      • submit a new ticket
        • +
      • comment on existing tickets
        • +
      • vote on tickets

      Moreover, if you are a power user and want to help triage and prioritize tickets; help users solve their problems; help developers with testing and observations; join the Hugin Bug Hunters team.

      OpenPGP key

      An OpenPGP key is not mandatory for general use, but it makes life easy.

      You will need an OpenPGP key to

      -
        -
      • use the (faster and more comfortable) email interface to the tracker -
        • -
      • sign the Code of Conduct and get access to advanced Launchpad features such as a personal PPA. -
        • -
      • sign software uploaded to the repository. -
        • -
      -

      Generate Your Key (Linux/BSD/Mac)

      +
      • use the (faster and more comfortable) email interface to the tracker
        • +
      • sign the Code of Conduct and get access to advanced Launchpad features such as a personal PPA.
        • +
      • sign software uploaded to the repository.
      +

      Generate Your Key (Linux/BSD/Mac)

      Start a command line and type:

      -
      -gpg --cert-digest-algo=SHA256 --default-preference-list="h10 h8 h9 h11 s9 s8 s7 s3 z2 z3 z1 z0" --gen-key
+
      gpg --cert-digest-algo=SHA256 --default-preference-list="h10 h8 h9 h11 s9 s8 s7 s3 z2 z3 z1 z0" --gen-key
 
      
 
      At the prompt
 
      
-
        
-
      •  Confirm the type of key you want to create (RSA)
-
        • 
-
      •  Give the key a validity.  Recommended setting two years so that if you loose your key or password it will be purged from the system
-
        • 
-
      •  Real Name: enter your real name
-
        • 
-
      •  Email: enter your email address
-
        • 
-
      
+
      • Confirm the type of key you want to create (RSA)
        • 
+
      • Give the key a validity.  Recommended setting two years so that if you loose your key or password it will be purged from the system
        • 
+
      • Real Name: enter your real name
        • 
+
      • Email: enter your email address
      
 
      Read/copy the last 8 digits (e.g. 637572E4) from the key fingerprint and add them to ~/.bashrc
 
      
-
      -echo "export GPGKEY=637572E4" >> ~/.bashrc
+
      echo "export GPGKEY=637572E4" >> ~/.bashrc
 
      
 
      Then restart the terminal session.
 
      Upload the key to the Ubuntu key server and output the key's fingerprint
 
      
-
      -gpg --send-keys --keyserver keyserver.ubuntu.com $GPGKEY
+
      gpg --send-keys --keyserver keyserver.ubuntu.com $GPGKEY
 gpg --fingerprint $GPGKEY
 
      
 
      Log on to your launchpad page https://launchpad.net/~<USER>/+editpgpkeys and paste the fingerprint.  Hit import key.  A message encrypted with your key (637572E4) will be sent to you. Read your email.
 
      
-
      Generate Your Key (Windows)
      
+
      Generate Your Key (Windows)
      
 
      Can somebody with a Windows box document the equivalent PuTTY commands?
 
      
 
      Sign the Ubuntu Code of Conduct
      
 
      Read and sign the Ubuntu Code of Conduct.  This will grant you privileges such as creating your own PPA and uploading source packages for build and distribution.
 
      
-
      -wget -O code.txt https://launchpad.net/codeofconduct/1.1/+download
+
      wget -O code.txt https://launchpad.net/codeofconduct/1.1/+download
 gpg -u $GPGKEY --clearsign code.txt
 cat code.txt.asc
 
      
@@ -172,136 +142,74 @@
 
      Last but not least, to use the email interface you need to configure your email client.
 
      
 
      Kmail
      
-
        
-
      •  Settings -> Configure Kmail
-
        • 
-
      •  In the Manage Identities tab, select the Email Address associated with your Launchpad account and hit the Modify... button (or hit Add... to create a new identity for it)
-
        • 
-
      •  In the Cryptography tab, hit the Change... button next to the OpenPGP signing key.  Select the key and hit OK.  Repeat for the OpenPGP encryption key.
-
        • 
-
      
+
      • Settings -> Configure Kmail
        • 
+
      • In the Manage Identities tab, select the Email Address associated with your Launchpad account and hit the Modify... button (or hit Add... to create a new identity for it)
        • 
+
      • In the Cryptography tab, hit the Change... button next to the OpenPGP signing key.  Select the key and hit OK.  Repeat for the OpenPGP encryption key.
      
 
      Claim an Imported SourceForge Account
      
 
      If you used the older trackers on SourceForge, chances are there is already something from you in Launchpad.  Use the following procedure to claim it as being yours:
 
      
-
        
-
      •  Make sure your SF account is in good standing and that you are receiving emails at it.
-
        • 
-
      •  Log on to the Hugin bug tracker.
-
        • 
-
      •  Find a ticket or comment that you filed in the old tracker.  Unfortunately entering your old user handle in the simple search field form does not work.  Maybe using the advanced search reporter field, however note that SF users are not LP users, so don't count on it to work.
-
        • 
-
      •  On the ticket page you should see your SF user name, clickable. Click on it.
-
        • 
-
      •  A standard page will display, saying that the user does not use LP and that the page was created when importing bugs for Hugin.  There is a link on the page asking if you are the user.  Hit the link.
-
        • 
-
      •  You will land on a pre-filled Merge LP accounts form. Hit the Continue button.
-
        • 
-
      •  An email message will be sent to the email address associated with the old account.  Open that email and click on the link.
-
        • 
-
      •  You will land on a confirmation form.  click Confirm.
-
        • 
-
      •  If everything completed successfully you will land on your LP account page with a confirmation of the successful merge.
-
        • 
-
      
+
      • Make sure your SF account is in good standing and that you are receiving emails at it.
        • 
+
      • Log on to the Hugin bug tracker.
        • 
+
      • Find a ticket or comment that you filed in the old tracker.  Unfortunately entering your old user handle in the simple search field form does not work.  Maybe using the advanced search reporter field, however note that SF users are not LP users, so don't count on it to work.
        • 
+
      • On the ticket page you should see your SF user name, clickable. Click on it.
        • 
+
      • A standard page will display, saying that the user does not use LP and that the page was created when importing bugs for Hugin.  There is a link on the page asking if you are the user.  Hit the link.
        • 
+
      • You will land on a pre-filled Merge LP accounts form. Hit the Continue button.
        • 
+
      • An email message will be sent to the email address associated with the old account.  Open that email and click on the link.
        • 
+
      • You will land on a confirmation form.  click Confirm.
        • 
+
      • If everything completed successfully you will land on your LP account page with a confirmation of the successful merge.
      
 
      Email Notifications
      
 
      Launchpad uses a sophisticated email interface.  It is possible to do almost anything via email without having to log into the web app.
 
      Activity on the tracker is notified by email to:
 
      
-
+
 
      To manage your notification settings you can (replace $USER with your Launchpad name):
 
      
-
+
 
      Placing a Ticket
      
 
      To use the tracker, you need a Launchpad Account.  You can submit our translation via the web or via email.
 
      
 
      Web
      
-
        
-
      •  Log on with your Launchpad account.
-
        • 
-
      •  Start reporting a new ticket.
-
        • 
-
      •  Enter a title/summary (e.g. German Translation).
-
        • 
-
      •  Launchpad will look for duplicates.  Look in the list of reports found if your issue has already been reported.  It is preferable to add to an old report (and even re-open a closed or expired report)  than to start a new one.  In most cases the previous history will give more weight to your report.
-
        • 
-
      •  On the reporting form, enter a description.
-
        • 
-
      •  If you need to attach a .pto file, a stitch log, a screenshot, or anything else that may be useful, scroll to the bottom and hit the link "Extra options".
-
        • 
-
      •  There you will find an Attachment field.  Hit it and browse to the file you want to attach.
-
        • 
-
      •  Click the "Submit Bug Report" button.
-
        • 
-
      
+
      • Log on with your Launchpad account.
        • 
+
      • Start reporting a new ticket.
        • 
+
      • Enter a title/summary (e.g. German Translation).
        • 
+
      • Launchpad will look for duplicates.  Look in the list of reports found if your issue has already been reported.  It is preferable to add to an old report (and even re-open a closed or expired report)  than to start a new one.  In most cases the previous history will give more weight to your report.
        • 
+
      • On the reporting form, enter a description.
        • 
+
      • If you need to attach a .pto file, a stitch log, a screenshot, or anything else that may be useful, scroll to the bottom and hit the link "Extra options".
        • 
+
      • There you will find an Attachment field.  Hit it and browse to the file you want to attach.
        • 
+
      • Click the "Submit Bug Report" button.
      
 
      To add an attachment to an already existing ticket:
 
      
-
        
-
      •  Log on to your Launchpad account.
-
        • 
-
      •  Get on the report's page.
-
        • 
-
      •  Scroll to the bottom.
-
        • 
-
      •  Hit the "Add attachment or patch" link.
-
        • 
-
      •  Enter a comment.
-
        • 
-
      •  Hit the attachment field and browse to the file you want to attach.
-
        • 
-
      •  Enter a description (optional).
-
        • 
-
      •  Hit the "Post Comment" button.
-
        • 
-
      
+
      • Log on to your Launchpad account.
        • 
+
      • Get on the report's page.
        • 
+
      • Scroll to the bottom.
        • 
+
      • Hit the "Add attachment or patch" link.
        • 
+
      • Enter a comment.
        • 
+
      • Hit the attachment field and browse to the file you want to attach.
        • 
+
      • Enter a description (optional).
        • 
+
      • Hit the "Post Comment" button.
      
 

      
 
      
 
      eMail
      
 
      Reporting a new ticket by email works too, but there are some critical conditions:
 
      
-
        
-
      •  Your email account must be registered with Launchpad.
-
        • 
-
      •  You must have an OpenPGP key associated with it and known to Launchpad.
-
        • 
-
      •  You must craft your email carefully.  A misplaced space or a typo can doom your report.
-
        • 
-
      •  To be safe, use TEXT email, not HTML -- a good habit anyway.  In most email client you recognize the TEXT mode by the lack of a formatting toolbar).
-
        • 
-
      
+
      • Your email account must be registered with Launchpad.
        • 
+
      • You must have an OpenPGP key associated with it and known to Launchpad.
        • 
+
      • You must craft your email carefully.  A misplaced space or a typo can doom your report.
        • 
+
      • To be safe, use TEXT email, not HTML -- a good habit anyway.  In most email client you recognize the TEXT mode by the lack of a formatting toolbar).
      
 
      The message:
 
      
-
        
-
      •  From: your Launchpad-registered email address
-
        • 
-
      •  To: new@bugs.launchpad.net
-
        • 
-
      •  Subject: title of the bug
-
        • 
-
      •  Body:  description + carefully crafted commands.  Commands are usually at the end of the body.  One per line.  Each command line starts with a single space.
-
        • 
-
      •  Enter the command " affects hugin" to assign the report to Hugin.
-
        • 
-
      •  Enter the command " tag translation" to tag the report as being a translation.
-
        • 
-
      •  Attach the file(s) to the email.
-
        • 
-
      •  Send.  It takes about five minutes to process and you get an email back with the result.
-
        • 
-
      
+
      • From: your Launchpad-registered email address
        • 
+
      • To: new@bugs.launchpad.net
        • 
+
      • Subject: title of the bug
        • 
+
      • Body:  description + carefully crafted commands.  Commands are usually at the end of the body.  One per line.  Each command line starts with a single space.
        • 
+
      • Enter the command " affects hugin" to assign the report to Hugin.
        • 
+
      • Enter the command " tag translation" to tag the report as being a translation.
        • 
+
      • Attach the file(s) to the email.
        • 
+
      • Send.  It takes about five minutes to process and you get an email back with the result.
      
 
      Replying to a bug report by email is easier.  You don't need to issue the " affects hugin" command since the reply is referenced by the ticket number.
 

      
 
      
@@ -333,115 +241,53 @@
 
      Bug Triage
      
 
      Power users can triage tickets by reading them, understanding, validating and editing their settings such as priority and status.
 
      
-
        
-
      •  Log on to the tracker
-
        • 
-
      •  Start with the oldest bug that has not been triaged yet (status is New and it is not the result of a status reset).
-
        • 
-
      •  Read the ticket and make sure you fully understand it. When in doubt, leave it for more experienced users to triage or ask on the ML.
-
        • 
-
      •  If you determine that the ticket is a duplicate, mark it as such and close it.  You will need to enter the ticket number of the other ticket.
-
        • 
-
      •  There are frequently appearing error messages such as "precondition violation", "false --compression", "Mask is entirely black but white image was not identified as redundant", etc... that need entries in the hugin FAQ - Duplicates should be closed with a link to the FAQ.  If applicable, update the FAQ.
-
        • 
-
      •  Tag the bug liberally and assign status and importance-
-
        • 
-
      •  Add clarifying questions to the bug ticket if applicable. In doing so, compare the currently available information against the requested information listed above in "Reporting a Bug" and the specifics of the report.
-
        • 
-
      •  When in doubt, ask on the ML.
-
        • 
-
      
+
      • Log on to the tracker
        • 
+
      • Start with the oldest bug that has not been triaged yet (status is New and it is not the result of a status reset).
        • 
+
      • Read the ticket and make sure you fully understand it. When in doubt, leave it for more experienced users to triage or ask on the ML.
        • 
+
      • If you determine that the ticket is a duplicate, mark it as such and close it.  You will need to enter the ticket number of the other ticket.
        • 
+
      • There are frequently appearing error messages such as "precondition violation", "false --compression", "Mask is entirely black but white image was not identified as redundant", etc... that need entries in the hugin FAQ - Duplicates should be closed with a link to the FAQ.  If applicable, update the FAQ.
        • 
+
      • Tag the bug liberally and assign status and importance-
        • 
+
      • Add clarifying questions to the bug ticket if applicable. In doing so, compare the currently available information against the requested information listed above in "Reporting a Bug" and the specifics of the report.
        • 
+
      • When in doubt, ask on the ML.
      
 
      Understanding Ticket Status
      
 
      As the ticket evolves throughout its life cycle, it can have the following stati:
 
      
-
        
-
      •  New:  All tickets are born with the New status.  Moreover, if a user has made a change to a ticket and want to draw triager attention, he will reset the status to New.  This is particularly important for tickets with status Incomplete that risk to expire if not reset to New.  Try not to leave a New status after looking at a ticket, unless you are completely clueless about it.  Set it to Triaged if you tagged it, verified that it is not Incomplete or Invalid.
-
        • 
-
      
-
        
-
      •  Incomplete:  Triagers will set the status to incomplete if information is missing / expected from the reporter, or if the contributed patch requires some extra work.  Usually they will post a note detailing what information is required.  If there is no further activity within 60 days, the ticket will expire.  It is important that whoever completes / adds to the ticket set the status again to New, to draw attention to the extra information.  An email warning is sent a few days before expiry.
-
        • 
-
      
-
        
-
      •  Opinion:  Before setting the status to Opinion a triager will check if it is possible to accomodate the wish, e.g. with a preference.  But sometimes things are just too far fetched and Hugin is not an [1].  Please respect it if one of your ticket has been marked as an Opinion and don't start a flame.  If you mark a ticket as an Opinion make sure to provide alternatives / justification (e.g. list alternative tools that are better suited to solve the problem described).  Use sparingly.
-
        • 
-
      
-
        
-
      •  Invalid:  A bug is set to Invalid if it was filed against an older version and is no longer applicable; or if the problem is not in the code; or if the contributed patch will never be accepted.
-
        • 
-
      
-
        
-
      •  Won't fix:  The behavior is known, but for some reason it won't be fixed, e.g. the code causing it has become or will become obsolete in a subsequent release, or the bug is just an annoyance that would take too much effort to fix. Or the behavior is "odd" to some people, but useful for others. 
-
        • 
-
      
-
        
-
      •  Confirmed:  It's on our radar screen.  we know what needs to be done in the code, but there are no resources to tackle it yet.  This is also the status to give to ticket with contributed patches.
-
        • 
-
      
-
        
-
      •  Triaged:  Somebody has been looking at the report but it is still work in progress and we don't know yet what the next step will be other than looking at it again.  At least it has not been declared Invalid yet.
-
        • 
-
      
-
        
-
      •  In Progress: A developer has started to tackle the issue.
-
        • 
-
      
-
        
-
      •  Fix Committed: A fix has been committed to the repository.  users with access to bleeding edge builds can test it and confirm if the fix worked or not.  If the fix did not work, report it and set the status to new again.
-
        • 
-
      
-
        
-
      •  Fix Released:  The fix is part of a release.  If users using stable versions after that release find the error again, they can change the status to New and report that the fix did not work.
-
        • 
-
      
+
      • New:  All tickets are born with the New status.  Moreover, if a user has made a change to a ticket and want to draw triager attention, he will reset the status to New.  This is particularly important for tickets with status Incomplete that risk to expire if not reset to New.  Try not to leave a New status after looking at a ticket, unless you are completely clueless about it.  Set it to Triaged if you tagged it, verified that it is not Incomplete or Invalid.
      
+
      • Incomplete:  Triagers will set the status to incomplete if information is missing / expected from the reporter, or if the contributed patch requires some extra work.  Usually they will post a note detailing what information is required.  If there is no further activity within 60 days, the ticket will expire.  It is important that whoever completes / adds to the ticket set the status again to New, to draw attention to the extra information.  An email warning is sent a few days before expiry.
      
+
      • Opinion:  Before setting the status to Opinion a triager will check if it is possible to accomodate the wish, e.g. with a preference.  But sometimes things are just too far fetched and Hugin is not an [1].  Please respect it if one of your ticket has been marked as an Opinion and don't start a flame.  If you mark a ticket as an Opinion make sure to provide alternatives / justification (e.g. list alternative tools that are better suited to solve the problem described).  Use sparingly.
      
+
      • Invalid:  A bug is set to Invalid if it was filed against an older version and is no longer applicable; or if the problem is not in the code; or if the contributed patch will never be accepted.
      
+
      • Won't fix:  The behavior is known, but for some reason it won't be fixed, e.g. the code causing it has become or will become obsolete in a subsequent release, or the bug is just an annoyance that would take too much effort to fix. Or the behavior is "odd" to some people, but useful for others.
      
+
      • Confirmed:  It's on our radar screen.  we know what needs to be done in the code, but there are no resources to tackle it yet.  This is also the status to give to ticket with contributed patches.
      
+
      • Triaged:  Somebody has been looking at the report but it is still work in progress and we don't know yet what the next step will be other than looking at it again.  At least it has not been declared Invalid yet.
      
+
      • In Progress: A developer has started to tackle the issue.
      
+
      • Fix Committed: A fix has been committed to the repository.  users with access to bleeding edge builds can test it and confirm if the fix worked or not.  If the fix did not work, report it and set the status to new again.
      
+
      • Fix Released:  The fix is part of a release.  If users using stable versions after that release find the error again, they can change the status to New and report that the fix did not work.
      
 
      Bug Validation
      
 
      Every user can validate a bug against their system / software and add a comment to validate the bug. We encourage all users to do so. The more validation information we have, the better. We need to narrow down whether a bug applies to a specific operating system or across the board. And it is also very useful to know if a bug applies to a specific context or if it applies also in different contexts.
 
      
-
        
-
      •  To validate a specific bug, simply try to reproduce it by following the instructions described in the ticket.
-
        • 
-
      •  Add a comment to the ticket reporting your observation.
-
        • 
-
      •  Were you able to reproduce the bug?
-
        • 
-
      •  It is important to add context to your validation: what operating system? what version of Hugin?
-
        • 
-
      
+
      • To validate a specific bug, simply try to reproduce it by following the instructions described in the ticket.
        • 
+
      • Add a comment to the ticket reporting your observation.
        • 
+
      • Were you able to reproduce the bug?
        • 
+
      • It is important to add context to your validation: what operating system? what version of Hugin?
      
 

      
 
      
 
      Bug Fixing and Testing
      
 
      Everybody is encouraged to provide fixes and patches to correct bugs. Only developers can add them to the repository. Write access to the repository will be liberally given to users who need it.
 
      
-
        
-
      •  when a developer fixed a bug, he can ask the ML for testing.
-
        • 
-
      •  a fix tested on the developers system only can be set to Pending status.
-
        • 
-
      •  when at least one user validates a fix on a different system and there are no reports that the fix does not work, the bug report can be closed.
-
        • 
-
      
+
      • when a developer fixed a bug, he can ask the ML for testing.
        • 
+
      • a fix tested on the developers system only can be set to Pending status.
        • 
+
      • when at least one user validates a fix on a different system and there are no reports that the fix does not work, the bug report can be closed.
      
 

      
 
      
 
      Triaging Policy
      
-
        
-
      •  The more complete a bug report, the more attention it is likely to get.
-
        • 
-
      
+
      • The more complete a bug report, the more attention it is likely to get.
      
 
      Importance
      
-
        
-
      •  Members of the Hugin Bug Hunter team can set the importance of a bug.
-
        • 
-
      •  You can indicate that a bug is important to you by hitting the "affect me too" button.
-
        • 
-
      
+
      • Members of the Hugin Bug Hunter team can set the importance of a bug.
        • 
+
      • You can indicate that a bug is important to you by hitting the "affect me too" button.
      
 
      Ticket Assignement
      
-
        
-
      •  The tracker enables the assignment of a ticket to a person. It is considered rude to assign a ticket to somebody else without their prior consent. Developers sometimes assign a ticket to themselves to signal they are working on it, but we do not use this feature too often.
-
        • 
-
      •  The tracker allows the subscription of somebody else to a ticket.  You can do so once if you think a person should be aware of a ticket.  Then add a note to that ticket and the person concerned will receive it in her mail.  But if the person decides otherwise and unsubscribes from the ticket, please respect it.
-
        • 
-
      
-
      Tips & Tricks
      
+
      • The tracker enables the assignment of a ticket to a person. It is considered rude to assign a ticket to somebody else without their prior consent. Developers sometimes assign a ticket to themselves to signal they are working on it, but we do not use this feature too often.
        • 
+
      • The tracker allows the subscription of somebody else to a ticket.  You can do so once if you think a person should be aware of a ticket.  Then add a note to that ticket and the person concerned will receive it in her mail.  But if the person decides otherwise and unsubscribes from the ticket, please respect it.
      
+
      Tips & Tricks
      
 
      If you know the old SourceForge bug number (e.g. form a comment on a migrated ticket), you can find it at the URL
 
      
 
       https://bugs.launchpad.net/bugs/${name}
@@ -450,8 +296,12 @@
 will redirect you to https://bugs.launchpad.net/hugin/+bug/679179
 
      
 
+
+
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Trackers&oldid=13691[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Trackers&oldid=13691"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Hugin translation guide - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin translation guide

    -
    -
    From PanoTools.org Wiki
    +

    Hugin translation guide

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    • 1 Introduction
    • 2 Getting Started on translations
      • @@ -86,52 +82,21 @@

      If you were instead looking for information about the translation parameters TrX, TrY and TrZ, please have a look at the image positioning model.

      Getting Started on translations

      -
        -
      • 1. Get your language file -
        • -
      -
      -
      Each language version of hugin uses a different *.po file (just like "fr.po" for French or "ja.po" for Japanese) containing all the translated strings. The country codes use the ISO 639-1 naming convention. -
      -
      In general, you need the latest *.po file, usually the one for the language you want to modify. You can download it from the Mercurial repository: in this list of files navigate to your *.po file, click on the file name and then use the link "Download this file" to save the "raw" file to your local hard disk. -
      -
      If there is yet no translation file for your language you can use the file hugin.pot and rename that using the above naming convention or just ask the developers list for assistance. -
      -
      -
        -
      • 2. Edit your *.po file -
        • -
      -
      -
      To edit the *.po or *.pot files, use poedit (it is a cross-platform PO files editor which runs on Mac OS X, Unix and Windows) or kbabel (it runs on any KDE platform). Note that you don't have to translate everything if you don't have time or knowledge to do it all. Also check below for things that shouldn't be translated (like software names) or for some explanations on specific words. -
      -
      Sort by translation to see untranslated entries first and start translating. -
      -
      Watch out for variables, keyboard shortcuts and line breaks: be careful to include terms starting with a percent symbol ("%") unaltered since those are placeholders for values (see overview). Also watch for combinations of an ampersand symbol ("&") plus the following character (a-x or A-X) since those represent keyboard shortcuts. You can use a translated character for these, but keep in mind that these shortcuts have to be unique in each (sub-)menu. A "\n" depicts a line break. -
      -
      Items marked as fuzzy actually don't use their "translation" in the GUI, so the user will see the original English string instead. These automagic suggestions naturally fail often, so please compare a fuzzy translation thoroughly with the original phrase. Remove the fuzzy tag when the translation is correct(ed). -
      -
      Note on comments: When using a version of Poedit before 1.4.3, editing comments directly in the right pane doesn't work, the text isn't saved into the .po file. To edit comments, use the "edit comment" dialogue from the menu. With Poedit 1.4.3 and later, please note that to see the comment window you have to check "View / Show comment window", and to be able to modify the comment you must go to "File / Preferences..." and check "Comment window is editable" in the "Editor" tab. Current versions diplay comment icons in the left column by default, the comment itself is shown in the sidebar. -
      -
      -
        -
      • 3. Verify your translation -
        • -
      -
      -
      In order to test your new translation and as well save some time for the developers who apply your file to trunk it's recommanded to check your newly translated po file for syntax errors. It's also a good idea to temporarily load your new translation file into the latest available hugin build. -
      -
      -
        -
      • 4. Submit your *.po file, or even better, commit your changes through Mercurial -
          -
        • You can submit your edited translation via hugin's tracker on launchpad (you'll need a launchpad account to log in). Add the tags "translation" and "hugin" and attach your file. -
          • -
        • An even better solution, but which the first time takes you a few more minutes to set everything up, is to use Hugin's revision control system. For more information see Become a Power Translator below. -
          • -
        -
        • -
      +
      • 1. Get your language file
      +
      Each language version of hugin uses a different *.po file (just like "fr.po" for French or "ja.po" for Japanese) containing all the translated strings. The country codes use the ISO 639-1 naming convention.
      +
      In general, you need the latest *.po file, usually the one for the language you want to modify. You can download it from the Mercurial repository: in this list of files navigate to your *.po file, click on the file name and then use the link "Download this file" to save the "raw" file to your local hard disk.
      +
      If there is yet no translation file for your language you can use the file hugin.pot and rename that using the above naming convention or just ask the developers list for assistance.
      +
      • 2. Edit your *.po file
      +
      To edit the *.po or *.pot files, use poedit (it is a cross-platform PO files editor which runs on Mac OS X, Unix and Windows) or kbabel (it runs on any KDE platform). Note that you don't have to translate everything if you don't have time or knowledge to do it all. Also check below for things that shouldn't be translated (like software names) or for some explanations on specific words.
      +
      Sort by translation to see untranslated entries first and start translating.
      +
      Watch out for variables, keyboard shortcuts and line breaks: be careful to include terms starting with a percent symbol ("%") unaltered since those are placeholders for values (see overview). Also watch for combinations of an ampersand symbol ("&") plus the following character (a-x or A-X) since those represent keyboard shortcuts. You can use a translated character for these, but keep in mind that these shortcuts have to be unique in each (sub-)menu. A "\n" depicts a line break.
      +
      Items marked as fuzzy actually don't use their "translation" in the GUI, so the user will see the original English string instead. These automagic suggestions naturally fail often, so please compare a fuzzy translation thoroughly with the original phrase. Remove the fuzzy tag when the translation is correct(ed).
      +
      Note on comments: When using a version of Poedit before 1.4.3, editing comments directly in the right pane doesn't work, the text isn't saved into the .po file. To edit comments, use the "edit comment" dialogue from the menu. With Poedit 1.4.3 and later, please note that to see the comment window you have to check "View / Show comment window", and to be able to modify the comment you must go to "File / Preferences..." and check "Comment window is editable" in the "Editor" tab. Current versions diplay comment icons in the left column by default, the comment itself is shown in the sidebar.
      +
      • 3. Verify your translation
      +
      In order to test your new translation and as well save some time for the developers who apply your file to trunk it's recommanded to check your newly translated po file for syntax errors. It's also a good idea to temporarily load your new translation file into the latest available hugin build.
      +
      • 4. Submit your *.po file, or even better, commit your changes through Mercurial +
        • You can submit your edited translation via hugin's tracker on launchpad (you'll need a launchpad account to log in). Add the tags "translation" and "hugin" and attach your file.
          • +
        • An even better solution, but which the first time takes you a few more minutes to set everything up, is to use Hugin's revision control system. For more information see Become a Power Translator below.

      How to check the translated file for syntax errors

      The best way to check if your newly translated XX.po file hasn't any error, is to run the following command in a terminal (if you are under linux)

      @@ -142,56 +107,30 @@

      Note: if you use Poedit, it gives you warning when the po file you are trying to save contains errors. In the error message read the line where the error is listed then close poedit and open the file in a text editor and look for errors in the specific line.

      Common mistakes

      -
        -
      • Remember that the first line in a po file need to be commented as shown here (note the # sign at the beggining of the line) -
        • -
      +
      • Remember that the first line in a po file need to be commented as shown here (note the # sign at the beggining of the line)
      # French translations for hugin package.
 # Copyright (C) 2004 Pablo dAngelo
 # This file is distributed under the same license as the hugin package.
 # Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>, 2004-2009, 2010.
      -
        -
      • Watch carefully for retaining placeholders: -
        • -
      -
      -
      If you take the following string: -
      -
      +
      • Watch carefully for retaining placeholders:
      +
      If you take the following string:
      Open "%s" file
      -
      -
      the %s must remain the same in the translated string because it is a formatting placeholder where the code will display a variable (e.g. a filename, a number etc...) at run time. For example %s is a string and %0.3f is a number with three post-comma digits. -
      -
      +
      the %s must remain the same in the translated string because it is a formatting placeholder where the code will display a variable (e.g. a filename, a number etc...) at run time. For example %s is a string and %0.3f is a number with three post-comma digits.


      -
        -
      • Watch out for the new line (\n) indicator at the end of the string. For example in the string: -
        • -
      +
      • Watch out for the new line (\n) indicator at the end of the string. For example in the string:
      This is a test for a new line string\n
      -
      -
      The \n symbol must remain at the end of the translated string -
      -
      -
        -
      • Watch out for quotation marks ". They must be quoted as \" -
        • -
      +
      The \n symbol must remain at the end of the translated string
      +
      • Watch out for quotation marks ". They must be quoted as \"

      Use your new translation file

      poedit updates your PO file and creates a MO file for your language. You can rename your MO file into hugin.mo and replace the hugin.mo file from your current installation (don't forget to make a backup of the original MO file, just in case).

      -
        -
      • On Windows the MO file is in your hugin directory, in share\locale\XX\LC_MESSAGES\hugin.mo, where XX is your language. -
        • -
      • On Linux the MO file is under /usr/local/share/locale/XX/LC_MESSAGES/hugin.mo -
        • -
      • On Mac OS X the MO file is inside the hugin bundle: just click on Hugin.app and from the context menu choose "Show package contents", from there it's under Contents/Resources/XX.lproj/locale/hugin.mo (XX is your language code). -
        • -
      +
      • On Windows the MO file is in your hugin directory, in share\locale\XX\LC_MESSAGES\hugin.mo, where XX is your language.
        • +
      • On Linux the MO file is under /usr/local/share/locale/XX/LC_MESSAGES/hugin.mo
        • +
      • On Mac OS X the MO file is inside the hugin bundle: just click on Hugin.app and from the context menu choose "Show package contents", from there it's under Contents/Resources/XX.lproj/locale/hugin.mo (XX is your language code).

      If you want to you can also rebuild hugin (doesn't have to be a heavy job when you only changed the .po file, the process only updates that part).

      Contribute your Translation

      @@ -200,55 +139,30 @@

      You can submit our translation via the web or via email.

      Web

      -
        -
      • Log on with your Launchpad account. -
        • -
      • Start reporting a new ticket. -
        • -
      • Enter a title/summary (e.g. German Translation). -
        • -
      • Launchpad will look for duplicates. This is good for bug reports, but for updated translations you can ignore it, scroll down to the bottom of the page and hit the "No, I need to report a new bug". -
        • -
      • On the reporting form, enter a description in the "Further Information" field, then scroll to the bottom and hit the link "Extra options". -
        • -
      • There you will find an Attachment field. Hit it and browse to the .po file. When the bug tracker asks you if this is a patch: click yes, even though technically it isn't one. In this case it will help make developers aware of a file that needs to be reviewed and added to the codebase. -
        • -
      • Click the "Submit Bug Report" button. -
        • -
      +
      • Log on with your Launchpad account.
        • +
      • Start reporting a new ticket.
        • +
      • Enter a title/summary (e.g. German Translation).
        • +
      • Launchpad will look for duplicates. This is good for bug reports, but for updated translations you can ignore it, scroll down to the bottom of the page and hit the "No, I need to report a new bug".
        • +
      • On the reporting form, enter a description in the "Further Information" field, then scroll to the bottom and hit the link "Extra options".
        • +
      • There you will find an Attachment field. Hit it and browse to the .po file. When the bug tracker asks you if this is a patch: click yes, even though technically it isn't one. In this case it will help make developers aware of a file that needs to be reviewed and added to the codebase.
        • +
      • Click the "Submit Bug Report" button.

      eMail

      Reporting a new ticket by email works too, but there are some critical conditions:

      -
        -
      • Your email account must be registered with Launchpad. -
        • -
      • You must have an OpenPGP key associated with it and known to Launchpad. -
        • -
      • You must craft your email carefully. A misplaced space or a typo can doom your report. -
        • -
      • To be safe, use TEXT email, not HTML -- a good habit anyway. In most email client you recognize the TEXT mode by the lack of a formatting toolbar). -
        • -
      +
      • Your email account must be registered with Launchpad.
        • +
      • You must have an OpenPGP key associated with it and known to Launchpad.
        • +
      • You must craft your email carefully. A misplaced space or a typo can doom your report.
        • +
      • To be safe, use TEXT email, not HTML -- a good habit anyway. In most email client you recognize the TEXT mode by the lack of a formatting toolbar).

      The message:

      -
        -
      • From: your Launchpad-registered email address -
        • -
      • To: new@bugs.launchpad.net -
        • -
      • Subject: title of the bug -
        • -
      • Body: description + carefully crafted commands. Commands are usually at the end of the body. One per line. Each command line starts with a single space. -
        • -
      • Enter the command " affects hugin" to assign the report to Hugin. -
        • -
      • Enter the command " tag translation" to tag the report as being a translation. -
        • -
      • Attach the file(s) to the email. -
        • -
      • Send. It takes about five minutes to process and you get an email back with the result. -
        • -
      +
      • From: your Launchpad-registered email address
        • +
      • To: new@bugs.launchpad.net
        • +
      • Subject: title of the bug
        • +
      • Body: description + carefully crafted commands. Commands are usually at the end of the body. One per line. Each command line starts with a single space.
        • +
      • Enter the command " affects hugin" to assign the report to Hugin.
        • +
      • Enter the command " tag translation" to tag the report as being a translation.
        • +
      • Attach the file(s) to the email.
        • +
      • Send. It takes about five minutes to process and you get an email back with the result.

      Become a Power Translator

      After adding your po file to Hugin's tracker, the developers still need to integrate it, which is not easy as it means dealing with conflicting version (but how should a developer know which one of two conflicting sentences in a foreign language is the right one?). Thus using the same Mercurial approach to translation reduces considerably the burden on the rest of the team and is very much appreciated. Translation is a development too!

      So instead of adding your po file to the tracker, you can integrate it yourself. You'll first need a Sourceforge user account (register here if you don't have one yet. Then tell the developers on the mailing list what your user account is, so that they can grant you access to Mercurial, the revision control system (you'll need this before following the next steps). @@ -257,37 +171,20 @@

      For Windows users


      -
        -
      • 1. Get and install TortoiseHg. -
        • -
      • 2. In the explorer create a new folder, e.g. hugin-hg. Then do a right click on the created folder and select "Clone" in the "TortoiseHG" submenu. Select the repository http://hg.code.sf.net/p/hugin/hugin as source path and select "Clone". -
        • -
      • 3. Now select "Repository Settings" in the "TortoiseHG" context menu of the folder. In the section "Synchronize" add a new setting with an alias/name e.g. "writeRepo" and the URL ssh://YOUR-SOURCEFORGE-USERNAME@hg.code.sf.net/p/hugin/hugin , close the settings dialog. (This needs to be done only once.) -
        • -
      • 4. You can commit your (partial) results anytime: right-click on the folder and select in the context menu "Hg Commit..." - enter a short text describing what you did (e.g.: "updated French translation"), check that only your modified .po file is selected and click OK. Note that you can select only the "translation" folder instead of "hugin-trunk" if you modified only files within "translation". -
        • -
      • 5. Open the folder context menu, open "TortoiseHG/Synchronize". Select your in step 2 created setting in the combobox and select "Push". (Or you can also push from the "Repository Explorer".) -
        • -
      +
      • 1. Get and install TortoiseHg.
        • +
      • 2. In the explorer create a new folder, e.g. hugin-hg. Then do a right click on the created folder and select "Clone" in the "TortoiseHG" submenu. Select the repository http://hg.code.sf.net/p/hugin/hugin as source path and select "Clone".
        • +
      • 3. Now select "Repository Settings" in the "TortoiseHG" context menu of the folder. In the section "Synchronize" add a new setting with an alias/name e.g. "writeRepo" and the URL ssh://YOUR-SOURCEFORGE-USERNAME@hg.code.sf.net/p/hugin/hugin , close the settings dialog. (This needs to be done only once.)
        • +
      • 4. You can commit your (partial) results anytime: right-click on the folder and select in the context menu "Hg Commit..." - enter a short text describing what you did (e.g.: "updated French translation"), check that only your modified .po file is selected and click OK. Note that you can select only the "translation" folder instead of "hugin-trunk" if you modified only files within "translation".
        • +
      • 5. Open the folder context menu, open "TortoiseHG/Synchronize". Select your in step 2 created setting in the combobox and select "Push". (Or you can also push from the "Repository Explorer".)

      For Linux/Unix/OSX

      -
        -
      • 1. Get and install Mercurial. (
        apt-get install mercurial
        on Ubuntu/Debian,
        yum install mercurial
        on Fedora, 
        emerge mercurial
        on Gentoo) -
        • -
      • 2. Get the full Hugin source code. -
        • -
      -
      -hg clone ssh://YOUR-SOURCEFORGE-USERNAME@hg.code.sf.net/p/hugin/hugin  hugin
+
      • 1. Get and install Mercurial. (
        apt-get install mercurial
         on Ubuntu/Debian,
        yum install mercurial
         on Fedora, 
        emerge mercurial
         on Gentoo)
        • 
+
      • 2. Get the full Hugin source code.
      
+
      hg clone ssh://YOUR-SOURCEFORGE-USERNAME@hg.code.sf.net/p/hugin/hugin  hugin
 
      
-
        
-
      • 3. Do your translation work inside the folder src/translations
-
        • 
-
      • 4. You can commit your (partial) results anytime by running the commands
-
        • 
-
      
-
      -hg pull
+
      • 3. Do your translation work inside the folder src/translations
        • 
+
      • 4. You can commit your (partial) results anytime by running the commands
      
+
      hg pull
 hg commit TRANSLATEDFILE.po -m "updated LANGUAGE translation"
 hg push  
 
      
@@ -296,20 +193,11 @@
 
      The following times
      
 
      The next time you want to work on the translations, you'll have first to retrieve the latest version of the files (as someone else might have modified something in the meantime) before working on it and then commiting it again.
 
      
-
      
-
      For Windows users
-
      
-
      Simply right-click your "hugin" folder and select "Synchronize" in the "TortoiseHG" menu. In the dialog select "Update" in the combobox "After pull" (You can select in the settings under "Synchronize" that this is the default setting). Now select "Pull". 
-
      
-
      
-
      
-
      For Linux/Unix/OSX
-
      
-
      change into the folder with the files and execute
-
      
-
      
-
      -hg pull 
+
      For Windows users
      
+
      Simply right-click your "hugin" folder and select "Synchronize" in the "TortoiseHG" menu. In the dialog select "Update" in the combobox "After pull" (You can select in the settings under "Synchronize" that this is the default setting). Now select "Pull".
      
+
      For Linux/Unix/OSX
      
+
      change into the folder with the files and execute
      
+
      hg pull 
 hg up -c
 
       
 
      and then you can continue from step 3 above.
@@ -318,300 +206,127 @@
 
      Prior to a release, you probably want to focus your translation work on getting everything ready for that release. Every release has its own branch, so if you work on the default branch (like above), your work will not make it into the immediately following release.
 
      To change between different branches use "hg update":
 
      
-
      
-
      To switch to 2014.0 branch use "hg update 2014.0"
-
      
-
      To switch to default branch back use "hg update default"
-
      
-
      
+
      To switch to 2014.0 branch use "hg update 2014.0"
      
+
      To switch to default branch back use "hg update default"
      
 
      The current branch can be displayed with "hg branch". When you commit, the changeset goes into the currently selected branch.
 
      
 
      Extra perk - Build the latest Hugin
      
-
      
-
      If you're already here, you may want to also build and enjoy the latest Hugin. Some of the current contributors to the build, distribution and code of Hugin have learned this way. You are just a few clicks away from building your own bleeding edge Hugin. Find your platform in Build your Own Test Builds section of the wiki and follow the instructions.
-
      
-
      Welcome to the club!
-
      
-
      
+
      If you're already here, you may want to also build and enjoy the latest Hugin. Some of the current contributors to the build, distribution and code of Hugin have learned this way. You are just a few clicks away from building your own bleeding edge Hugin. Find your platform in Build your Own Test Builds section of the wiki and follow the instructions.
      
+
      Welcome to the club!
      
 
      Translation guide for specific terms
      
 
      Note to translators, please add your language variant to the term on a new line in the same format as NL=
       Also add your own difficult terms that are not mentioned here.      
 
      Note to developers, please check and enhance the meanings of these terms if they are unclear or incorrect.
 
      
-
      
-
       Aligning versus Finding control points
-
      
-
       Problem= they appear to be similar or the same, can they be interchanged?
-
      
-
      
-
      
-
       Anchor
-
      
-
       Meaning=Reference
-
      
-
       NL=referentie (was anker)
-
      
-
      
-
      
-
       bundle
-
      
-
       Meaning=A technique for distributing OS X software as a single file.
-
      
-
       NL=bundle (bundel?)
-
      
-
      
-
      
-
       bundled version
-
      
-
       Meaning=? Any packaged software will contain multiple files, these files are said to be 'bundled' (not just OS X)
-
      
-
       NL=ingebouwde versie (gebundelde versie?)
-
      
-
      
-
      
-
       button
-
      
-
       DE=Schaltfläche
-
      
-
      
-
      
-
       Camera response (C. r. curve)
-
      
-
       Meaning=it corresponds with photo-electrical transfer function, and I am not sure can I translate it to "opto-electic curve of camera" in my language, because stright tranlation of "camera response" statement sounds trivial and not clear.
-
      
-
       PL=krzywa optoelektryczna aparatu?
-
      
-
      
-
      
-
       control points
-
      
-
       Meaning=corresponding areas in two images (or the same image for horizontal and vertical control points)
-
      
-
       ET=juhtpunktid
-
      
-
       NL=ijkpunten (was controle punten), IJkpunten bij hoofdletters
-
      
-
      
-
      
-
       Crop factor
-
      
-
       Meaning=The physical size of a CCD sensor relative to a 35mm frame.
-
      
-
      
-
      
-
       Cropped (images)
-
      
-
       Meaning=image cut smaller than the original size
-
      
-
       Discussion=Should this be translated? Like Blend, this is jargon, may be clearer when untranslated?
-
      
-
       ET=kärbitud (pildid)
-
      
-
       NL=uitgesneden (afbeeldingen)
-
      
-
      
-
      
-
       Custom parameters 
-
      
-
       Meaning=parameters other than standard (+context???)
-
      
-
       NL=aangepaste parameters
-
      
-
      
-
      
-
       Estimate (position, FoV, etc.)
-
      
-
       Meaning=? in my book, estimate means an educated guess. I get the impression that a more exact term is intended for hugin. Where can this term be replaced with "calculate" or "determine"?
-
      
-
       ET=määratlema
-
      
-
       NL=bepalen (eng:determine), bereken (eng:calculate)  alternative suggestion: Schatten (eng:estimate)
-
      
-
      
-
      
-
       Exposure blending (or Exposure fusion)
-
      
-
       Meaning=Taking a bracketed photo stack and picking the best bits to create a new image. Hugin tries to use the phrase 'Exposure fusion' rather than 'blending' as the tool for this is enfuse.
-
      
-
       NL=Belichtings lagen samenvoegen (Note: enblend = samenvoegen; enfuse = belichtings lagen samenvoegen?)
-
      
-
      
-
      
-
       Field of View
-
      
-
       Meaning=Horizontal Angle of view
-
      
-
       ET=vaateväli
-
      
-
       NL=beeldhoek
-
      
-
      
-
      
-
       flatfield
-
      
-
       Meaning=An astronomical technique, using a photo taken with the lens covered or of an even white surface to calibrate normal photos
-
      
-
       NL=flatfield (astrofoto jargon, ook in NL gebruikt)
-
      
-
      
-
      
-
       flatfile
-
      
-
       Meaning=?
-
      
-
       NL=?
-
      
-
      
-
      
-
       grayscale
-
      
-
       Meaning=monochrome colourspace. Typically grayscale images can have many shades of gray as well as black and white.
-
      
-
       ET=halltoonid
-
      
-
       NL=grijsschaal (kan beter!)
-
      
-
      
-
      
-
       High Dynamic Range (HDR)
-
      
-
       Meaning=Luminance values are within a large numeric range (typically floating point with a linear response)
-
      
-
       NL=Hoog Dynamisch Bereik (HDR)
-
      
-
      
-
      
-
       image
-
      
-
       Meaning=photo, scan, ....
-
      
-
       ET=pilt
-
      
-
       NL=afbeelding
-
      
-
       DE=Bild
-
      
-
      
-
      
-
       keypoint
-
      
-
       Meaning=
-
      
-
       DE=Merkmalspunkt (see Article about SIFT in the German Wikipedia)
-
      
-
      
-
      
-
       Low Dynamic Range (LDR)
-
      
-
       Meaning=Luminance values are within a small numeric range (typically 8-bit or 16bit integer with a non-linear response curve).
-
      
-
       NL=Laag Dynamisch Bereik (LDR)
-
      
-
      
-
      
-
       mapping
-
      
-
       Meaning=render and distort an image to a different projection?
-
      
-
       NL=translatie, afbeelding, vervorming, projectie?
-
      
-
      
-
      
-
       Num. Transf.
-
      
-
       Meaning=Numerical Transform.  Rotation of panorama roll, pitch and yaw by manually entering numbers.
-
      
-
       NL=Num. Transf.
-
      
-
      
-
      
-
       Photometric Alignment
-
      
-
       Meaning=Determining relative exposure, camera response and vignetting
-
      
-
       ET=fotomeetriline joondamine
-
      
-
       NL=fotometrische uitlijning (beter?: fotometrische afstemming)
-
      
-
      
-
      
-
       Photometric Optimisation
-
      
-
       Meaning=Optimisation of non-mapping image parameters, such as 'Camera response', Vignetting and Exposure.
-
      
-
       ET=fotomeetriline optimeerimine
-
      
-
       NL=fotometrische optimalisatie
-
      
-
      
-
      
-
       pyramid image
-
      
-
       Meaning=This is the practice of creating a stack of successively smaller versions of an image, useful for many image manipulation tasks.
-
      
-
       NL=piramidale afbeelding
-
      
-
      
-
      
-
       Seam blending
-
      
-
       Meaning=Taking two or more partially overlapping photos and blending then with a seam down the middle of the overlap.  The tool typically used for this is enblend
-
      
-
      
-
      
-
       Stitcher (the tab)
-
      
-
       Meaning= Where the actual combining of the images is done
-
      
-
       ET=Ühendaja
-
      
-
       NL=Samenvoegen (alt: Combineren, Naaien?)
-
      
-
      
-
      
-
       Vertical or Horizontal guide
-
      
-
       Meaning=Horizontal or Vertical "control points"
-
      
-
       NL=h/v hulp (suggestie: ijklijnen)?
-
      
-
      
+
      Aligning versus Finding control points
      
+
      Problem= they appear to be similar or the same, can they be interchanged?
      
+
      Anchor
      
+
      Meaning=Reference
      
+
      NL=referentie (was anker)
      
+
      bundle
      
+
      Meaning=A technique for distributing OS X software as a single file.
      
+
      NL=bundle (bundel?)
      
+
      bundled version
      
+
      Meaning=? Any packaged software will contain multiple files, these files are said to be 'bundled' (not just OS X)
      
+
      NL=ingebouwde versie (gebundelde versie?)
      
+
      button
      
+
      DE=Schaltfläche
      
+
      Camera response (C. r. curve)
      
+
      Meaning=it corresponds with photo-electrical transfer function, and I am not sure can I translate it to "opto-electic curve of camera" in my language, because stright tranlation of "camera response" statement sounds trivial and not clear.
      
+
      PL=krzywa optoelektryczna aparatu?
      
+
      control points
      
+
      Meaning=corresponding areas in two images (or the same image for horizontal and vertical control points)
      
+
      ET=juhtpunktid
      
+
      NL=ijkpunten (was controle punten), IJkpunten bij hoofdletters
      
+
      Crop factor
      
+
      Meaning=The physical size of a CCD sensor relative to a 35mm frame.
      
+
      Cropped (images)
      
+
      Meaning=image cut smaller than the original size
      
+
      Discussion=Should this be translated? Like Blend, this is jargon, may be clearer when untranslated?
      
+
      ET=kärbitud (pildid)
      
+
      NL=uitgesneden (afbeeldingen)
      
+
      Custom parameters
      
+
      Meaning=parameters other than standard (+context???)
      
+
      NL=aangepaste parameters
      
+
      Estimate (position, FoV, etc.)
      
+
      Meaning=? in my book, estimate means an educated guess. I get the impression that a more exact term is intended for hugin. Where can this term be replaced with "calculate" or "determine"?
      
+
      ET=määratlema
      
+
      NL=bepalen (eng:determine), bereken (eng:calculate)  alternative suggestion: Schatten (eng:estimate)
      
+
      Exposure blending (or Exposure fusion)
      
+
      Meaning=Taking a bracketed photo stack and picking the best bits to create a new image. Hugin tries to use the phrase 'Exposure fusion' rather than 'blending' as the tool for this is enfuse.
      
+
      NL=Belichtings lagen samenvoegen (Note: enblend = samenvoegen; enfuse = belichtings lagen samenvoegen?)
      
+
      Field of View
      
+
      Meaning=Horizontal Angle of view
      
+
      ET=vaateväli
      
+
      NL=beeldhoek
      
+
      flatfield
      
+
      Meaning=An astronomical technique, using a photo taken with the lens covered or of an even white surface to calibrate normal photos
      
+
      NL=flatfield (astrofoto jargon, ook in NL gebruikt)
      
+
      flatfile
      
+
      Meaning=?
      
+
      NL=?
      
+
      grayscale
      
+
      Meaning=monochrome colourspace. Typically grayscale images can have many shades of gray as well as black and white.
      
+
      ET=halltoonid
      
+
      NL=grijsschaal (kan beter!)
      
+
      High Dynamic Range (HDR)
      
+
      Meaning=Luminance values are within a large numeric range (typically floating point with a linear response)
      
+
      NL=Hoog Dynamisch Bereik (HDR)
      
+
      image
      
+
      Meaning=photo, scan, ....
      
+
      ET=pilt
      
+
      NL=afbeelding
      
+
      DE=Bild
      
+
      keypoint
      
+
      Meaning=
      
+
      DE=Merkmalspunkt (see Article about SIFT in the German Wikipedia)
      
+
      Low Dynamic Range (LDR)
      
+
      Meaning=Luminance values are within a small numeric range (typically 8-bit or 16bit integer with a non-linear response curve).
      
+
      NL=Laag Dynamisch Bereik (LDR)
      
+
      mapping
      
+
      Meaning=render and distort an image to a different projection?
      
+
      NL=translatie, afbeelding, vervorming, projectie?
      
+
      Num. Transf.
      
+
      Meaning=Numerical Transform.  Rotation of panorama roll, pitch and yaw by manually entering numbers.
      
+
      NL=Num. Transf.
      
+
      Photometric Alignment
      
+
      Meaning=Determining relative exposure, camera response and vignetting
      
+
      ET=fotomeetriline joondamine
      
+
      NL=fotometrische uitlijning (beter?: fotometrische afstemming)
      
+
      Photometric Optimisation
      
+
      Meaning=Optimisation of non-mapping image parameters, such as 'Camera response', Vignetting and Exposure.
      
+
      ET=fotomeetriline optimeerimine
      
+
      NL=fotometrische optimalisatie
      
+
      pyramid image
      
+
      Meaning=This is the practice of creating a stack of successively smaller versions of an image, useful for many image manipulation tasks.
      
+
      NL=piramidale afbeelding
      
+
      Seam blending
      
+
      Meaning=Taking two or more partially overlapping photos and blending then with a seam down the middle of the overlap.  The tool typically used for this is enblend
      
+
      Stitcher (the tab)
      
+
      Meaning= Where the actual combining of the images is done
      
+
      ET=Ühendaja
      
+
      NL=Samenvoegen (alt: Combineren, Naaien?)
      
+
      Vertical or Horizontal guide
      
+
      Meaning=Horizontal or Vertical "control points"
      
+
      NL=h/v hulp (suggestie: ijklijnen)?
      
 
      Do not translate:
      
-
        
-
      •  Autopano (program name)
-
        • 
-
      •  Autopano-SIFT (program name)
-
        • 
-
      •  Deflate  (zip method)
-
        • 
-
      •  Enblend (program name)
-
        • 
-
      •  EXR (HDR file type)
-
        • 
-
      •  JPEG (file type)
-
        • 
-
      •  LZW (zip method)
-
        • 
-
      •  Nona (program name)
-
        • 
-
      •  Packbits (zip method)
-
        • 
-
      •  PTStitcher (program name)
-
        • 
-
      
+
      • Autopano (program name)
        • 
+
      • Autopano-SIFT (program name)
        • 
+
      • Deflate  (zip method)
        • 
+
      • Enblend (program name)
        • 
+
      • EXR (HDR file type)
        • 
+
      • JPEG (file type)
        • 
+
      • LZW (zip method)
        • 
+
      • Nona (program name)
        • 
+
      • Packbits (zip method)
        • 
+
      • PTStitcher (program name)
      
 
      Technical translation issues
      
 
      Some strings don't appear to be translated, they are apparently generated by the GUI toolkit or the operating system. Most likely they will be in the same language as hugin, because very few people, other than translators, start a program with a specific language other than that of the environment.
 
      The file src/translations/ignored-entries.txt contains a list of ignored entries from the xrc files (which are used to declare most of the hugin UI). If you need to translate a sentence which is there, remove the line from the file and run the extract-messages.sh script to update the .po files.
 
      If you find a source term that isn't correct, spelling or meaning, probably best to bring it up with Pablo d'Angelo or on the hugin mailinglist: [1]
 
      
 
      List of source string problems
      
-
        
-
      •  calculate highest sensible width. (uses every image pixel)
-
        • 
-
      
-
      
-
       I can translate this literally, but is this even helpful in English? (this is a tooltip for the size calc button in the Stitcher tab)
-
      
-
      
+
      • calculate highest sensible width. (uses every image pixel)
      
+
      I can translate this literally, but is this even helpful in English? (this is a tooltip for the size calc button in the Stitcher tab)
      
 

      
 
      
 
      Tips and Tricks
      
@@ -629,8 +344,7 @@
 
      Before running the script, make sure you have wxrc installed. On older Ubuntu, run sudo apt-get install wxrc.  On Ubuntu 10.4 it is sudo apt-get install wx-common.
 
      Then, add the new strings:
 
      
-
      -hg pull
+
      hg pull
 hg up
 cd src/translations
 ./extract-messages.sh
@@ -652,22 +366,22 @@
 
      msgfmt --statistics eo_XX.po
 
      
 
      Issues That Need Work
      
-
        
-
      •  There are more than 1000 strings in the hugin.pot file.  The main translation problem we have now is that many of these strings are in the sourcecode, but not in bits that are used - i.e. there are strings that are being translated unnecessarily (the panodruid for example).
-
        • 
-
      •  The .po files headers are inconsistent. Ideally they would all feature the same license and copyright notice; and they would list all contributors.
-
        • 
-
      
-
      Website / Release Notes
      
+
      • There are more than 1000 strings in the hugin.pot file.  The main translation problem we have now is that many of these strings are in the sourcecode, but not in bits that are used - i.e. there are strings that are being translated unnecessarily (the panodruid for example).
        • 
+
      • The .po files headers are inconsistent. Ideally they would all feature the same license and copyright notice; and they would list all contributors.
      
+
      Website / Release Notes
      
 
      Some translators contribute also translated release notes.  These are published on the web at http://hugin.sourceforge.net/releases/ . Usually the release manager will draft the release notes in English early on in the release process.  Even if they are not linked, you can find them in the repository at http://sourceforge.net/p/hugin/hugin-web/ci/default/tree/releases/
-
      Important: make sure you translate the file from the repository and not the resulting file displayed on the web, e.g. for 2016.2.0 translate the raw version of
-https://sourceforge.net/p/hugin/hugin-web/ci/default/tree/releases/2016.2.0/en.shtml and not the current one from http://hugin.sourceforge.net/releases/ - the former is the source for the page while the latter is the resulting page after server side includes and other server side transformations.
+
      Important: make sure you translate the file from the repository and not the resulting file displayed on the web, e.g. for 2017.0.0 translate the raw version of
+https://sourceforge.net/p/hugin/hugin-web/ci/default/tree/releases/2017.0.0/en.shtml and not the current one from http://hugin.sourceforge.net/releases/ - the former is the source for the page while the latter is the resulting page after server side includes and other server side transformations.
 
      Use the bug tracker to upload your translated html file.
 
      Thanks for your contributions!
 
      
 
+
+
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_translation_guide&oldid=15837[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_translation_guide&oldid=15923"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Icpfind.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Icpfind.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Icpfind.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Icpfind.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,36 +1,32 @@ - + Icpfind - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Icpfind

    -
    -
    From PanoTools.org Wiki
    +

    Icpfind

    +
    From PanoTools.org Wiki
    - -

    icpfind is a command line tool to use the different control point detectors and heuristic control point detector strategies defined at Hugin_Parameters_for_Control_Point_Detectors_dialog from the command line. It does not introduce new functionality, it allows running the different control points detectors from the command line and not only in the GUI. +

    icpfind is a command line tool to use the different control point detectors and heuristic control point detector strategies defined at Hugin_Parameters_for_Control_Point_Detectors_dialog from the command line. It does not introduce new functionality, it allows running the different control points detectors from the command line and not only in the GUI.

    Usage is 

       icpfind --output==output.pto input.pto
@@ -44,8 +40,13 @@
 

    
 
    
 
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Icpfind&oldid=12816[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Icpfind&oldid=12816"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Image_positioning_model.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Image_positioning_model.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Image_positioning_model.html 2017-04-22 17:02:59.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Image_positioning_model.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,38 +1,34 @@ - + Image positioning model - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Image positioning model

    -
    -
    From PanoTools.org Wiki
    +

    Image positioning model

    +
    From PanoTools.org Wiki
    - -


    +


    -

    Contents

    +

    Contents

    Image positioning model

    -

    The panorama tools model to position images in a panorama assumes that all images are shot from a common viewpoint. A common viewpoint is the only way to avoid Parallax between adjacent images, which might cause unrecoverable stitching[*] errors. This point is determined by lens geometry and commonly called no-parallax point. -

    To shoot a panorama the camera can be rotated in three angles around this point: From side to side, up and down and around the optical axis[*] (like a steering wheel). The names used in all panotools products[*] for this three angles are Yaw, Pitch and Roll, a special case of wikipedia: Euler angles[*], the so called wikipedia: Tait–Bryan angles[*]. With same name and meaning they are also used for the wikipedia: Aircraft principal axes[*]. +

    The panorama tools model to position images in a panorama assumes that all images are shot from a common viewpoint. A common viewpoint is the only way to avoid Parallax between adjacent images, which might cause unrecoverable stitching[*] errors. This point is determined by lens geometry and commonly called no-parallax point. +

    To shoot a panorama the camera can be rotated in three angles around this point: From side to side, up and down and around the optical axis[*] (like a steering wheel). The names used in all panotools products[*] for this three angles are Yaw, Pitch and Roll, a special case of wikipedia: Euler angles[*], the so called wikipedia: Tait–Bryan angles[*]. With same name and meaning they are also used for the wikipedia: Aircraft principal axes[*].

    To take a (little) movement of the camera into account, this model has been extended with the translation parameters TrX, TrY and TrZ, which describe the movement of the camera in 3D (see Stitching a photo-mosaic for a more detailed description).

    Coordinate system

    -

    Images are positioned inside a virtual sphere no matter what output projection[*] is used. The center of the result canvas is always Yaw=0 and Pitch=0. Positive Yaw values mean image is positioned right, negative values left. Positive Pitch is up, negative down. Positive Roll values mean the image is rotated clockwise, negative counterclockwise. Yaw and Roll range is from -180° to +180° with both 180° and -180° meaning the same position, Pitch range is from -90° (Nadir) to +90° (Zenith). Yaw=0 is a vertical line through the canvas center, Pitch=0 is the equator of the virtual output sphere, a horizontal line through the canvas center. Roll=0 means the camera was exactly horizontal (for landscape oriented images) or exactly vertical (for portrait oriented images). +

    Images are positioned inside a virtual sphere no matter what output projection[*] is used. The center of the result canvas is always Yaw=0 and Pitch=0. Positive Yaw values mean image is positioned right, negative values left. Positive Pitch is up, negative down. Positive Roll values mean the image is rotated clockwise, negative counterclockwise. Yaw and Roll range is from -180° to +180° with both 180° and -180° meaning the same position, Pitch range is from -90° (Nadir) to +90° (Zenith). Yaw=0 is a vertical line through the canvas center, Pitch=0 is the equator of the virtual output sphere, a horizontal line through the canvas center. Roll=0 means the camera was exactly horizontal (for landscape oriented images) or exactly vertical (for portrait oriented images).

    Source images

    -

    Yaw, Pitch and Roll values of a source image always refer to the optical axis[*]. An image positioned in Yaw=0 and Pitch=0 means the source image optical axis[*] is in the canvas center. Please note that the actual source image center does not need to match the optical axis[*] due to Lens shift correction. Hence the image boundaries of an image with Yaw=0 and Pitch=0 need not to be centered on the result canvas. Other lens correction parameters don't affect image positioning since they are performed symmetrically around the optical axis. +

    Yaw, Pitch and Roll values of a source image always refer to the optical axis[*]. An image positioned in Yaw=0 and Pitch=0 means the source image optical axis[*] is in the canvas center. Please note that the actual source image center does not need to match the optical axis[*] due to Lens shift correction. Hence the image boundaries of an image with Yaw=0 and Pitch=0 need not to be centered on the result canvas. Other lens correction parameters don't affect image positioning since they are performed symmetrically around the optical axis.

    Optimization

    -

    Relative image positions are usually obtained by control points in the optimization step of image alignment. Same as you need at least two needles to pin a printed image to the wall such that it can't move you need at least two control point pairs per image pair to fix their relative position. However, the distance between the control points might be different in both images. It is the duty of the optimizer to find the best approximation. See this post by Helmut Dersch[*]: "Number of Control Points". More control points might be needed to optimize for lens distortion. +

    Relative image positions are usually obtained by control points in the optimization step of image alignment. Same as you need at least two needles to pin a printed image to the wall such that it can't move you need at least two control point pairs per image pair to fix their relative position. However, the distance between the control points might be different in both images. It is the duty of the optimizer to find the best approximation. See this post by Helmut Dersch[*]: "Number of Control Points". More control points might be needed to optimize for lens distortion.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Image_positioning_model&oldid=14522[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Image_positioning_model&oldid=14522"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Interpolation.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Interpolation.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Interpolation.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Interpolation.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,38 +1,34 @@ - + Interpolation - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Interpolation

    -
    -
    From PanoTools.org Wiki
    +

    Interpolation

    +
    From PanoTools.org Wiki
    - -


    +


    -

    Contents

    +

    Contents

    • 1 Definition
    • 2 Types
      • @@ -58,13 +54,19 @@

      Echos

      Although the large kernel sinc interpolators (sinc256 and sinc1024) are far superior if you have small regular details that most likely will cause moiré with less sophisticated interpolators there is some drawback using the sinc versions if you have hard edges. They cause some echos of the edge in either direction. The example images below (enlarged to 400%) have been only interpolated twice - one rotation 5 degrees to the left and one rotation 5 degrees to the right.

      -
      [*]
      Original
      [*]
      Poly 3 interpolator
      [*]
      Sinc 256 interpolator
      +
      [*]
      Original
      [*]
      Poly 3 interpolator
      [*]
      Sinc 256 interpolator


      ---Erik Krause[*] 05:59, 6 Jul 2005 (EDT) +--Erik Krause[*] 05:59, 6 Jul 2005 (EDT)

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Interpolation&oldid=15796[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Interpolation&oldid=15796"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/JPEG.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/JPEG.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/JPEG.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/JPEG.html 2019-01-10 15:34:50.000000000 +0000 @@ -1,46 +1,42 @@ - + JPEG - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    JPEG

    -
    -
    From PanoTools.org Wiki
    +

    JPEG

    +
    From PanoTools.org Wiki
    - -


    -JPEG is an image file format[*] for storing and distributing images, particularly photographs. +


    +JPEG is an image file format[*] for storing and distributing images, particularly photographs. For a detailed technical overview, please refer to the WikiPedia JPEG page[*].

    JPEG files typically have a .jpg file extension. -If you can't see file extensions, you may want to enable windows file extensions[*] +If you can't see file extensions, you may want to enable windows file extensions[*] as you will have great difficulty editing and manipulating image files otherwise.

    Digital cameras typically default to saving photographs in JPEG format as it provides a good compromise between quality and filesize for most uses. JPEG is also a good format for delivering photographic images over the web or in email.

    -

    Contents

    +

    Contents

    • 1 Compression issues
    • 2 EXIF issues
      • @@ -51,34 +47,30 @@

      Compression issues

      JPEG is a lossy compressed file format, this means that a lot of information that is imperceptable to the human eye is discarded - Converting to another file format will not restore this missing data. -

      Unfortunately this degradation can become perceptable if an image is later manipulated, so if you intend to produce high-quality work you might want to switch your camera to take photos in lossless TIFF, RAW or DNG[*] format instead. +

      Unfortunately this degradation can become perceptable if an image is later manipulated, so if you intend to produce high-quality work you might want to switch your camera to take photos in lossless TIFF, RAW or DNG[*] format instead.

      There are a small number of JPEG manipulations that can be performed losslessly, such as cropping, rotation (at 90 degree angles), flipping and removal of CCD artefacts such as bad pixels (see Jpegpixi).

      EXIF issues

      Modern cameras save a lot of information about a photograph (time, lens and exposure data) within the JPEG file as EXIF data. If you are having trouble, one of these causes may be to blame:

      -
        -
      • Rotating a photo may simply flip an EXIF tag from Landscape to Portrait without changing the image itself. The resulting image may or may not appear rotated depending on the viewing software. -
        • -
      -
        -
      • Rotating a photo may rotate the image without changing any EXIF data to suit, this may cause problems when a GUI tool reads the Field of View from the file. To avoid this, use a tool like photomolo[*] to do lossless rotation and let it reset the EXIF tags appropriately. -
        • -
      -
        -
      • Opening and saving a photo may discard all the EXIF data, switch to another image editor. -
        • -
      +
      • Rotating a photo may simply flip an EXIF tag from Landscape to Portrait without changing the image itself. The resulting image may or may not appear rotated depending on the viewing software.
      +
      • Rotating a photo may rotate the image without changing any EXIF data to suit, this may cause problems when a GUI tool reads the Field of View from the file. To avoid this, use a tool like photomolo[*] to do lossless rotation and let it reset the EXIF tags appropriately.
      +
      • Opening and saving a photo may discard all the EXIF data, switch to another image editor.

      Color downsampling issues

      JPEG isn't an RGB file format where each of three red, green and blue channels are saved alongside each other. A JPEG image is typically a monochrome image with two lower resolution color channels.

      This means that applications where color integrity is important like correcting chromatic aberration are not suitable uses for JPEG data.

      Other JPEG limitations

      -

      JPEG doesn't support multiple layers, alpha channels or high dynamic range which means that it isn't much use for work in progress either. When working with such data, lossless file formats are preferable such as PNG, TIFF, PSD or XCF[*]. +

      JPEG doesn't support multiple layers, alpha channels or high dynamic range which means that it isn't much use for work in progress either. When working with such data, lossless file formats are preferable such as PNG, TIFF, PSD or XCF[*].

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=JPEG&oldid=9543[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=JPEG&oldid=9543"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Landscape.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Landscape.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Landscape.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Landscape.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,42 +1,43 @@ - + Landscape - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Landscape

    -
    -
    From PanoTools.org Wiki
    +

    Landscape

    +
    From PanoTools.org Wiki
    - -

    Image orientation with the longer side in horizontal direction +

    Image orientation with the longer side in horizontal direction like usually used for landscape photography (hence the name).

    Most image sensors and many film types have a longer and a shorter side. Shooting landscape gives a wider horizontal and a narrower vertical Field of View in each single shot. For a cylindrical panorama you need less shots for a given field of view if you shoot landscape but you get a lower resolution.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Landscape&oldid=9432[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Landscape&oldid=9432"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_correction_model.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_correction_model.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_correction_model.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_correction_model.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,38 +1,34 @@ - + Lens correction model - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Lens correction model

    -
    -
    From PanoTools.org Wiki
    +

    Lens correction model

    +
    From PanoTools.org Wiki
    - -


    +


    -

    Contents

    +

    Contents

    • 1 Lens correction model
        @@ -57,56 +53,271 @@

        The panorama tools have a very flexible model to correct for typical geometrical lens errors. Even better, it can often even estimate the correction parameters directly from the images in a panorama.

        There are a total of 6 parameters that have to do with lens correction.

        -
          -
        • First of all there is the lens Field of View (FoV) - not exactly an error, but a parameter that determines the image perspective distortion. -
          • -
        • The actual lens correction parameters a, b and c which are used to correct for barrel distortion, pincushion distortion and even wavy distortion. -
          • -
        • The lens shift parameters d and e that correct for the lens optical axis[*] not being in the image center. -
          • -
        +
        • First of all there is the lens Field of View (FoV) - not exactly an error, but a parameter that determines the image perspective distortion.
          • +
        • The actual lens correction parameters a, b and c which are used to correct for barrel distortion, pincushion distortion and even wavy distortion.
          • +
        • The lens shift parameters d and e that correct for the lens optical axis[*] not being in the image center.

        Two more parameters correct for image errors that are not induced by the lens but by a scanner or scanning camera for example. These are the shear parameters f and g.

        Field of View

        The Focal Length is a physical property of the lens. Together with the effective sensor or film size and the focusing distance it approximates the image Field of View (there are other factors that influence it). Caution: Cropping the image changes the Field of View. If you need to crop your source images for a panorama, crop them all to the same size!

        The Field of View together with the lens projection (rectilinear, fisheye or cylindrical for swing lens cameras) determine the image perspective distortion. Perspective distortion is less with a smaller Field of View. See Helmut Dersch page [1] for details about different wide angle perspectives.

        -

        Lens distortion a, b & c parameters

        -

        For perfect rectilinear camera optics, all you would need to know is the field of view. Perfect results could be achieved by simply mapping pixels in the image to the tangent plane[*]. Real lenses deviate from this perfect tangent plane projection. The deviations push and pull fixed points in the scene away from where they would have fallen. Luckily, rather than arbitrary pushes and pulls, almost all deviations occur radially, towards or away from some common center, and luckily the deviation amount is almost the same at a given radius around that center. Hence a model that corrects for this deviation based on the radius gives pretty good results. +

        Lens distortion a, b & c parameters

        +

        For perfect rectilinear camera optics, all you would need to know is the field of view. Perfect results could be achieved by simply mapping pixels in the image to the tangent plane[*]. Real lenses deviate from this perfect tangent plane projection. The deviations push and pull fixed points in the scene away from where they would have fallen. Luckily, rather than arbitrary pushes and pulls, almost all deviations occur radially, towards or away from some common center, and luckily the deviation amount is almost the same at a given radius around that center. Hence a model that corrects for this deviation based on the radius gives pretty good results.

        The lens distortion a, b and c parameters correspond to a third degree polynomial describing radial lens distortion:

        -
        -
        r_{{src}}=({a}r_{{dest}}^{3}+{b}r_{{dest}}^{2}+{c}r_{{dest}}+d)r_{{dest}} -
        -
        -

        where r_{{dest}} and r_{{src}} refer to the normalized radius of an image pixel. The center point of this radius is where the optical axis[*] hits the image - normally the image center. Normalized means here that the largest circle that completely fits into an image is said to have radius=1.0 . (In other words, radius=1.0 is half the smaller side of the image.) A perfect lens would have a=b=c=0.0 and d=1.0 which resolves into r_{{src}}=r_{{dest}}. +

        +

        where and refer to the normalized radius of an image pixel. The center point of this radius is where the optical axis[*] hits the image - normally the image center. Normalized means here that the largest circle that completely fits into an image is said to have radius=1.0 . (In other words, radius=1.0 is half the smaller side of the image.) A perfect lens would have a=b=c=0.0 and d=1.0 which resolves into .

        Sometimes the above formula is written as

        -
        -
        r_{{src}}={a}r_{{dest}}^{4}+{b}r_{{dest}}^{3}+{c}r_{{dest}}^{2}+d{r_{{dest}}} -
        -
        +

        which is essentially the same.

        Usual values for a, b and c are below 1.0, in most cases below 0.01. Too high values suggest that you chose a wrong lens type, f.e. fisheye instead of rectilinear or vice versa. This refers to the absolute values of course since a, b and c can be positive or negative (f.e. both 4.5 and -4.5 are considered too high values). -

        The fourth parameter (d) is only available in the Correct, Radial Shift[*] filter of the Panorama Tools Plugins[*]. It is calculated implicitly by pano12 (used by PTOptimizer, PTStitcher and the GUIs) in order to keep the same image size: +

        The fourth parameter (d) is only available in the Correct, Radial Shift[*] filter of the Panorama Tools Plugins[*]. It is calculated implicitly by pano12 (used by PTOptimizer, PTStitcher and the GUIs) in order to keep the same image size:

        -
        -
        d=1-(a+b+c) -
        -
        -

        Hence it is not available in the different GUI front-ends[*] (you can see it in the PTOptimizer result script). +

        +

        Hence it is not available in the different GUI front-ends[*] (you can see it in the PTOptimizer result script).

        Unfortunately a different parameter also named d refers to image shift in PTStitcher and PTOptimizer scripts and the GUIs. This sometimes causes confusion. (See more discussion below.)

        This polynomial approach is never exact, but can give a pretty good approximation to the real behaviour of a given lens. If you need better correction you must use a distortion matrix, as used by Distortion Remove (see link below).

        Lens distortion and fisheyes

        -

        Unlike rectilinear lenses, fish-eye lenses do not follow the tangent-plane geometry, but instead have built-in distortions designed to achieve wide fields of view. The radial lens distortion parameters are used the same way for rectilinear lenses and fisheye lenses[*], but they should never be used to attempt to remap a fisheye to a rectilinear image. This is done by selecting the proper source and destination projection. Fisheye geometry follows a rapidly-changing trigonometric function which can hardly be approximated by a third degree polynomial. +

        Unlike rectilinear lenses, fish-eye lenses do not follow the tangent-plane geometry, but instead have built-in distortions designed to achieve wide fields of view. The radial lens distortion parameters are used the same way for rectilinear lenses and fisheye lenses[*], but they should never be used to attempt to remap a fisheye to a rectilinear image. This is done by selecting the proper source and destination projection. Fisheye geometry follows a rapidly-changing trigonometric function which can hardly be approximated by a third degree polynomial.

        For fisheyes, the lens correction parameters correct for the deviation between a real lens and the ideal fisheye geometry.

        -

        Lens or image shift d & e parameters

        -

        Sometimes a lens and image sensor might not be centered with respect to each other. In this case the optical axis[*] doesn't fall on the image center. This is particularly the case for scanned images where you never can say whether the film is centered on the scanner or not. +

        Lens or image shift d & e parameters

        +

        Sometimes a lens and image sensor might not be centered with respect to each other. In this case the optical axis[*] doesn't fall on the image center. This is particularly the case for scanned images where you never can say whether the film is centered on the scanner or not.

        If the above lens correction algorithm is used on such images both lens correction and perspective correction work on the wrong center point. The lens shift parameters d (horizontal shift) and e (vertical shift) compensate for that problem. They contain values in pixel units which determine how far the center for radial correction is shifted outside the geometrical image center.

        -

        Image shear g & t parameters

        +

        Image shear g & t parameters

        Image shear is not a lens distortion but nevertheless is part of the panotools lens correction model. It corrects for a distortion induced by scanners or scanning cameras that causes a rectangular image being sheared to the form of a parallelogram (one side of the images is shifted parallel to the opposite side)

        Determine lens correction

        @@ -114,36 +325,17 @@

        There are a number of ways to determine the a, b, c and fov parameters to calibrate a particular lens/camera combination:

        -
          -
        • Taking a single photograph of a subject containing straight lines, defining one or more sets of straight line control points (types t3, t4, etc.), and optimising for just a, b, c. You need to set the output format to Rectilinear Projection for this technique to work. This method is used by the author of PTLens[*]. The calibrate_lens[*] tool also uses this technique and can operate with Fisheye Projection images greater than 180°. -
          • -
        - -
          -
        • Taking two or more overlapping photographs and selecting lots of normal control points, then optimising roll, pitch, yaw, fov, a, b & c. This technique works with any output projection format but requires parallax free images shot exactly from the No-parallax point. Note that to get a precise measure of the Field of View, you have to take a full 360 degree panorama. -
          • -
        - -
          -
        • Using a tool such as PTLens[*], lensfun[*] or fulla to read the photo EXIF metadata and correct the image automatically by looking up the lens in an existing database. -
          • -
        +
        • Taking a single photograph of a subject containing straight lines, defining one or more sets of straight line control points (types t3, t4, etc.), and optimising for just a, b, c. You need to set the output format to Rectilinear Projection for this technique to work. This method is used by the author of PTLens[*]. The calibrate_lens[*] tool also uses this technique and can operate with Fisheye Projection images greater than 180°.
        + +
        • Taking two or more overlapping photographs and selecting lots of normal control points, then optimising roll, pitch, yaw, fov, a, b & c. This technique works with any output projection format but requires parallax free images shot exactly from the No-parallax point. Note that to get a precise measure of the Field of View, you have to take a full 360 degree panorama.
        + +
        • Using a tool such as PTLens[*], lensfun[*] or fulla to read the photo EXIF metadata and correct the image automatically by looking up the lens in an existing database.

        Optimize for lens correction

        If you optimize for lens correction in order to calibrate your lens you should keep some facts in mind:

        Since lens correction parameters are determined by evaluating the distortion at different radius values you should provide enough control points at a large range of radii from the image center.

        -
          -
        • If you use a rectangular pattern or straight lines for that task, make sure you set control points in all distances from the center. -
          • -
        • If you use two or more images make sure you overlap regions with large potential distortion (f.e. the corners) with regions with low possible distortion (f.e. the center). An only horizontal overlap would do, but use at least 50% in order to overlap the image center of one image with the border of the other. -
          • -
        +
        • If you use a rectangular pattern or straight lines for that task, make sure you set control points in all distances from the center.
          • +
        • If you use two or more images make sure you overlap regions with large potential distortion (f.e. the corners) with regions with low possible distortion (f.e. the center). An only horizontal overlap would do, but use at least 50% in order to overlap the image center of one image with the border of the other.

        a, b and c parameters influence Field of View, especially for images in landscape orientation but slightly for portrait oriented ones, too. This is because although the implicit calculation of the fourth polynomial parameter tries to keep the image at the same size, this is only possible at the radius r_src = 1.0.

        Outside this radius, especially in the image corners, the size and hence the Field of View might differ. Since they are interconnected in this way, you should always allow the optimization for FoV too, if you optimize for a, b and c with more than one image. (You cannot optimize for FoV with only one image). As noted above you need a full 360 degree panorama in order to get an accurate measure of the Field of View.

        The a and c parameters control more complex forms of distortion. In most cases it will be enough to optimize for the b parameter only, which is good at correcting normal barrel distortion and pincushion distortion. @@ -152,60 +344,28 @@

        There's an excellent tutorial on how to optimize by John Houghton: [2]

        Tools to correct barrel and pincushion distortion

        -
          -
        • The original PTStitcher can be scripted to batch process images with known a, b & c parameters. It can also be operated with one of the GUI front-ends[*]. -
          • -
        - -
          -
        • The Correct Radial Shift[*] filter in the Panorama Tools Plugins[*] for the gimp[*] or photoshop[*] uses the same a, b & c parameters as PTStitcher. Note that it doesn't know about d & e shift parameters and uses 'd' as an overall scaling factor instead, which should be d = 1-(a+b+c) to keep the image roughly the same size. If you need to shift the correction center like with the d & e parameter you must combine it with Vertical Shift[*] and/or Horizontal Shift[*]. -
          • -
        -
          -
        • PTLens[*] is a Photoshop[*] plugin and a stand-alone Windows tool that uses the same a, b & c parameters and comes with a database of popular lenses. -
          • -
        -
          -
        • Clens[*] is a command line version of PTLens[*]. -
          • -
        - -
          -
        • PTShift[*] determines different a, b & c parameters for the three color channels in order to correct for Chromatic aberration with the Correct Radial Shift[*] filter. -
          • -
        -
          -
        • Gimp wideangle plugin[*] uses a different formula altogether to correct distortion. -
          • -
        -
          -
        • Gimp phfluuh plugin[*] is another tool that corrects lens distortion using yet another formula. -
          • -
        -
          -
        • CamChecker[*] is a tool for automatically determining lens distortion and generates a different set of parameters from everything else. -
          • -
        -
          -
        • zhang_undistort[*] is a tool distributed with hugin that uses CamChecker[*] parameters to actually correct distortion. -
          • -
        - +
        • The original PTStitcher can be scripted to batch process images with known a, b & c parameters. It can also be operated with one of the GUI front-ends[*].
        + +
        • The Correct Radial Shift[*] filter in the Panorama Tools Plugins[*] for the gimp[*] or photoshop[*] uses the same a, b & c parameters as PTStitcher. Note that it doesn't know about d & e shift parameters and uses 'd' as an overall scaling factor instead, which should be d = 1-(a+b+c) to keep the image roughly the same size. If you need to shift the correction center like with the d & e parameter you must combine it with Vertical Shift[*] and/or Horizontal Shift[*].
        +
        • PTLens[*] is a Photoshop[*] plugin and a stand-alone Windows tool that uses the same a, b & c parameters and comes with a database of popular lenses.
        +
        • Clens[*] is a command line version of PTLens[*].
        + +
        • PTShift[*] determines different a, b & c parameters for the three color channels in order to correct for Chromatic aberration with the Correct Radial Shift[*] filter.
        +
        • Gimp wideangle plugin[*] uses a different formula altogether to correct distortion.
        +
        • Gimp phfluuh plugin[*] is another tool that corrects lens distortion using yet another formula.
        +
        • CamChecker[*] is a tool for automatically determining lens distortion and generates a different set of parameters from everything else.
        +

        See also

        Image positioning model

        + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Lens_correction_model&oldid=15838[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Lens_correction_model&oldid=15919"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_distortion.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_distortion.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_distortion.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lens_distortion.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,57 +1,49 @@ - + Lens distortion - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Lens distortion

    -
    -
    From PanoTools.org Wiki
    +

    Lens distortion

    +
    From PanoTools.org Wiki
    - -


    +


    Real life lenses don't map an image geometrically exact to the film or sensor. In most cases the image is distorted one or the other way. There are three common types of distortion:

    -
      -
    • Barrel distortion which causes straight lines outside the image center to be bent outwards (like a barrel). -
      • -
    • Pincushion distortion which causes straight lines outside the image center to be bent inwards (like a pincushion). -
      • -
    • Wavy distortion, which is a mixture of both - mostly a result of incomplete optical correction of one of the other ones. There exist two subtypes: -
        -
      • with barrel distortion in the image center and pincushion distortion in the outside regions ("Bubble Distortion") -
        • -
      • with pincushion distortion in the image center and barrel distortion in the outside regions. -
        • -
      -
      • -
    +
    • Barrel distortion which causes straight lines outside the image center to be bent outwards (like a barrel).
      • +
    • Pincushion distortion which causes straight lines outside the image center to be bent inwards (like a pincushion).
      • +
    • Wavy distortion, which is a mixture of both - mostly a result of incomplete optical correction of one of the other ones. There exist two subtypes: +
      • with barrel distortion in the image center and pincushion distortion in the outside regions ("Bubble Distortion")
        • +
      • with pincushion distortion in the image center and barrel distortion in the outside regions.

    The lens correction model of panotools is able to deal with all of them.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Lens_distortion&oldid=9434[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Lens_distortion&oldid=9434"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lightprobe.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lightprobe.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lightprobe.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Lightprobe.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,74 +1,59 @@ - + Lightprobe - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Lightprobe

    -
    -
    From PanoTools.org Wiki
    +

    Lightprobe

    +
    From PanoTools.org Wiki
    - -

    Lightprobe image is a spherical panorama made of several blended exposures containing high dynamic range. +

    Lightprobe image is a spherical panorama made of several blended exposures containing high dynamic range. The panorama itself is usually made with the well-known methods:

    -
      -
    • photographing and stitching -
      • -
    • photographing a mirrored ball once or optionally photographing a mirrored ball more times and stitching -
      • -
    +
    • photographing and stitching
      • +
    • photographing a mirrored ball once or optionally photographing a mirrored ball more times and stitching

    The image is usually saved in Radiance .hdr image format as

    -
      -
    • angular map (reflection mapping?) -
      • -
    • vertical cross cube -
      • -
    +
    • angular map (reflection mapping?)
      • +
    • vertical cross cube

    The main purpose consists in simulating environmental light and reflections in rendering software using the radiosity method. Usually a sphere is created around the main scene, the sphere gets as texture/material the lightprobe image. Besides that the sphere´s material gets a "luminocity" property which allows to simulate light sources depending on the lightprobe´s color information. As the lightprobe contains high dynamic range it allows rather realistic but time consuming renderings. The method with photographing a mirrored ball (usually delivering quite poor overall image quality as you need a nearly perfect sphere) is nevertheless popular for especially shooting light probes, as light information here is more important than the image or its resolution, the lightprobe usually is not seen in the final rendering.

    More Information:

    - - - - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Lightprobe&oldid=12012[*]"
    -
    \ No newline at end of file + + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Lightprobe&oldid=12012"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Linefind.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Linefind - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Linefind

    -
    -
    From PanoTools.org Wiki
    +

    Linefind

    +
    From PanoTools.org Wiki
    - -

    General and description

    +

    General and description

    Linefind is a detector for vertical features in images. It tries to find vertical lines using the same algorithm as Calibrate_lens_gui and assigns vertical control points to them. The detection runs on the source images, if the input images are rectilinear images. In the other cases (e. g. fisheye images) the input images are reprojected to an equirectangular projection and the detection works on the reprojected images. It uses the roll value, saved in the pto project file, to determine what is "top" and "bottom". So before running linefind check that your roll values are correct (E. g. when using images straight from the camera, use a roll value of 0 for landscape and a value of 90 or 270 for portrait images. If your camera has an orientation sensor, Hugin can detect this information automatically and sets the roll value accordingly when adding such images into Hugin.

    @@ -53,8 +49,12 @@

    will only search for vertical lines in image 0 and 4.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Linefind&oldid=13793[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Linefind&oldid=13793"
    +
    \ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/magnify-clip.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/magnify-clip.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/makefile hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/makefile --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/makefile 2016-01-22 17:49:39.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -# downloads a selection of pages specified in the 'pages.txt' file from the -# Panotools wiki at http://wiki.panotools.org/ and assembles them into an -# offline HTML manual for Hugin. -# -# Requires wget and perl -# -# Bruno Postle - -all: fetch dewiki - -fetch: pages.txt - sh fetch.sh - -dewiki: - perl dewiki.pl *.html - -.PHONY: fetch dewiki - diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Multi_image_techniques.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Multi_image_techniques.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Multi_image_techniques.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Multi_image_techniques.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,100 +1,71 @@ - + Multi image techniques - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Multi image techniques

    -
    -
    From PanoTools.org Wiki
    +

    Multi image techniques

    +
    From PanoTools.org Wiki
    - -

    There are several use cases to merge several image into one. This page lists some of them. +

    There are several use cases to merge several image into one. This page lists some of them.

    Moved camera variants

    For these applications the camera is moved and several images are shoot in different directions. Possible applications are:

    -
      -
    • Classic panorama: increase field of view -
      • -
    • Gigapixel panorama -
      • -
    • Brenizer method: decrease depth of field (DOF), also called Bokeh panorama -
      • -
    +
    • Classic panorama: increase field of view
      • +
    • Gigapixel panorama
      • +
    • Brenizer method: decrease depth of field (DOF), also called Bokeh panorama

    Single stack variants

    Here the same scene is shoot with different settings. The applications covers e.g.

    -
      -
    • HDR generation (exposure stack) -
      • -
    • Extend dynamic range by exposure fusion (exposure stack) -
      • -
    • Extend depth of field (DOF) (focus stack) -
      • -
    • Noise reduction -
        -
      • averaging (of several images of the same scene, shoot with same settings) -
        • -
      • zero-noise technique -
        • -
      -
      • -
    • Super Resolution: sub pixel offset stacking -
      • -
    • Tourist Removal -
        -
      • Automatic calculation with median -
        • -
      • Manual with multi masking -
        • -
      -
      • -
    • Visualize movement -
      • -
    • Lightning improvement by combining flash/no-flash images -
      • -
    • Saturation enhancement by polarization Series -
      • -
    +
    • HDR generation (exposure stack)
      • +
    • Extend dynamic range by exposure fusion (exposure stack)
      • +
    • Extend depth of field (DOF) (focus stack)
      • +
    • Noise reduction +
      • averaging (of several images of the same scene, shoot with same settings)
        • +
      • zero-noise technique
      • +
    • Super Resolution: sub pixel offset stacking
      • +
    • Tourist Removal +
      • Automatic calculation with median
        • +
      • Manual with multi masking
      • +
    • Visualize movement
      • +
    • Lightning improvement by combining flash/no-flash images
      • +
    • Saturation enhancement by polarization Series

    Video technique

    Also a video can be used as input for some techniques, e.g.

    -
      -
    • Panorama (increased field of view) -
      • -
    • Video (post) stabilization -
      • -
    • Noise reduction -
      • -
    - - +
    • Panorama (increased field of view)
      • +
    • Video (post) stabilization
      • +
    • Noise reduction
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Multi_image_techniques&oldid=15875[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Multi_image_techniques&oldid=15875"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nadir.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nadir.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nadir.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nadir.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,63 +1,54 @@ - + Nadir - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Nadir

    -
    -
    From PanoTools.org Wiki
    +

    Nadir

    +
    From PanoTools.org Wiki
    - -

    The nadir is +

    The nadir is the point directly below the person viewing or below the camera (set a Pitch of -90 degrees in PanoTools). The opposite (above) point is named Zenith and has a Pitch value of (+)90 degrees. The horizon or equator is in-between and has a Pitch of 0 degrees. -

    The Nadir is streched to a line in Equirectangular Projection, making it hard to edit directly. However, a rectilinear view can be extracted[*] for editing. -

    The Nadir usually gives much more problems than the Zenith because there either is a tripod to cover or there are Parallax errors to edit. Objects at the nadir tend to be much closer to the lens and therefore errors in the setup will more likely be detectable in this part of the picture. One possible way to solve this problem is to use tripod caps[*]. +

    The Nadir is streched to a line in Equirectangular Projection, making it hard to edit directly. However, a rectilinear view can be extracted[*] for editing. +

    The Nadir usually gives much more problems than the Zenith because there either is a tripod to cover or there are Parallax errors to edit. Objects at the nadir tend to be much closer to the lens and therefore errors in the setup will more likely be detectable in this part of the picture. One possible way to solve this problem is to use tripod caps[*].

    Related articles

    -
      -
    • Stitching Nadir Shots[*] -
      • -
    • Adding a nadir cap (mirror ball)[*] -
      • -
    • Adding a nadir logo with text[*] -
      • -
    • How to use enblend for patching zenith and nadir images[*] -
      • -
    • Edit zenith and nadir in one go with PTGui[*] -
      • -
    • Edit zenith and nadir in one go with Adjust filter[*] -
      • -
    • Zenith and Nadir editing overview[*] -
      • -
    • Using enblend to fill the "Hole in the floor"[*] -
      • -
    - - - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Nadir&oldid=9436[*]"
    -
    \ No newline at end of file +
    • Stitching Nadir Shots[*]
      • +
    • Adding a nadir cap (mirror ball)[*]
      • +
    • Adding a nadir logo with text[*]
      • +
    • How to use enblend for patching zenith and nadir images[*]
      • +
    • Edit zenith and nadir in one go with PTGui[*]
      • +
    • Edit zenith and nadir in one go with Adjust filter[*]
      • +
    • Zenith and Nadir editing overview[*]
      • +
    • Using enblend to fill the "Hole in the floor"[*]
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Nadir&oldid=9436"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nodal_Point.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nodal_Point.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nodal_Point.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nodal_Point.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,41 +1,42 @@ - + Nodal Point - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Nodal Point

    -
    -
    From PanoTools.org Wiki
    +

    Nodal Point

    +
    From PanoTools.org Wiki
    - -

    Wrongly used for the Entrance pupil or the No-parallax point. +

    Wrongly used for the Entrance pupil or the No-parallax point.

    The real nodal points have no relevance for panoramic photography. See Wikipedia for details: w:Nodal point[*]

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Nodal_Point&oldid=12242[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Nodal_Point&oldid=12242"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nona.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nona.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nona.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Nona.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,74 +1,60 @@ - + Nona - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Nona

    -
    -
    From PanoTools.org Wiki
    +

    Nona

    +
    From PanoTools.org Wiki
    - -

    nona +

    nona is a drop-in replacement for PTStitcher and is part of Hugin.

    Like PTStitcher and PTmender, nona performs geometrical and photometric distortions on photos and writes the output to image files. The parameters are specified in the .pto project file, i.e. nona doesn't decide what the distortions are going to be, it just does the remapping part of the stitching process. It can also blend images in memory in the same way as verdandi. The parameters for remapping can be calculated in Hugin or with autooptimiser on the command line.

    The format of the project file is documented here: PTStitcher Example_Script, and here: http://hugin.sourceforge.net/docs/nona/nona.txt.

    Advantages

    -
      -
    • Unlike PTStitcher, nona has full source-code availability, this means that it can be used on many more platforms such as OS X, Linux x86_64, linux powerpc, Solaris and IRIX. -
      • -
    • When set to use cropped TIFF output, nona doesn't perform expensive transformation calculations for unused areas of output images. For panoramas consisting of many source photos this can speed things up greatly. -
      • -
    • nona implements vignetting, white-balance, brightness and camera response curve correction at the stitching stage. -
      • -
    • multi-threaded processing uses as many CPUs as are available. -
      • -
    • nona supports HDR images for input and output. -
      • -
    • nona supports GPU stitching with graphics hardware -
      • -
    • nona can merge 8bit low dynamic range bracketed shots into HDR output. -
      • -
    +
    • Unlike PTStitcher, nona has full source-code availability, this means that it can be used on many more platforms such as OS X, Linux x86_64, linux powerpc, Solaris and IRIX.
      • +
    • When set to use cropped TIFF output, nona doesn't perform expensive transformation calculations for unused areas of output images. For panoramas consisting of many source photos this can speed things up greatly.
      • +
    • nona implements vignetting, white-balance, brightness and camera response curve correction at the stitching stage.
      • +
    • multi-threaded processing uses as many CPUs as are available.
      • +
    • nona supports HDR images for input and output.
      • +
    • nona supports GPU stitching with graphics hardware
      • +
    • nona can merge 8bit low dynamic range bracketed shots into HDR output.

    Disadvantages

    (Note: this is the situation as of May 2007, please correct this page if you know this has changed)

    -
      -
    • Morph to fit[*] control points are not supported. -
      • -
    • It doesn't yet support the fast transformation option added to pano12 by Fulvio Senore[*]. -
      • -
    • It doesn't support the adaptive filtersize anti-aliasing filters added to pano12-2.7.0.11 -
      • -
    • It doesn't support C-type cropping[*] and hence is not compatible with other GUI front-ends[*] than hugin if used for images that need cropping (like circular fisheye or scanned ones). -
      • -
    - - - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Nona&oldid=15914[*]"
    -
    \ No newline at end of file +
    • Morph to fit[*] control points are not supported.
      • +
    • It doesn't yet support the fast transformation option added to pano12 by Fulvio Senore[*].
      • +
    • It doesn't support the adaptive filtersize anti-aliasing filters added to pano12-2.7.0.11
      • +
    • It doesn't support C-type cropping[*] and hence is not compatible with other GUI front-ends[*] than hugin if used for images that need cropping (like circular fisheye or scanned ones).
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Nona&oldid=15914"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,45 +1,41 @@ - + No-parallax point - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    No-parallax point

    -
    -
    From PanoTools.org Wiki
    +

    No-parallax point

    +
    From PanoTools.org Wiki
    - -


    +


    If you rotate your camera around some randomly chosen point, your images may show parallax and be difficult to stitch.

    With most lenses, there is one special point around which you can rotate your camera and get no parallax. This special "no-parallax point" is the center of the lens's entrance pupil, a virtual aperture within the lens. In the panorama photography community, this special point is often called the "nodal point", but it is in fact unrelated to the actual nodal points of the lens.1,2 The actual nodal points are other points on the optical path, which are of no significance to most photographers. The no-parallax point is also the "center of perspective", but this term is not commonly used and does not describe why the no-parallax point is important.

    The entrance pupil is the image of the limiting aperture or diaphragm, as seen through the front of the lens. The image seen may be magnified by the effect of the lens elements in front of it, and the image is displaced from the actual position of the aperture. It is the center of this image about which the camera must be rotated to avoid parallax.

    Everything considered, the best term for the no-parallax point may be (surprise!) the "no-parallax point". "Entrance pupil" is correct although a bit imprecise to a geometry purist; it makes a good term for searching the literature and would be preferred in formal writing. "Nodal point" is commonly-used, but incorrect and leads to confusion. It should be avoided when writing and interpreted with caution in reading the literature.

    Regardless of what you call the no-parallax point, it is easily found by trial and error. Just adjust the rotation point so that foreground and background points stay lined up.

    Some lenses, notably fisheyes, do not have a single no-parallax point. Instead, they have a range of what we might call "least-parallax points" that depend on the angle away from the lens axis. Such lenses can be recognized easily — just look into the front of the lens and observe that the location of the entrance pupil moves forward or backward as you rotate the lens off-axis. With such lenses, it is good to pick one angle at which you like to stitch, and rotate your camera around a point that gives no parallax at that angle. -

    To facilitate finding the no-parallax point for other people, please fill the measurements you have found for your Camera / Lens / Focal Length combination in the Entrance Pupil Database[*] +

    To facilitate finding the no-parallax point for other people, please fill the measurements you have found for your Camera / Lens / Focal Length combination in the Entrance Pupil Database[*]

    -

    Contents

    +

    Contents

    See also

    -
      -
    • NPP adapters[*] -
      • -
    • Entrance Pupil Database[*] -
      • -
    +
    • NPP adapters[*]
      • +
    • Entrance Pupil Database[*]

    References

    -
      -
    1. Kerr, Douglas A. "The Proper Pivot Point for Panoramic Photography" The Pumpkin (2005). Accessed 2011-02-02. -
      2. -
    2. van Walree, Paul "Misconceptions in photographic optics", Item #6. Accessed 2011-02-02. -
      3. -
    +
    1. Kerr, Douglas A. "The Proper Pivot Point for Panoramic Photography" The Pumpkin (2005). Accessed 2011-02-02.
      2. +
    2. van Walree, Paul "Misconceptions in photographic optics", Item #6. Accessed 2011-02-02.

    Links

    In theory

    - -

    Locating the NPP(s) of a specific lens

    - - - - + +

    Locating the NPP(s) of a specific lens

    + + + + +
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=No-parallax_point&oldid=15841[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=No-parallax_point&oldid=15841"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/NPP.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/NPP.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/NPP.html 2017-04-22 17:03:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/NPP.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,46 +1,42 @@ - + No-parallax point - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    No-parallax point

    -
    -
    From PanoTools.org Wiki
    -
    (Redirected from NPP[*])
    - -


    +

    No-parallax point

    +
    From PanoTools.org Wiki
    (Redirected from NPP[*])
    + +


    If you rotate your camera around some randomly chosen point, your images may show parallax and be difficult to stitch.

    With most lenses, there is one special point around which you can rotate your camera and get no parallax. This special "no-parallax point" is the center of the lens's entrance pupil, a virtual aperture within the lens. In the panorama photography community, this special point is often called the "nodal point", but it is in fact unrelated to the actual nodal points of the lens.1,2 The actual nodal points are other points on the optical path, which are of no significance to most photographers. The no-parallax point is also the "center of perspective", but this term is not commonly used and does not describe why the no-parallax point is important.

    The entrance pupil is the image of the limiting aperture or diaphragm, as seen through the front of the lens. The image seen may be magnified by the effect of the lens elements in front of it, and the image is displaced from the actual position of the aperture. It is the center of this image about which the camera must be rotated to avoid parallax.

    Everything considered, the best term for the no-parallax point may be (surprise!) the "no-parallax point". "Entrance pupil" is correct although a bit imprecise to a geometry purist; it makes a good term for searching the literature and would be preferred in formal writing. "Nodal point" is commonly-used, but incorrect and leads to confusion. It should be avoided when writing and interpreted with caution in reading the literature.

    Regardless of what you call the no-parallax point, it is easily found by trial and error. Just adjust the rotation point so that foreground and background points stay lined up.

    Some lenses, notably fisheyes, do not have a single no-parallax point. Instead, they have a range of what we might call "least-parallax points" that depend on the angle away from the lens axis. Such lenses can be recognized easily — just look into the front of the lens and observe that the location of the entrance pupil moves forward or backward as you rotate the lens off-axis. With such lenses, it is good to pick one angle at which you like to stitch, and rotate your camera around a point that gives no parallax at that angle. -

    To facilitate finding the no-parallax point for other people, please fill the measurements you have found for your Camera / Lens / Focal Length combination in the Entrance Pupil Database[*] +

    To facilitate finding the no-parallax point for other people, please fill the measurements you have found for your Camera / Lens / Focal Length combination in the Entrance Pupil Database[*]

    -

    Contents

    +

    Contents

    See also

    -
      -
    • NPP adapters[*] -
      • -
    • Entrance Pupil Database[*] -
      • -
    +
    • NPP adapters[*]
      • +
    • Entrance Pupil Database[*]

    References

    -
      -
    1. Kerr, Douglas A. "The Proper Pivot Point for Panoramic Photography" The Pumpkin (2005). Accessed 2011-02-02. -
      2. -
    2. van Walree, Paul "Misconceptions in photographic optics", Item #6. Accessed 2011-02-02. -
      3. -
    +
    1. Kerr, Douglas A. "The Proper Pivot Point for Panoramic Photography" The Pumpkin (2005). Accessed 2011-02-02.
      2. +
    2. van Walree, Paul "Misconceptions in photographic optics", Item #6. Accessed 2011-02-02.

    Links

    In theory

    - -

    Locating the NPP(s) of a specific lens

    - - - - + +

    Locating the NPP(s) of a specific lens

    + + + + +
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=No-parallax_point&oldid=15841[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=No-parallax_point&oldid=15841"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/OpenEXR.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/OpenEXR.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/OpenEXR.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/OpenEXR.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,48 +1,45 @@ - + OpenEXR - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    OpenEXR

    -
    -
    From PanoTools.org Wiki
    +

    OpenEXR

    +
    From PanoTools.org Wiki
    - -

    OpenEXR is a high dynamic range image format[*], released as an open standard along with a set of software tools created by Industrial Light and Magic, released under a Free software license similar to the BSD license. +

    OpenEXR is a high dynamic range image format[*], released as an open standard along with a set of software tools created by Industrial Light and Magic, released under a Free software license similar to the BSD license.

    External links

    - - - + -
    - Retrieved from "http://wiki.panotools.org/index.php?title=OpenEXR&oldid=9522[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=OpenEXR&oldid=9522"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Optimization.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Optimization.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Optimization.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Optimization.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,36 +1,32 @@ - + Optimization - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Optimization

    -
    -
    From PanoTools.org Wiki
    +

    Optimization

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    • 1 Definition
    • 2 Optimizer variants
      • @@ -43,7 +39,7 @@

      Optimization is the process of determining the necessary warping for an image pair in order to align given control point pairs

      Optimizer variants

      -

      The below article is about the internal PTGui[*] optimizer. The original panotools PTOptimizer as well as the hugin optimizer work very similar but have a slightly different set of features and internally use different tactics. Hence the results can differ a bit. +

      The below article is about the internal PTGui[*] optimizer. The original panotools PTOptimizer as well as the hugin optimizer work very similar but have a slightly different set of features and internally use different tactics. Hence the results can differ a bit.

      Understanding optimization

      John Houghton posted this clear explanation of optimization on the ptgui mailing list. @@ -94,7 +90,7 @@ not have control points assigned to them. A distant background will be largely unaffected by parallax and should be aligned well by the optimizer. Bear in mind that in the case of fisheye lenses, parallax -effects can't generally be avoided completely: the entrance pupil +effects can't generally be avoided completely: the entrance pupil position varies for light rays entering the lens at different angles to the lens axis, so it's not a single point.

      When the optimizer gives a bad result, with large control point @@ -114,7 +110,7 @@ control point distances are very low (less than 2, say), with control points nicely spread, and the stitched result should then be fine. Misalignment due to parallax or movement may need correction in -post processing, Smartblend[*] can often be helpful in disguising these +post processing, Smartblend[*] can often be helpful in disguising these errors too, by routing the seams around objects during the blending.

      The optimizer will never change the positions of the points in the images. They should be assigned on identical features, but the @@ -132,14 +128,16 @@ movement as explained in the previous post.

      External links

      - - + + +
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Optimization&oldid=11379[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Optimization&oldid=11379"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/pages.txt 2019-01-05 17:35:29.000000000 +0000 @@ -80,8 +80,10 @@ Hugin_Preview_tab Hugin_Preview_window Hugin_Projection_tab +Hugin_Raw_Import Hugin_Reset_Values_window Hugin_Scripting_Interface +Hugin_stacker Hugin_Stitcher_tab Hugin_stitch_project Hugin_Trackers diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panini.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panini.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panini.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panini.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,44 +1,44 @@ - + Panini - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panini

    -
    -
    From PanoTools.org Wiki
    +

    Panini

    +
    From PanoTools.org Wiki
    - -

    The projection labelled "Panini" in libpano13 is not actually the standard Pannini (cylindrical stereographic) projection, but a variant having an exaggerated vertical scale. It is not very useful and should probably be removed from the library. +

    The projection labelled "Panini" in libpano13 is not actually the standard Pannini (cylindrical stereographic) projection, but a variant having an exaggerated vertical scale. It is not very useful and should probably be removed from the library.

    For true Pannini projections, select "equirectangular Panini" or "Panini general". The latter, available since early 2010, is identical to the former at default parameter settings, and is adjustable for a wide range of perspective effects.

    see also

    -

    For the similarly named viewer Panini perspective tool by Thomas Sharpless see Panorama Viewers[*]. +

    For the similarly named viewer Panini perspective tool by Thomas Sharpless see Panorama Viewers[*].

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panini&oldid=13322[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panini&oldid=13322"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano12.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano12.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano12.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano12.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,63 +1,57 @@ - + Pano12 - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pano12

    -
    -
    From PanoTools.org Wiki
    +

    Pano12

    +
    From PanoTools.org Wiki
    - -

    The pano12 library was originally created by Helmut Dersch[*] as the core of Panorama Tools[*]. The license is the GNU General Public License (GPL) and full sourcecode is available from the panotools sourceforge site. -

    pano12 is currently used by many front-end[*] and command-line programs. The file itself may be called pano12.dll, libpano12.so, libpano12.dylib or pano12.lib depending on the operating system. +

    The pano12 library was originally created by Helmut Dersch[*] as the core of Panorama Tools[*]. The license is the GNU General Public License (GPL) and full sourcecode is available from the panotools sourceforge site. +

    pano12 is currently used by many front-end[*] and command-line programs. The file itself may be called pano12.dll, libpano12.so, libpano12.dylib or pano12.lib depending on the operating system.

    Due to apparent patent issues with fisheye lenses, some distributed versions of the library (including the one hosted on sourceforge) have an artificial limitation of 160 degrees placed on the maximum Field of View of source images.

    Other tools in the pano12 source

    -

    If you build pano12 from sourcecode[*], various helper applications are built at the same time: +

    If you build pano12 from sourcecode[*], various helper applications are built at the same time:

    - +

    Downloading pre-compiled versions

    -

    The original pano12 library for Linux, Mac classic and Windows can be downloaded from one of the mirrors[*], though you probably want to download a newer version containing many bugfixes and speed improvements: +

    The original pano12 library for Linux, Mac classic and Windows can be downloaded from one of the mirrors[*], though you probably want to download a newer version containing many bugfixes and speed improvements:

    For Linux and other unix systems, look at the Hugin download page. Currently packages are available for debian, fedora, gentoo, mandrake and probably others. -

    For OS X a version is supplied with Hugin or PTMac[*]. -

    For Windows you might download pano12.dll from Photocreations or sourceforge, you can also find it bundled with PTAssembler[*] and PTGui[*]. +

    For OS X a version is supplied with Hugin or PTMac[*]. +

    For Windows you might download pano12.dll from Photocreations or sourceforge, you can also find it bundled with PTAssembler[*] and PTGui[*].

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pano12&oldid=9672[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pano12&oldid=9672"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoglview.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoglview.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoglview.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoglview.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,41 +1,37 @@ - + Panoglview - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panoglview

    -
    -
    From PanoTools.org Wiki
    +

    Panoglview

    +
    From PanoTools.org Wiki
    - -
    [*]
    [*]
    panoglview on Linux
    panoglview is an OpenGL hardware accelerated immersive viewer for equirectangular images, originally created by Fabian Wenzel and currently hosted on the hugin sourceforge site. -

    The license for panoglview is the GNU General Public License (GPL). +

    [*]
    [*]
    panoglview on Linux

    panoglview is an OpenGL hardware accelerated immersive viewer for equirectangular images, originally created by Fabian Wenzel and currently hosted on the hugin sourceforge site. +

    The license for panoglview is the GNU General Public License (GPL).

    You can download pre-compiled versions of panoglview as part of the hugin installer bundles for OS X and Windows. panoglview is available for linux distributions through the usual channels (e.g ubuntu getdeb March 2009).

    compiling panoglview

    -

    See Hugin Compiling Ubuntu#Panoglview[*]. +

    See Hugin Compiling Ubuntu#Panoglview[*].

    using panoglview

    Panoglview is intended to view full 180x360 (equirectangular) panoramas projected onto a globe which can be spun around using the mouse. @@ -43,27 +39,23 @@

    These are simple text files and fairly self-explanatory, but the interesting thing is that these .paf files contain stuff like camera field-of-view, pan, tilt, boundaries and now partial panorama settings.

    as a replacement for PTEditor

    -

    PTEditor[*] is an older unsupported tool for viewing a panorama, extracting undistorted views for external editing and reinserting those edited views. The panoglview .paf saving feature can be used to imitate this functionality in conjunction with the pafextract tool. +

    PTEditor[*] is an older unsupported tool for viewing a panorama, extracting undistorted views for external editing and reinserting those edited views. The panoglview .paf saving feature can be used to imitate this functionality in conjunction with the pafextract tool.

    The pafextract workflow goes something like this:

    -
      -
    1. open a panorama in panoglview -
      2. -
    2. find a viewpoint to edit, save a .paf viewpoint -
      3. -
    3. extract a bitmap image of this view with pafextract -
      4. -
    4. edit it with the gimp[*] or another image editor, save -
      5. -
    5. remap this using the .pto project created by pafextract -
      6. -
    6. merge with the panorama -
      7. -
    - - - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panoglview&oldid=11193[*]"
    -
    \ No newline at end of file +
    1. open a panorama in panoglview
      2. +
    2. find a viewpoint to edit, save a .paf viewpoint
      3. +
    3. extract a bitmap image of this view with pafextract
      4. +
    4. edit it with the gimp[*] or another image editor, save
      5. +
    5. remap this using the .pto project created by pafextract
      6. +
    6. merge with the panorama
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panoglview&oldid=11193"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoinfo.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoinfo.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoinfo.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panoinfo.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,37 +1,33 @@ - + Panoinfo - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panoinfo

    -
    -
    From PanoTools.org Wiki
    +

    Panoinfo

    +
    From PanoTools.org Wiki
    - -

    panoinfo is a simple utility built alongside the pano12 library that outputs a list of facts about the currently installed version of pano12. This is useful for debugging, especially on Windows, where it is sometimes difficult to guess which of a number of identically named DLL files is in use. -

    Here is a typical output, notice that the version of the library is 2.7.0.10, the maximum fisheye Field of View has been artificially limited to 160 degrees to prevent the use of fisheye lenses and that this version of the library has been built with Java[*] support (note that these things are configurable if you build pano12 from sourcecode[*]): +

    panoinfo is a simple utility built alongside the pano12 library that outputs a list of facts about the currently installed version of pano12. This is useful for debugging, especially on Windows, where it is sometimes difficult to guess which of a number of identically named DLL files is in use. +

    Here is a typical output, notice that the version of the library is 2.7.0.10, the maximum fisheye Field of View has been artificially limited to 160 degrees to prevent the use of fisheye lenses and that this version of the library has been built with Java[*] support (note that these things are configurable if you build pano12 from sourcecode[*]): 

    libpano12 properties and features:
 Pano12 file version:    2.7.0.10
@@ -75,8 +71,12 @@
   Patch200308a: Jim Watters, Improved Radial Luminance, http://photocreations.ca/panotools
    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panoinfo&oldid=8031[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panoinfo&oldid=8031"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panomatic.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panomatic.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panomatic.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panomatic.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,48 +1,45 @@ - + Panomatic - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panomatic

    -
    -
    From PanoTools.org Wiki
    +

    Panomatic

    +
    From PanoTools.org Wiki
    - -

    panomatic by Anael Orlinski is a tool for automatically creating control points for groups of overlapping photographs. -

    pan-o-matic is very similar in purpose to autopano-sift or autopano-sift-C and can be used from within hugin (and potentially other GUI front-ends[*]) as an optional control point generator. +

    panomatic by Anael Orlinski is a tool for automatically creating control points for groups of overlapping photographs. +

    pan-o-matic is very similar in purpose to autopano-sift or autopano-sift-C and can be used from within hugin (and potentially other GUI front-ends[*]) as an optional control point generator.

    pan-o-matic is Open Source and uses the SURF algorithm.

    External links

    - - - + -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panomatic&oldid=10253[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panomatic&oldid=10253"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pano_modify.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,36 +1,32 @@ - + Pano modify - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pano modify

    -
    -
    From PanoTools.org Wiki
    +

    Pano modify

    +
    From PanoTools.org Wiki
    - -

    The program pano_modify allows you to change some output options of a project file on the command line. The same functions can also accessed inside Hugin's GUI on the hugin Stitcher tab or in the hugin Fast Preview window. +

    The program pano_modify allows you to change some output options of a project file on the command line. The same functions can also accessed inside Hugin's GUI on the hugin Stitcher tab or in the hugin Fast Preview window.

    You have to give at least an input project file: 

      pano_modify input.pto
@@ -40,104 +36,54 @@
 
      pano_modify -c --crop=AUTO --output=output.pto input.pto
 
    
 
    Options
    
-
      
-
    •  -o, --output=file.pto: Writes the output to the given project file. If this parameter is not given the suffix _mod is added to the given input project.
-
      • 
-
    •  -p, --projection=x: Sets the output projection to the projection with number x.
-
      • 
-
    •  --fov=AUTO|HFOV|HFOVxVFOV: Sets output field of view. Following arguments are possible
-
        
-
      •  AUTO: calculates optimal fov.
-
        • 
-
      •  HFOV: set hfov to given hfov (If output projection has coupled hfov and vfov, vfov is automatic changed).
-
        • 
-
      •  HFOVxVFOV: set to given hfov and vfov.
-
        • 
-
      
-
      • 
-
    • -s, --straighten: Straightens the panorama.
-
      • 
-
    • -c, --center: Centers the panorama.
-
      • 
-
    •  --canvas=AUTO|num%|WIDTHxHEIGHT:  Sets the output canvas size
-
        
-
      •  AUTO: calculate optimal canvas size
-
        • 
-
      •  num%: scales the optimal canvas size by the given percent value, e.g. --canvas=70% will scale the image to 70 % of the optimal size.
-
        • 
-
      •  WIDTHxHEIGHT: set to given size
-
        • 
-
      
-
      • 
-
    •  --crop=AUTO|AUTOHDR|left,right,top,bottom:  Sets the crop rectangle for the output
-
        
-
      •  AUTO: performs an autocrop to the maximal possible size of the panorama
-
        • 
-
      •  AUTOHDR: performs a HDR autocrop to the maximal possible size covered by all exposures
-
        • 
-
      •  left,right,top,bottom: sets the crop to the given size
-
        • 
-
      
-
      • 
-
    •  --output-exposure=AUTO|value: Sets the output exposure of the panorama
-
        
-
      •  AUTO: set output exposure to mean exposure of all images
-
        • 
-
      •  value: set output exposure to given value
-
        • 
-
      
-
      • 
-
    •  --output-type=str: Activates the output of the given items. This switch can be given several times or several items in one switch can be separated by a comma.
-
        
-
      •  NORMAL|N: normal panorama
-
        • 
-
      •  STACKSFUSEDBLENDED|BF: LDR panorama with blended stacks
-
        • 
-
      •  EXPOSURELAYERSFUSED|FB: LDR panorama with fused exposure layers (any arrangement)
-
        • 
-
      •  HDR: HDR panorama
-
        • 
-
      •  REMAP: remapped images with corrected exposure
-
        • 
-
      •  REMAPORIG: remapped images with uncorrected exposure
-
        • 
-
      •  HDRREMAP: remapped images in linear color space
-
        • 
-
      •  FUSEDSTACKS: exposure fused stacks
-
        • 
-
      •  HDRSTACKS: HDR stacks
-
        • 
-
      •  EXPOSURELAYERS: blended exposure layers
-
        • 
-
      
-
      • 
-
    •  --ldr-file=JPG|TIF|PNG: Sets the filetype for LDR panorama output
-
      • 
-
    •  --ldr-compression=str: Sets the compression for LDR panorama output
-
        
-
      •  For TIF files the following compressions are supported: NONE|PACKBITS|LZW|DEFLATE
-
        • 
-
      •  For JPG files the quality as number is expected
-
        • 
-
      
-
      • 
-
    •  --hdr-file=EXR|TIF: Sets the filetype for HDR panorama output
-
      • 
-
    •  --hdr-compression=str: Sets the compression for HDR panorama output
-
        
-
      •  For TIF files the following compressions are supported: NONE|PACKBITS|LZW|DEFLATE
-
        • 
-
      
-
      • 
-
    •  --rotate=yaw,pitch,roll rotate the panorama by the given angles
-
      • 
-
    •  --translate=x,y,z translate the panorama by the given distances
-
      • 
-
    
-
-
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pano_modify&oldid=15626[*]"
    -
    \ No newline at end of file +
    • -o, --output=file.pto: Writes the output to the given project file. If this parameter is not given the suffix _mod is added to the given input project.
      • +
    • -p, --projection=x: Sets the output projection to the projection with number x.
      • +
    • --fov=AUTO|HFOV|HFOVxVFOV: Sets output field of view. Following arguments are possible +
      • AUTO: calculates optimal fov.
        • +
      • HFOV: set hfov to given hfov (If output projection has coupled hfov and vfov, vfov is automatic changed).
        • +
      • HFOVxVFOV: set to given hfov and vfov.
      • +
    • -s, --straighten: Straightens the panorama.
      • +
    • -c, --center: Centers the panorama.
      • +
    • --canvas=AUTO|num%|WIDTHxHEIGHT: Sets the output canvas size +
      • AUTO: calculate optimal canvas size
        • +
      • num%: scales the optimal canvas size by the given percent value, e.g. --canvas=70% will scale the image to 70 % of the optimal size.
        • +
      • WIDTHxHEIGHT: set to given size
      • +
    • --crop=AUTO|AUTOHDR|left,right,top,bottom: Sets the crop rectangle for the output +
      • AUTO: performs an autocrop to the maximal possible size of the panorama
        • +
      • AUTOHDR: performs a HDR autocrop to the maximal possible size covered by all exposures
        • +
      • left,right,top,bottom: sets the crop to the given size
      • +
    • --output-exposure=AUTO|value: Sets the output exposure of the panorama +
      • AUTO: set output exposure to mean exposure of all images
        • +
      • value: set output exposure to given value
      • +
    • --output-range-compression=value: Sets the output range compression value
      • +
    • --output-type=str: Activates the output of the given items. This switch can be given several times or several items in one switch can be separated by a comma. +
      • NORMAL|N: normal panorama
        • +
      • STACKSFUSEDBLENDED|BF: LDR panorama with blended stacks
        • +
      • EXPOSURELAYERSFUSED|FB: LDR panorama with fused exposure layers (any arrangement)
        • +
      • HDR: HDR panorama
        • +
      • REMAP: remapped images with corrected exposure
        • +
      • REMAPORIG: remapped images with uncorrected exposure
        • +
      • HDRREMAP: remapped images in linear color space
        • +
      • FUSEDSTACKS: exposure fused stacks
        • +
      • HDRSTACKS: HDR stacks
        • +
      • EXPOSURELAYERS: blended exposure layers
      • +
    • --ldr-file=JPG|TIF|PNG: Sets the filetype for LDR panorama output
      • +
    • --ldr-compression=str: Sets the compression for LDR panorama output +
      • For TIF files the following compressions are supported: NONE|PACKBITS|LZW|DEFLATE
        • +
      • For JPG files the quality as number is expected
      • +
    • --hdr-file=EXR|TIF: Sets the filetype for HDR panorama output
      • +
    • --hdr-compression=str: Sets the compression for HDR panorama output +
      • For TIF files the following compressions are supported: NONE|PACKBITS|LZW|DEFLATE
      • +
    • --rotate=yaw,pitch,roll rotate the panorama by the given angles
      • +
    • --translate=x,y,z translate the panorama by the given distances
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pano_modify&oldid=16079"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_Editor_window.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_Editor_window.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_Editor_window.html 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_Editor_window.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,37 +1,33 @@ - + Hugin Panorama Editor window - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Hugin Panorama Editor window

    -
    -
    From PanoTools.org Wiki
    -
    (Redirected from Panorama Editor window[*])
    - -

    Contents

    +

    Hugin Panorama Editor window

    +
    From PanoTools.org Wiki
    (Redirected from Panorama Editor window[*])
    + +

    Contents

    Tabs

    -

    The Panorama Editor window is also "tab" based. Below you see a partial example screen of the Panorama Editor window showing the tabs with the button bar above them. -

    Hugin2013 panorama editor menu.png[*] +

    The Panorama Editor window is also "tab" based. Below you see a partial example screen of the Panorama Editor window showing the tabs with the button bar above them. +

    Hugin2013 panorama editor menu.png[*]

    Photos

    The Photos tab is used to:

    -
      -
    • Manage the images in a Hugin project -
      • -
    • Edit the positions of the images in the final panorama -
      • -
    • Edit the lens settings -
      • -
    • Edit photometrics settings -
      • -
    • Edit/Create stacks -
      • -
    +
    • Manage the images in a Hugin project
      • +
    • Edit the positions of the images in the final panorama
      • +
    • Edit the lens settings
      • +
    • Edit photometrics settings
      • +
    • Edit/Create stacks

    Masks

    Often photos contain parts which should not be used in the final panorama (e.g. moving objects); alternatively you may need to specifically include a distinctive feature (e.g. persons) in the final panorama. @@ -119,147 +108,102 @@

    Menus

    File

    -
      -
    • New: Discard the current project and start a new empty project. -
      • -
    • Open an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file. -
      • -
    • Save the current project as a Hugin pto file. -
      • -
    • Save as a pto file with a different name. -
      • -
    • Write PTStitcher script saves a simplified project file suitable for batch stitching with PTStitcher, nona or PTmender. Note that nona can stitch a Hugin project file directly, so this step is unnecessary when using nona. -
      • -
    • Most recently used projects shows a list of recent Hugin projects. -
      • -
    • Run Batch Processor launches the Hugin Batch Processor GUI queue manager; note that the queue won't be processed unless this queue manager is running. -
      • -
    • Merge project can be used to merge another project with the current project. New photos will be added to the list of images; for duplicate photos, only the control points are merged. -
      • -
    • Apply Template assigns parameters from an existing pto project to the current set of photos. Only position and lens parameters are transferred; control points are ignored. -
      • -
    • Preferences opens the Hugin Preferences window. -
      • -
    • Quit Hugin. -
      • -
    +
    • New: Discard the current project and start a new empty project.
      • +
    • Open an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file.
      • +
    • Save the current project as a Hugin pto file.
      • +
    • Save as a pto file with a different name.
      • +
    • Write PTStitcher script saves a simplified project file suitable for batch stitching with PTStitcher, nona or PTmender. Note that nona can stitch a Hugin project file directly, so this step is unnecessary when using nona.
      • +
    • Most recently used projects shows a list of recent Hugin projects.
      • +
    • Run Batch Processor launches the Hugin Batch Processor GUI queue manager; note that the queue won't be processed unless this queue manager is running.
      • +
    • Merge project can be used to merge another project with the current project. New photos will be added to the list of images; for duplicate photos, only the control points are merged.
      • +
    • Apply Template assigns parameters from an existing pto project to the current set of photos. Only position and lens parameters are transferred; control points are ignored.
      • +
    • Preferences opens the Hugin Preferences window.
      • +
    • Quit Hugin.

    Edit

    -
      -
    • Undo undoes the most recent change to the current project. -
      • -
    • Redo redoes an undo. -
      • -
    -
      -
    • Add Image to the current project. -
      • -
    • Run Assistant will run the automised panorama creator by finding control points, aligning and optimising. -
      • -
    • Send to assistant queue will run the automised panorama creator via the batch processor in case you want to create multiple panoramas after each other. -
      • -
    • Optimize re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab. -
      • -
    -
      -
    • Fine-tune all Points does the same as Fine-tune in the Hugin Control Points tab, except that all control points in the project are adjusted. Fine tune settings are set in the Hugin Preferences. -
      • -
    • Remove control points in masks removes all control points in regions which are masked on the Hugin Mask tab. -
      • -
    • Run Python script will run one of the installed or self-created python scripts. This option is only available when Python support has been compiled into your Hugin build. -
      • -
    +
    • Undo undoes the most recent change to the current project.
      • +
    • Redo redoes an undo.
    +
    • Add Image to the current project.
      • +
    • Import Raw Image... converts raw image(s) to TIFF format and adds them to current project. (see raw import for more details)
      • +
    • Run Assistant will run the automised panorama creator by finding control points, aligning and optimising.
      • +
    • Send to assistant queue will run the automised panorama creator via the batch processor in case you want to create multiple panoramas after each other.
      • +
    • Optimize re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab.
    +
    • Fine-tune all Points does the same as Fine-tune in the Hugin Control Points tab, except that all control points in the project are adjusted. Fine tune settings are set in the Hugin Preferences.
      • +
    • Remove control points in masks removes all control points in regions which are masked on the Hugin Mask tab.
      • +
    • Run Python script will run one of the installed or self-created python scripts. This option is only available when Python support has been compiled into your Hugin build.

    View

    - +

    Actions

    The Action menu list all install Python plugins for Hugin. It is therefore only available if Hugin is compiled with Python support.

    Interface

    -
      -
    • Simple: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases. -
      • -
    • Advanced: This user interface starts Hugin in the Panorama Editor screen. The simple interface is available in the background. -
      • -
    • Expert: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin. -
      • -
    +
    • Simple: This is the user interface this introduction is written for. It consists of all basic functionality to create a panorama and will suffice in 90% of all cases.
      • +
    • Advanced: This user interface starts Hugin in the Panorama Editor screen. The simple interface is available in the background.
      • +
    • Expert: This user interface also starts Hugin in the Panorama Editor screen and unleashes all the power and options of Hugin.

    Help

    - +
    • Help opens the Hugin manual.
      • +
    • Tip of the day
      • +
    • Keyboard Shortcuts
      • +
    • FAQ: Hugin Frequently asked questions
      • +
    • About shows the Hugin About window[*].
      • +
    • Donate opens the Hugin donation page; there is no obligation to donate. Any donations are used for travel and promotion costs related to Hugin development.


    Buttons

    Above the row of tabs are a series of buttons for common commands:

    -

    Hugin filenew.png[*] New project

    +

    Hugin filenew.png[*] New project

    Discards the current project and starts a new empty project.

    -

    Hugin fileopen.png[*] Open project

    -

    Opens an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file. +

    Hugin fileopen.png[*] Open project

    +

    Opens an existing Hugin, PTGUI[*], PTAssembler[*], autopano or autopano-sift project file.

    -

    Hugin filesave.png[*] Save project

    +

    Hugin filesave.png[*] Save project

    Saves the current project as a Hugin .pto file.

    -

    Hugin filesaveas.png[*] Save project as

    +

    Hugin filesaveas.png[*] Save project as

    Saves as a .pto file with a different name.

    -

    Hugin undo.png[*] Undo

    +

    Hugin undo.png[*] Undo

    Undoes the most recent change to the current project.

    -

    Hugin redo.png[*] Redo

    +

    Hugin redo.png[*] Redo

    Redoes an undo.

    -

    Hugin edit add.png[*] Add image

    +

    Hugin edit add.png[*] Add image

    Adds an image or photo to the current project.

    -

    Hugin optimize.png[*] Re-optimize

    +

    Hugin optimize.png[*] Re-optimize

    Re-optimises the current project. This has exactly the same effect as clicking Optimize Now! in the Optimiser tab.

    -

    Gl preview.png[*] Fast Preview panorama

    +

    Gl preview.png[*] Fast Preview panorama

    Shows the Hugin Fast Preview window.

    -

    Hugin preview.png[*] Preview panorama

    +

    Hugin preview.png[*] Preview panorama

    Shows the Hugin Preview window.

    -

    Hugin list.png[*] Show control points

    +

    Hugin list.png[*] Show control points

    Shows the Hugin Control Points table.

    -

    Hugin info.png[*] About Hugin

    +

    Hugin info.png[*] About Hugin

    Shows the Hugin About pop-up window; this displays the current version and a list of contributors.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Hugin_Panorama_Editor_window&oldid=15082[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Hugin_Panorama_Editor_window&oldid=16066"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_formats.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_formats.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_formats.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_formats.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,39 +1,35 @@ - + Panorama formats - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panorama formats

    -
    -
    From PanoTools.org Wiki
    +

    Panorama formats

    +
    From PanoTools.org Wiki
    - -

    The format of a panorama is defined in broad terms by the projection used to map the full or partial 3D scene onto a 2 dimensional print or screen. +

    The format of a panorama is defined in broad terms by the projection used to map the full or partial 3D scene onto a 2 dimensional print or screen. There are several types of projections in use:

    -

    Contents

    +

    Contents

    Full Spherical Formats

    -

    There are two main spherical formats: Equirectangular and Cubic. Both are able to display the whole sphere that surrounds us - 360° along the horizon, 90° up and 90° down. Specialized viewers[*] are needed to view spherical panoramas. +

    There are two main spherical formats: Equirectangular and Cubic. Both are able to display the whole sphere that surrounds us - 360° along the horizon, 90° up and 90° down. Specialized viewers[*] are needed to view spherical panoramas.

    -
    [*]
    [*]
    equirectangular panorama format
    +
    [*]
    [*]
    equirectangular panorama format

    Equirectangular

    -

    The equirectangular format is widely used by a couple of Panorama Viewers[*] as for example PTViewer[*] and SPi-V[*]. It consists of a single image with an aspect ratio of 2:1 (that is, the width must be exactly twice the height). +

    The equirectangular format is widely used by a couple of Panorama Viewers[*] as for example PTViewer[*] and SPi-V[*]. It consists of a single image with an aspect ratio of 2:1 (that is, the width must be exactly twice the height).

    -
    [*]
    [*]
    cubic panorama format
    +
    [*]
    [*]
    cubic panorama format

    Cubic

    The cubic format uses 6 cube faces to fill the whole sphere around us. The image is remapped to the cubefaces which fit seamlessly. -

    One very wide spread cubic format is QuickTime[*] VR. It consists of one file containing the 6 faces as JPEG compressed images together with a header giving basic information how the panorama should be displayed. -

    Another cubic format is used by SPi-V[*]. It consists of the 6 cubefaces in a single row or column. SPi-V[*] treats any image with an aspect ratio of exactly 6:1 as a cubic spherical panorama. +

    One very wide spread cubic format is QuickTime[*] VR. It consists of one file containing the 6 faces as JPEG compressed images together with a header giving basic information how the panorama should be displayed. +

    Another cubic format is used by SPi-V[*]. It consists of the 6 cubefaces in a single row or column. SPi-V[*] treats any image with an aspect ratio of exactly 6:1 as a cubic spherical panorama.

    -
    [*]
    [*]
    Little planet remapping example © Erik Krause
    -

    "Little Planet"

    -

    This is an unusal format that remaps a full sphere such that the ground looks like if it was a little planet. See Unusual remappings[*] for details.
    +

    [*]
    [*]
    Little planet remapping example © Erik Krause
    +

    "Little Planet"

    +

    This is an unusal format that remaps a full sphere such that the ground looks like if it was a little planet. See Unusual remappings[*] for details.

    Partial Formats

    There is a number of possibilities to display partial panoramas - these are panoramas that don't fill the whole sphere in one or the other way. Partial panoramas can be displayed directly if they don't cover more than approximately 120° along the shorter side (that is they can be 360° in one direction but must be 120° or less in the other direction). The main formats are Cylindrical and Rectilinear, but partial spherical panoramas are possible, too.

    -
    [*]
    [*]
    cylindrical panorama format
    +
    [*]
    [*]
    cylindrical panorama format

    Cylindrical

    Cylindrical panoramas can show a full circle along the horizon or a part of it. They are very popular for landscape panoramas. If used for architectural subjects it might be of bother that horizontal lines (except the horizon itself) are bent.

    -
    [*]
    [*]
    Arc formed panorama example © Erik Krause
    +
    [*]
    [*]
    Arc formed panorama example © Erik Krause

    Arc formed

    -

    A special type of a Cylindrical Projection where the panorama is arched like on common orientation plates. See details on Unusual remappings[*].
    +

    A special type of a Cylindrical Projection where the panorama is arched like on common orientation plates. See details on Unusual remappings[*].

    -
    [*]
    [*]
    rectilinear panorama format
    +
    [*]
    [*]
    rectilinear panorama format

    Rectilinear

    Rectilinear panoramas display the subject just like an ordinary (non-fisheye) lens would do. The horizontal and vertical field of view are limited to about 120°. Straight lines stay straight, hence they are good for architectural subjects. But if either field of view is too large they suffer from unnatural looking distortions in the corners.

    -
    [*]
    [*]
    cutted equirectangular panorama format
    +
    [*]
    [*]
    cutted equirectangular panorama format

    Partial Spherical

    To partial spherical panoramas applies basically the same as to full sphericals (see above). In most cases they are used to cut off Zenith or Nadir. Vertical field of view has to be limited in this case to prevent the viewer from misinterpreting the source images.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panorama_formats&oldid=12369[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panorama_formats&oldid=12369"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,38 +1,34 @@ - + Panorama - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panorama

    -
    -
    From PanoTools.org Wiki
    +

    Panorama

    +
    From PanoTools.org Wiki
    - -


    +


    -

    Contents

    +

    Contents

    • 1 Panorama
        @@ -54,19 +50,24 @@

        Technically two different types of panoramas are distinguished.

        Partial panoramas

        -

        If a partial Panorama doesn't come from a special Panorama Camera[*] it typically is an image created by assembling together 2 or more images to create a single image with a wider Field of View. +

        If a partial Panorama doesn't come from a special Panorama Camera[*] it typically is an image created by assembling together 2 or more images to create a single image with a wider Field of View.

        Partial panoramas are created in exactly the same way as full spherical panoramas, but cover only a fraction of the view sphere (less than 360 degrees in longitude around the horizon, and/or less than 180 degrees in latitude). Example partial panos include Max Lyon's GigaPixel image, created with 196 source images! Partial panoramas are often viewed like traditional images, either in print or digital form.

        Immersive panoramas

        -

        Immersive or full-spherical panoramas are panoramas viewed through special viewing software[*] that allows you to look everywhere around you, including straight up and straight down. Partial panoramas can also be viewed in the same way, blurring the difference between them. In particular, partial panoramas which cover all 360 degrees in longitude, but less than 180 degrees of latitude, are often considered immersive panoramas as well, and viewed with the same type of software. Example immersive panoramas can be found at the World-Wide Panorama page, among many other places. +

        Immersive or full-spherical panoramas are panoramas viewed through special viewing software[*] that allows you to look everywhere around you, including straight up and straight down. Partial panoramas can also be viewed in the same way, blurring the difference between them. In particular, partial panoramas which cover all 360 degrees in longitude, but less than 180 degrees of latitude, are often considered immersive panoramas as well, and viewed with the same type of software. Example immersive panoramas can be found at the World-Wide Panorama page, among many other places.


        Projection

        A fundamental concept in the production and viewing of both partial and full spherical panoramic images is the type of input and output projection used. See Projections for more information. It is the projection of photographic images and resulting panoramas which explains why the simple method of aligning and taping together snapshots cannot produce seamless panoramic images (though it can be quite enjoyable in its own right).

        + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panorama&oldid=9443[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panorama&oldid=9443"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html 2017-04-29 16:05:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_scripting_in_a_nutshell.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,39 +1,35 @@ - + Panorama scripting in a nutshell - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panorama scripting in a nutshell

    -
    -
    From PanoTools.org Wiki
    +

    Panorama scripting in a nutshell

    +
    From PanoTools.org Wiki
    - -

    This is a short document describing the various Open Source tools and techniques available for working with panoramas in a non-GUI environment. The examples are based on Linux experience, but most of them should work on OS X or Windows with minor modifications at most. +

    This is a short document describing the various Open Source tools and techniques available for working with panoramas in a non-GUI environment. The examples are based on Linux experience, but most of them should work on OS X or Windows with minor modifications at most.

    This document is also useful for understanding what happens 'under the hood' in hugin itself and recommended reading for anyone looking to work with the hugin sourcecode.

    -

    Contents

    + -

    Why would you do that?

    -

    Creating and manipulating panoramas is something that should obviously be done in a graphical tool[*]. This is true, but perhaps you find that you are spending more time operating a computer than being a photographer. This is an indication that something is wrong - The computer exists to do the boring work and scripting is one way to make this happen. +

    Why would you do that?

    +

    Creating and manipulating panoramas is something that should obviously be done in a graphical tool[*]. This is true, but perhaps you find that you are spending more time operating a computer than being a photographer. This is an indication that something is wrong - The computer exists to do the boring work and scripting is one way to make this happen.

    -

    PanoTools 'Scripting'

    +

    PanoTools 'Scripting'

    The file format first used in Helmut Dersch's Panorama tools is often referred to as a 'script', but a 'PanoTools' script is really a data file describing a 'panorama stitching project'. -

    Although these original PanoTools are less used today, the file format is alive and well with several variations used as project files by PTGui[*], PTAssembler[*], hugin and related tools. These files are simple plain-text, sometimes it is useful to modify them directly with a text editor - Further on we will introduce various methods for manipulating them via the 'programming' kind of scripts. +

    Although these original PanoTools are less used today, the file format is alive and well with several variations used as project files by PTGui[*], PTAssembler[*], hugin and related tools. These files are simple plain-text, sometimes it is useful to modify them directly with a text editor - Further on we will introduce various methods for manipulating them via the 'programming' kind of scripts.

    Simple command-line stitching

    -

    Lets start with a basic but common use case: Photographers with quality panoramic tripod heads[*] can reproduce identical sets of photos every time, in this situation there is no need to create a new stitching project for every panorama, it is enough to use a single project as a template. +

    Lets start with a basic but common use case: Photographers with quality panoramic tripod heads[*] can reproduce identical sets of photos every time, in this situation there is no need to create a new stitching project for every panorama, it is enough to use a single project as a template.

    This example takes a pre-existing project called template.pto, created with three photos. It uses nona for remapping, and enblend for blending the remapped photos into a finished TIFF image: 

     nona -o out -m TIFF_m template.pto DSC_1234.JPG DSC_1235.JPG DSC_1236.JPG
@@ -115,7 +111,7 @@
 
    
 
      cpfind --multirow -o project.pto project.pto
 
    
-
    Hint: Other control points generator, such as autopano-sift, autopano-sift-c[*], panomatic and match-n-shift[*] take a list of images instead of a project. In this case the pto generation and control point generation are one step. Here is an example for autopano-sift-c:
+
    Hint: Other control points generator, such as autopano-sift, autopano-sift-c[*], panomatic and match-n-shift[*] take a list of images instead of a project. In this case the pto generation and control point generation are one step. Here is an example for autopano-sift-c:
 
    
 
     autopano-sift-c --projection 0,50 project.pto DSC_1234.JPG DSC_1235.JPG DSC_1236.JPG
 
    
@@ -132,7 +128,7 @@
 
     cpclean -o project.pto project.pto
 
    
 
    Note that in both cases we are overwriting the input project.pto file with the cleaned output. If you want you can create intermediate temporary files and keep each step in case you need to backtrack.
-
    Other control point cleaners are ptscluster[*] and ptoclean. cpclean has largely replaced ptoclean, but you could still run it like this:
+
    Other control point cleaners are ptscluster[*] and ptoclean. cpclean has largely replaced ptoclean, but you could still run it like this:
 
    
 
     ptoclean -v --output project.pto project.pto
 
    
@@ -153,15 +149,15 @@
 
     pto_var --opt y,p,r -o project.pto project.pto
  autooptimiser -n -o project.pto project.pto
 
    
-
    (PToptimizer[*] is an alternative geometrical optimiser)
+
    (PToptimizer[*] is an alternative geometrical optimiser)
 
    
 
    Optimising photometric parameters
    
-
    Photos have photometric exposure variables which can be optimised in much the same way as aligning positions. Doing this can remove brightness, white balance[*] and vignetting differences between photos, giving better blending or allowing creation of HDR images.
+
    Photos have photometric exposure variables which can be optimised in much the same way as aligning positions. Doing this can remove brightness, white balance[*] and vignetting differences between photos, giving better blending or allowing creation of HDR images.
 
    For doing an automatic photometric optimisation like Hugin's assistant, run autooptimiser with -m switch:
 
    
 
     autooptimiser -m -o project.pto project.pto
 
    
-
    For full manual control for photometric parameters use vig_optimize. This program does the equivalent job for photometric parameters as autooptimiser does for geometric parameters. You need to indicate in the .pto project which parameters are 'variables'. For this task you can edit the .pto file or use a tool such as pto_var or ptovariable[*]:
+
    For full manual control for photometric parameters use vig_optimize. This program does the equivalent job for photometric parameters as autooptimiser does for geometric parameters. You need to indicate in the .pto project which parameters are 'variables'. For this task you can edit the .pto file or use a tool such as pto_var or ptovariable[*]:
 
    
 
     ptovariable --vignetting --response --exposure project.pto
  vig_optimize -o project.pto project.pto
@@ -218,7 +214,7 @@
 
    The stitching option of hugin_executor can be broken apart into separate command lines.
 
    The simplest case is remapping and blending.
 
    
-
    Remapping (Rendering) images
    
+
    Remapping (Rendering) images
    
 
    The hugin tool for remapping and distorting the photos into the final panorama frame is nona, it uses the .pto project file as a set of instructions:
 
    
 
     nona -m TIFF_m -o project project.pto
@@ -235,8 +231,8 @@
 
    
 
    Holding it all together with panostart
    
 
    The .pto.mk Makefile helps with the stitching at the end of the process, but doesn't help with the bits at the beginning such as: identifying which photos go in which panorama, generating control points, pruning and optimising.
-
    panostart[*] is a prototype tool that does it all. Given a list of photos in a folder, it identifies likely panoramas by comparing EXIF timestamps and writes a meta-Makefile containing: rules for generating .pto projects with match-n-shift[*], rules for generating corresponding .pto.mk Makefiles with pto2mk[*], rules for stitching the projects with make, plus some other rules for creating useful distributable output.
-
    A typical panostart[*] command for dealing with a folder full of photos taken with a pocket point-and-shoot camera on auto-exposure might look like this:
+
    panostart[*] is a prototype tool that does it all. Given a list of photos in a folder, it identifies likely panoramas by comparing EXIF timestamps and writes a meta-Makefile containing: rules for generating .pto projects with match-n-shift[*], rules for generating corresponding .pto.mk Makefiles with pto2mk[*], rules for stitching the projects with make, plus some other rules for creating useful distributable output.
+
    A typical panostart[*] command for dealing with a folder full of photos taken with a pocket point-and-shoot camera on auto-exposure might look like this:
 
    
 
     panostart --output Makefile --projection 0 --fov 50 --nostacks --loquacious *.JPG
 
    
@@ -248,7 +244,7 @@
 
    Another advantage of doing things this way is reproducibility: delete all the (enormous) TIFF output panoramas and all you need to keep permanently are the photos, the meta-Makefile and the associated .pto projects. If you ever need to recreate the TIFF panoramas in the future, just type make. If you know the name of the TIFF file you want, just type 'make project.tif' and only a single panorama will be processed.
 
    
 
    Panotools::Script for manipulating project files
    
-
    The name is a historical mistake, Panotools::Script[*] is a perl library for working with hugin .pto projects, though it could be extended in the future to cover any of the related file formats. Many of the command-line tools described in this document are written with this library.
+
    The name is a historical mistake, Panotools::Script[*] is a perl library for working with hugin .pto projects, though it could be extended in the future to cover any of the related file formats. Many of the command-line tools described in this document are written with this library.
 
    Here is a trivial script, all it does is open and save a .pto project, it also resets the output ('p' Panorama line) angle of view to 360 degrees (v360), the projection format to equirectangular (f2) and the output pixel size to 4096x2048 pixels (w4096 h2048):
 
    
 
     #!/usr/bin/perl
@@ -258,7 +254,7 @@
  $pto->Panorama->Set (v => 360, f => 2, w => 4096, h = 2048);
  $pto->Write ($ARGV[0]);
 
    
-
    Here's slightly more complex script, this iterates over the input images and increments the white balance[*] making the panorama slightly 'warmer':
+
    Here's slightly more complex script, this iterates over the input images and increments the white balance[*] making the panorama slightly 'warmer':
 
    
 
     #!/usr/bin/perl
  use Panotools::Script;
@@ -274,230 +270,115 @@
 
    
 
    Full list of command-line tools
    
 
    Control point generation
    
-
      
-
    •  cpfind - Hugins own control point detector
-
      • 
-
    •  autopano-sift-c[*] - All in one keypoint generator and matcher
-
      • 
-
    •  match-n-shift[*] - All in one wrapper around align_image_stack and autopano-sift-c[*]
-
      • 
-
    •  panomatic - All in one alternative to autopano-sift-c[*]
-
      • 
-
    •  align_image_stack - Generates control points for stacked photos
-
      • 
-
    •  ptoanchor - add control points to a Hugin project
-
      • 
-
    •  ptochain - add control points to a Hugin project between consecutive photos
-
      • 
-
    •  ptobind - Join the ends of linked photos in a Hugin project
-
      • 
-
    •  ptofill - add control points to a Hugin project between likely overlapping photos
-
      • 
-
    •  generatekeys - Keypoint generator
-
      • 
-
    •  autopano - Keypoint matcher, part of autopano-sift-c[*] and not to be confused with autopano
-
      • 
-
    
+
    • cpfind - Hugins own control point detector
      • 
+
    • autopano-sift-c[*] - All in one keypoint generator and matcher
      • 
+
    • match-n-shift[*] - All in one wrapper around align_image_stack and autopano-sift-c[*]
      • 
+
    • panomatic - All in one alternative to autopano-sift-c[*]
      • 
+
    • align_image_stack - Generates control points for stacked photos
      • 
+
    • ptoanchor - add control points to a Hugin project
      • 
+
    • ptochain - add control points to a Hugin project between consecutive photos
      • 
+
    • ptobind - Join the ends of linked photos in a Hugin project
      • 
+
    • ptofill - add control points to a Hugin project between likely overlapping photos
      • 
+
    • generatekeys - Keypoint generator
      • 
+
    • autopano - Keypoint matcher, part of autopano-sift-c[*] and not to be confused with autopano
    
 
    Project file modification
    
-
      
-
    •  pto_gen - Generates a new pto project from image files
-
      • 
-
    •  match-n-shift[*] - (see above) Default usage is to initialise a new .pto project from EXIF data
-
      • 
-
    •  ptoset - Change global parameters and project options
-
      • 
-
    •  ptovariable[*] - Set typical optimisation variables
-
      • 
-
    •  pto_var - Manipulate image variable, can also set optimisation variables
-
      • 
-
    •  pto_lensstack - Manipulate lenses and stacks
-
      • 
-
    •  pto_mask - Add mask to project file
-
      • 
-
    •  pto_template - Apply template to project file
-
      • 
-
    •  ptsed - Set any project parameter, convert .pto into PanoTools format
-
      • 
-
    •  ptosort[*] - Sort control points or images, remove duplicate control points
-
      • 
-
    •  ptopath - Remove file paths in project files
-
      • 
-
    •  transform-pano[*] - Roll, pitch and yaw rotation of .pto projects
-
      • 
-
    •  ptocentre - Rotate projects to put images in panorama centre
-
      • 
-
    •  pano_modify Change output parameters of project file
-
      • 
-
    
-
      
-
    •  ptomerge[*] - Join two or more projects
-
      • 
-
    •  pto_merge Merges two or more Hugin project files (this is a different tool to ptomerge above)
-
      • 
-
    •  ptosplit[*] - Extract subsets of images from a project into a new project
-
      • 
-
    
+
    • pto_gen - Generates a new pto project from image files
      • 
+
    • match-n-shift[*] - (see above) Default usage is to initialise a new .pto project from EXIF data
      • 
+
    • ptoset - Change global parameters and project options
      • 
+
    • ptovariable[*] - Set typical optimisation variables
      • 
+
    • pto_var - Manipulate image variable, can also set optimisation variables
      • 
+
    • pto_lensstack - Manipulate lenses and stacks
      • 
+
    • pto_mask - Add mask to project file
      • 
+
    • pto_template - Apply template to project file
      • 
+
    • ptsed - Set any project parameter, convert .pto into PanoTools format
      • 
+
    • ptosort[*] - Sort control points or images, remove duplicate control points
      • 
+
    • ptopath - Remove file paths in project files
      • 
+
    • transform-pano[*] - Roll, pitch and yaw rotation of .pto projects
      • 
+
    • ptocentre - Rotate projects to put images in panorama centre
      • 
+
    • pano_modify Change output parameters of project file
    
+
    • ptomerge[*] - Join two or more projects
      • 
+
    • pto_merge Merges two or more Hugin project files (this is a different tool to ptomerge above)
      • 
+
    • ptosplit[*] - Extract subsets of images from a project into a new project
    
 
    Control point pruning
    
-
+
 
    Optimisation
    
-
+
 
    Rendering
    
-
      
-
    •  nona - Default hugin rendering engine
-
      • 
-
    •  nona-mask[*] - Wrapper around nona for using external bitmap masks
-
      • 
-
    •  PTmender - Render PanoTools format projects
-
      • 
-
    
-
      
-
    •  PTAInterpolate[*] - Create intermediate images from PanoTools projects
-
      • 
-
    
+
    • nona - Default hugin rendering engine
      • 
+
    • nona-mask[*] - Wrapper around nona for using external bitmap masks
      • 
+
    • PTmender - Render PanoTools format projects
    
+
    • PTAInterpolate[*] - Create intermediate images from PanoTools projects
    
 
    Blending
    
-
      
-
    •  enblend - Merge partially overlapping images with multiresolution splines
-
      • 
-
    •  verdandi - Merge partially overlapping images with watershed algorithm
-
      • 
-
    •  enfuse - Merge overlapping images with exposure fusion
-
      • 
-
    •  PTroller - Merge partially overlapping images with no seaming
-
      • 
-
    •  PTmasker - Compute stitching masks for input by PTroller
-
      • 
-
    •  enblend-mask - Wrapper around enblend for using external bitmap masks
-
      • 
-
    •  enfuse-mask - Wrapper around enfuse for using external bitmap masks
-
      • 
-
    •  deghosting_mask - Creates mask for removing ghosting in images
-
      • 
-
    •  hugin_hdrmerge[*] - Merge bracketed images for HDR generation
-
      • 
-
    •  enblend-svg - Wrapper around enblend for specifying input images via SVG files
-
      • 
-
    
-
      
-
    •  process-masks - Allow 'positive' masking in external masks for enblend
-
      • 
-
    •  tif2svg - Assemble multiple TIFF images into SVG files for enblend-svg
-
      • 
-
    •  PTblender - Correct colour and brightness of overlapping images
-
      • 
-
    
+
    • enblend - Merge partially overlapping images with multiresolution splines
      • 
+
    • verdandi - Merge partially overlapping images with watershed algorithm
      • 
+
    • enfuse - Merge overlapping images with exposure fusion
      • 
+
    • PTroller - Merge partially overlapping images with no seaming
      • 
+
    • PTmasker - Compute stitching masks for input by PTroller
      • 
+
    • enblend-mask - Wrapper around enblend for using external bitmap masks
      • 
+
    • enfuse-mask - Wrapper around enfuse for using external bitmap masks
      • 
+
    • deghosting_mask - Creates mask for removing ghosting in images
      • 
+
    • hugin_hdrmerge[*] - Merge bracketed images for HDR generation
      • 
+
    • enblend-svg - Wrapper around enblend for specifying input images via SVG files
    
+
    • process-masks - Allow 'positive' masking in external masks for enblend
      • 
+
    • tif2svg - Assemble multiple TIFF images into SVG files for enblend-svg
      • 
+
    • PTblender - Correct colour and brightness of overlapping images
    
 
    Misc
    
-
      
-
    •  panostart[*] - All-in-one panorama workflow via Makefiles
-
      • 
-
    •  gigastart - All-in-one assembly of multi-row panoramas
-
      • 
-
    •  hugin_executor - Stitch project or run assistant from command line
-
      • 
-
    •  gigatile[*] - Create a Makefile for stitching a project as multi-resolution tiles
-
      • 
-
    •  ptodummy[*] - Generate missing input photos to debug .pto projects
-
      • 
-
    •  calibrate_lens[*] - Automatic lens calibration using straight-line detection
-
      • 
-
    •  pafextract[*] - Tool to use panoglview as a zenith and nadir editor[*]
-
      • 
-
    
+
    • panostart[*] - All-in-one panorama workflow via Makefiles
      • 
+
    • gigastart - All-in-one assembly of multi-row panoramas
      • 
+
    • hugin_executor - Stitch project or run assistant from command line
      • 
+
    • gigatile[*] - Create a Makefile for stitching a project as multi-resolution tiles
      • 
+
    • ptodummy[*] - Generate missing input photos to debug .pto projects
      • 
+
    • calibrate_lens[*] - Automatic lens calibration using straight-line detection
      • 
+
    • pafextract[*] - Tool to use panoglview as a zenith and nadir editor[*]
    
 
    Chromatic aberration
    
-
+
 
    Querying
    
-
      
-
    •  ptograph - Draw undirected graphs of projects
-
      • 
-
    •  ptoget - Query any project parameter
-
      • 
-
    •  ptoinfo - Generate a report on a project file
-
      • 
-
    •  PTinfo - Display info about a panotools generated TIFF file
-
      • 
-
    •  panoinfo - Display information about installed libpano13[*] library
-
      • 
-
    •  pano_trafo - transform between image and panorama coordinates (and vice versa)
-
      • 
-
    
+
    • ptograph - Draw undirected graphs of projects
      • 
+
    • ptoget - Query any project parameter
      • 
+
    • ptoinfo - Generate a report on a project file
      • 
+
    • PTinfo - Display info about a panotools generated TIFF file
      • 
+
    • panoinfo - Display information about installed libpano13[*] library
      • 
+
    • pano_trafo - transform between image and panorama coordinates (and vice versa)
    
 
    TIFF files
    
-
      
-
    •  PTtiff2psd - Join multiple TIFF images into a multilayer PSD file
-
      • 
-
    •  PTtiffdump - Compare two TIFF files
-
      • 
-
    •  PTcrop - Remove unwanted empty space in TIFF files and replace with offsets
-
      • 
-
    •  PTuncrop - Replace offsets in TIFF files with empty pixels
-
      • 
-
    
+
    • PTtiff2psd - Join multiple TIFF images into a multilayer PSD file
      • 
+
    • PTtiffdump - Compare two TIFF files
      • 
+
    • PTcrop - Remove unwanted empty space in TIFF files and replace with offsets
      • 
+
    • PTuncrop - Replace offsets in TIFF files with empty pixels
    
 
    Output formats
    
-
-
      
-
    •  erect2cubic - Create a .pto project for extracting cube faces from an equirectangular image
-
      • 
-
    •  erect2planet - Create a .pto project for extracting a 'little planet' from an equirectangular image
-
      • 
-
    •  erect2mercator - Create a .pto project for extracting a mercator view from an equirectangular image
-
      • 
-
    
+
+
    • erect2cubic - Create a .pto project for extracting cube faces from an equirectangular image
      • 
+
    • erect2planet - Create a .pto project for extracting a 'little planet' from an equirectangular image
      • 
+
    • erect2mercator - Create a .pto project for extracting a mercator view from an equirectangular image
    
 
    Older tools
    
-
    Helmut Dersch's PTOptimizer and PTStitcher were the original command-line tools. These are not really recommendable any more as they require an older, buggier version of the libpano12[*] library, they are closed source so don't work on modern systems such as OS X or 64bit Linux, and are lacking in features compared to modern replacements such as autooptimiser and nona.
+
    Helmut Dersch's PTOptimizer and PTStitcher were the original command-line tools. These are not really recommendable any more as they require an older, buggier version of the libpano12[*] library, they are closed source so don't work on modern systems such as OS X or 64bit Linux, and are lacking in features compared to modern replacements such as autooptimiser and nona.
 
    
 
    Useful Image processing tools
    
-
      
-
    •  ImageMagick[*] - Many utilities for converting, manipulating and resizing images
-
      • 
-
    •  GraphicsMagick - A  fork of ImageMagick with many improvements
-
      • 
-
    •  libtiff - Supplied with useful tools such as tiffcp for joining and recompression, and tifficc for adding ICC colour profiles
-
      • 
-
    •  exiftool[*] - All purpose reading, setting and copying of EXIF data
-
      • 
-
    •  exiv2 - EXIF manipulation, useful for setting the file modification date from the EXIF date
-
      • 
-
    •  jpegtran - Lossless rotation of JPEG images
-
      • 
-
    •  ufraw-batch - Command-line RAW processing
-
      • 
-
    •  dcraw[*] - Command-line RAW processing
-
      • 
-
    
-
+
    • ImageMagick[*] - Many utilities for converting, manipulating and resizing images
      • 
+
    • GraphicsMagick - A  fork of ImageMagick with many improvements
      • 
+
    • libtiff - Supplied with useful tools such as tiffcp for joining and recompression, and tifficc for adding ICC colour profiles
      • 
+
    • exiftool[*] - All purpose reading, setting and copying of EXIF data
      • 
+
    • exiv2 - EXIF manipulation, useful for setting the file modification date from the EXIF date
      • 
+
    • jpegtran - Lossless rotation of JPEG images
      • 
+
    • ufraw-batch - Command-line RAW processing
      • 
+
    • dcraw[*] - Command-line RAW processing
    
 
 
+
+
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panorama_scripting_in_a_nutshell&oldid=15909[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panorama_scripting_in_a_nutshell&oldid=15909"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panorama_tools.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,107 +1,104 @@ - + Panorama tools - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panorama tools

    -
    -
    From PanoTools.org Wiki
    +

    Panorama tools

    +
    From PanoTools.org Wiki
    - -

    What are the panorama tools

    -

    The Panorama Tools, also known as The PanoTools are a free suite of programs and libraries originally written by the german physics and mathematics professor Helmut Dersch[*]. PanoTools provides a powerful framework for re-projecting and blending multiple source images into immersive panoramics of many types. An updated version of the PanoTools library serves as the underlying core engine for many software panorama GUI front-ends[*]. -

    Helmut started development on PanoTools in 1998, producing some of the most professional and versatile software available for building panoramas and more, but had to stop development in 2001 due to legal harrassment and claims of patent infringement by a company called IPIX[*]. In 2003 he released some modifications to the java-based online panorama viewer PTViewer[*]. One involved a standalone .exe version and another version could display HDR (high dynamic range) panoramas. The most recent release from Helmut is PTViewerME, a panorama viewer for PDAs and mobile devices. The homepage of Helmut can be found here. It has no links to his older work on PanoTools, but some list members managed to make a copy of his old homepage before it shut down. Thanks to Kathy Wheeler the page could be reconstructed completely: http://www.panotools.org/dersch +

    What are the panorama tools

    +

    The Panorama Tools, also known as The PanoTools are a free suite of programs and libraries originally written by the german physics and mathematics professor Helmut Dersch[*]. PanoTools provides a powerful framework for re-projecting and blending multiple source images into immersive panoramics of many types. An updated version of the PanoTools library serves as the underlying core engine for many software panorama GUI front-ends[*]. +

    Helmut started development on PanoTools in 1998, producing some of the most professional and versatile software available for building panoramas and more, but had to stop development in 2001 due to legal harrassment and claims of patent infringement by a company called IPIX[*]. In 2003 he released some modifications to the java-based online panorama viewer PTViewer[*]. One involved a standalone .exe version and another version could display HDR (high dynamic range) panoramas. The most recent release from Helmut is PTViewerME, a panorama viewer for PDAs and mobile devices. The homepage of Helmut can be found here. It has no links to his older work on PanoTools, but some list members managed to make a copy of his old homepage before it shut down. Thanks to Kathy Wheeler the page could be reconstructed completely: http://www.panotools.org/dersch

    After Helmut stopped developing Panorama Tools, the members of his mailing-list took over development, and began enhancing the software suite on their own. They moved the project to SourceForge and have fixed some bugs and developed additional functionality since.

    - +

    What software is included in the panorama tools

    PanoTools is a collection of free tools for Panorama and 3D Object creation. It consists of:

    - - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - -
    PTEditor[*] Java interactive Panorama Editor. +
    PTEditor[*]Java interactive Panorama Editor.
    PTPicker[*] Java front end to panorama stitcher and other tools. It provides a graphical interface for feature point selection and position optimization. +PTPicker[*]Java front end to panorama stitcher and other tools. It provides a graphical interface for feature point selection and position optimization.
    PTCrypt[*] Java tool for scrambling pictures intended to be viewed online with ptviewer. +PTCrypt[*]Java tool for scrambling pictures intended to be viewed online with ptviewer.
    PTStitcher Panorama stitching tool which remaps, adjusts and combines arbitrary images to panoramic views. No source available. Similar projects are nona in hugin as well as PTmender. +PTStitcherPanorama stitching tool which remaps, adjusts and combines arbitrary images to panoramic views. No source available. Similar projects are nona in hugin as well as PTmender.
    PTmender Open source replacement for PTStitcher. +PTmenderOpen source replacement for PTStitcher.
    PTOptimizer Optimizes positions and sizes of images using control-point data. +PTOptimizerOptimizes positions and sizes of images using control-point data.
    PTStereo[*] Creates 3-dimensional objects from 2 stereoscopic or more images. +PTStereo[*]Creates 3-dimensional objects from 2 stereoscopic or more images.
    PTInterpolate[*] Physically valid true view interpolator. Given two images of the same scene taken from different positions, this tool creates views from any intermediate position. +PTInterpolate[*]Physically valid true view interpolator. Given two images of the same scene taken from different positions, this tool creates views from any intermediate position.
    PTMorpher[*] Morphing tool. +PTMorpher[*]Morphing tool.
    PTAverage[*] Averages images to reduce noise and enhance density. +PTAverage[*]Averages images to reduce noise and enhance density.
    PTStripe[*] Combines images into movie-stripes for viewing in object-viewers (PTMovie extension to PTViewer). +PTStripe[*]Combines images into movie-stripes for viewing in object-viewers (PTMovie extension to PTViewer).
    Panorama Tools Plugins[*] Photoshop[*], GraphicConverter and Gimp[*] plug-ins for image correction and remapping. Also compatible to many other programs that can use Photoshop[*] plugins. +Panorama Tools Plugins[*]Photoshop[*], GraphicConverter and Gimp[*] plug-ins for image correction and remapping. Also compatible to many other programs that can use Photoshop[*] plugins.
    pano12 library The underlying panorama library, currently used by several different panorama front-ends and command line programs. This may be called pano12.dll, libpano12.so, libpano12.dylib or pano12.lib depending on the operating system. -
    -

    To make working with the panorama tools easier and to add functionality, many excellent software helpers and GUI front-ends[*] to PanoTools, some free and some commercial, have been written, which in many cases make interacting directly with the programs in the original PanoTools toolset unnecessary. See the software[*] page to learn more. +pano12 library +The underlying panorama library, currently used by several different panorama front-ends and command line programs. This may be called pano12.dll, libpano12.so, libpano12.dylib or pano12.lib depending on the operating system. + +

    To make working with the panorama tools easier and to add functionality, many excellent software helpers and GUI front-ends[*] to PanoTools, some free and some commercial, have been written, which in many cases make interacting directly with the programs in the original PanoTools toolset unnecessary. See the software[*] page to learn more.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panorama_tools&oldid=13478[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panorama_tools&oldid=13478"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Panotools.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,108 +1,105 @@ - + Panorama tools - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Panorama tools

    -
    -
    From PanoTools.org Wiki
    -
    (Redirected from Panotools[*])
    - -

    What are the panorama tools

    -

    The Panorama Tools, also known as The PanoTools are a free suite of programs and libraries originally written by the german physics and mathematics professor Helmut Dersch[*]. PanoTools provides a powerful framework for re-projecting and blending multiple source images into immersive panoramics of many types. An updated version of the PanoTools library serves as the underlying core engine for many software panorama GUI front-ends[*]. -

    Helmut started development on PanoTools in 1998, producing some of the most professional and versatile software available for building panoramas and more, but had to stop development in 2001 due to legal harrassment and claims of patent infringement by a company called IPIX[*]. In 2003 he released some modifications to the java-based online panorama viewer PTViewer[*]. One involved a standalone .exe version and another version could display HDR (high dynamic range) panoramas. The most recent release from Helmut is PTViewerME, a panorama viewer for PDAs and mobile devices. The homepage of Helmut can be found here. It has no links to his older work on PanoTools, but some list members managed to make a copy of his old homepage before it shut down. Thanks to Kathy Wheeler the page could be reconstructed completely: http://www.panotools.org/dersch +

    Panorama tools

    +
    From PanoTools.org Wiki
    (Redirected from Panotools[*])
    + +

    What are the panorama tools

    +

    The Panorama Tools, also known as The PanoTools are a free suite of programs and libraries originally written by the german physics and mathematics professor Helmut Dersch[*]. PanoTools provides a powerful framework for re-projecting and blending multiple source images into immersive panoramics of many types. An updated version of the PanoTools library serves as the underlying core engine for many software panorama GUI front-ends[*]. +

    Helmut started development on PanoTools in 1998, producing some of the most professional and versatile software available for building panoramas and more, but had to stop development in 2001 due to legal harrassment and claims of patent infringement by a company called IPIX[*]. In 2003 he released some modifications to the java-based online panorama viewer PTViewer[*]. One involved a standalone .exe version and another version could display HDR (high dynamic range) panoramas. The most recent release from Helmut is PTViewerME, a panorama viewer for PDAs and mobile devices. The homepage of Helmut can be found here. It has no links to his older work on PanoTools, but some list members managed to make a copy of his old homepage before it shut down. Thanks to Kathy Wheeler the page could be reconstructed completely: http://www.panotools.org/dersch

    After Helmut stopped developing Panorama Tools, the members of his mailing-list took over development, and began enhancing the software suite on their own. They moved the project to SourceForge and have fixed some bugs and developed additional functionality since.

    - +

    What software is included in the panorama tools

    PanoTools is a collection of free tools for Panorama and 3D Object creation. It consists of:

    - - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - -
    PTEditor[*] Java interactive Panorama Editor. +
    PTEditor[*]Java interactive Panorama Editor.
    PTPicker[*] Java front end to panorama stitcher and other tools. It provides a graphical interface for feature point selection and position optimization. +PTPicker[*]Java front end to panorama stitcher and other tools. It provides a graphical interface for feature point selection and position optimization.
    PTCrypt[*] Java tool for scrambling pictures intended to be viewed online with ptviewer. +PTCrypt[*]Java tool for scrambling pictures intended to be viewed online with ptviewer.
    PTStitcher Panorama stitching tool which remaps, adjusts and combines arbitrary images to panoramic views. No source available. Similar projects are nona in hugin as well as PTmender. +PTStitcherPanorama stitching tool which remaps, adjusts and combines arbitrary images to panoramic views. No source available. Similar projects are nona in hugin as well as PTmender.
    PTmender Open source replacement for PTStitcher. +PTmenderOpen source replacement for PTStitcher.
    PTOptimizer Optimizes positions and sizes of images using control-point data. +PTOptimizerOptimizes positions and sizes of images using control-point data.
    PTStereo[*] Creates 3-dimensional objects from 2 stereoscopic or more images. +PTStereo[*]Creates 3-dimensional objects from 2 stereoscopic or more images.
    PTInterpolate[*] Physically valid true view interpolator. Given two images of the same scene taken from different positions, this tool creates views from any intermediate position. +PTInterpolate[*]Physically valid true view interpolator. Given two images of the same scene taken from different positions, this tool creates views from any intermediate position.
    PTMorpher[*] Morphing tool. +PTMorpher[*]Morphing tool.
    PTAverage[*] Averages images to reduce noise and enhance density. +PTAverage[*]Averages images to reduce noise and enhance density.
    PTStripe[*] Combines images into movie-stripes for viewing in object-viewers (PTMovie extension to PTViewer). +PTStripe[*]Combines images into movie-stripes for viewing in object-viewers (PTMovie extension to PTViewer).
    Panorama Tools Plugins[*] Photoshop[*], GraphicConverter and Gimp[*] plug-ins for image correction and remapping. Also compatible to many other programs that can use Photoshop[*] plugins. +Panorama Tools Plugins[*]Photoshop[*], GraphicConverter and Gimp[*] plug-ins for image correction and remapping. Also compatible to many other programs that can use Photoshop[*] plugins.
    pano12 library The underlying panorama library, currently used by several different panorama front-ends and command line programs. This may be called pano12.dll, libpano12.so, libpano12.dylib or pano12.lib depending on the operating system. -
    -

    To make working with the panorama tools easier and to add functionality, many excellent software helpers and GUI front-ends[*] to PanoTools, some free and some commercial, have been written, which in many cases make interacting directly with the programs in the original PanoTools toolset unnecessary. See the software[*] page to learn more. +pano12 library +The underlying panorama library, currently used by several different panorama front-ends and command line programs. This may be called pano12.dll, libpano12.so, libpano12.dylib or pano12.lib depending on the operating system. + +

    To make working with the panorama tools easier and to add functionality, many excellent software helpers and GUI front-ends[*] to PanoTools, some free and some commercial, have been written, which in many cases make interacting directly with the programs in the original PanoTools toolset unnecessary. See the software[*] page to learn more.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Panorama_tools&oldid=13478[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Panorama_tools&oldid=13478"
    +
    \ No newline at end of file Binary files /tmp/tmppls9Gk/1q_nfM6tvF/hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/panotoolsng.png and /tmp/tmppls9Gk/ofvlLKxky9/hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/panotoolsng.png differ diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html 2017-04-22 17:03:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,38 +1,34 @@ - + Parallax - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Parallax

    -
    -
    From PanoTools.org Wiki
    +

    Parallax

    +
    From PanoTools.org Wiki
    - -


    +


    -

    Contents

    +

    Contents

    Intro

    -
    [*]
    Parallax demo © Bernhard Vogl (GIF animation must be turned on)
    +
    [*]
    Parallax demo © Bernhard Vogl (GIF animation must be turned on)

    If you shoot the same scene from a slightly different point of view, the foreground will be shifted in relation to the background, as in this example image. -

    Parallax occures in panoramic photography if camera and lens are not rotated around the Entrance pupil of the lens. A difference caused by parallax will be visible in the overlap between two adjacent images. +

    Parallax occures in panoramic photography if camera and lens are not rotated around the Entrance pupil of the lens. A difference caused by parallax will be visible in the overlap between two adjacent images.

    Parallax errors are sometimes very hard to retouch, since necessary background details might be obscured by foreground details. A useful way to fix these kinds of errors is to 'invent' some background details.

    Calculation

    Parallax depends on -the object distance d\,, the displacement of the no-parallax-point r\, and -half the rotation angle between two shots, the off axis angle \alpha \,. Then the half parallax angle \beta \, will be: -\beta =atan{\frac {r*sin(\alpha )}{d-r*cos(\alpha )}} -

    Since d\, usually is far larger than r\, this could be abbreviated to \beta =atan{\frac {r*sin(\alpha )}{d}} -

    \beta \, applies in both images that overlap in opposite directions, hence the value must be doubled to get the actual parallax error. Now the maximum error in pixels for the ready stitched panorama can be calculated: For a 360° panorama (and \beta \, in degree) this is simply PixelError={\frac {2*\beta *PanoramaWidth}{360}} +the object distance , the displacement of the no-parallax-point and +half the rotation angle between two shots, the off axis angle . Then the half parallax angle will be: + +

    Since usually is far larger than this could be abbreviated to +

    applies in both images that overlap in opposite directions, hence the value must be doubled to get the actual parallax error. Now the maximum error in pixels for the ready stitched panorama can be calculated: For a 360° panorama (and in degree) this is simply

    Examples

    -

    If you shoot 4 images around, \alpha \, is 45°. Given an object 1m from the lens the maximum (relative to infinity) parallax error will be for a displacement r\, of the no-parallax-point: +

    If you shoot 4 images around, is 45°. Given an object 1m from the lens the maximum (relative to infinity) parallax error will be for a displacement of the no-parallax-point:

    - - + @@ -95,13 +313,43 @@
    r\, +
    8000px width 37px 55px -
    -

    If you shoot 6 images around, \alpha \, is 30°. Given an object 2m from the lens the maximum (relative to infinity) parallax error will be for a displacement r\, of the no-parallax-point: + +

    If you shoot 6 images around, is 30°. Given an object 2m from the lens the maximum (relative to infinity) parallax error will be for a displacement of the no-parallax-point:

    - - + @@ -134,24 +382,23 @@
    r\, +
    8000px width 13px 19px -
    +

    See also

    - +

    External Links

    Max Lyon's panoramic parallax error calculator.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Parallax&oldid=13154[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Parallax&oldid=13154"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_correction.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_correction.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_correction.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_correction.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,36 +1,32 @@ - + Perspective correction - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Perspective correction

    -
    -
    From PanoTools.org Wiki
    +

    Perspective correction

    +
    From PanoTools.org Wiki
    - -

    Contents

    +

    Contents

    • 1 Intro
    • 2 Prerequisites @@ -63,7 +59,7 @@

      Panotools are able to simulate a shift lens in terms of geometry (obviously they can't simulate it in terms of Depth of Field). There are some easy and straightforward techniques to achieve perspective correction depending on the direction the camera was tilted.

      Prerequisites

      -

      This tutorial uses PTGui[*], but any of the GUI front-ends[*] would do. The usage of these programs is more or less identical although names differ sometimes a bit and some fields are in different locations. For hugin see tutorials on Simulating an architectural projection and Perspective correction +

      This tutorial uses PTGui[*], but any of the GUI front-ends[*] would do. The usage of these programs is more or less identical although names differ sometimes a bit and some fields are in different locations. For hugin see tutorials on Simulating an architectural projection and Perspective correction

      In all cases you start a new project and add the image you want to correct by pressing the Add button.

      Go to Lens parameters tab and choose your lens type (presumable normal (rectilinear)). Enter the approximate Field of View if not already read from EXIF data (it's not necessary to have it exact). If you already have lens correction parameters enter them in the a, b and c fields else enter 0.0 for each.

      In Panorama settings tab choose Rectilinear ('flat') as output. @@ -76,11 +72,11 @@

      Camera level to the horizon

      - - + -
      [*]
      [*]
      Falling lines example © Daniela Dürbeck
      +
      [*]
      [*]
      Falling lines example © Daniela Dürbeck
      [*]
      [*]
      corrected image in Panorama Editor
      -
      +
      [*]
      [*]
      corrected image in Panorama Editor
      +

      If the camera was level to the horizon, one pair of vertical control points is enough to correct for falling lines. Go to Control points tab and set one point to the top of something vertical in your image in the left pane and one point at the bottom of the same vertical structure in the right pane. This vertical structure must not go through or near the image center. Be sure to choose Vertical line as control point type.

      On Optimizer tab check Interface: Advanced. Check Pitch and Use control points of: for Image 0. All other fields are unchecked. Then press Run Optimizer and confirm the following dialog.

      Once you're done proceed as described under Adjust output. @@ -89,14 +85,14 @@

      Camera tilted and rotated

      - - + - -
      [*]
      [*]
      Falling lines example 2 © Erik Krause
      +
      [*]
      [*]
      Falling lines example 2 © Erik Krause
      [*]
      [*]
      Image in Control Point Editor
      +
      [*]
      [*]
      Image in Control Point Editor
      [*]
      [*]
      Corrected image in Panorama Editor
      -
      +
      [*]
      [*]
      Corrected image in Panorama Editor
      +

      If the camera was rotated you need at least two vertical lines control point pairs. Go to Control points tab and set two point pairs on some vertical structures well apart from each other. For each line set a point in one pane at the bottom and in the other pane at the top of the same vertical structure. Be sure to choose Vertical line as control point type.

      If there is no second vertical structure you can use a horizontal one with a horizontal control points pair instead.

      In order to correct for perspective and image rotation you must optimize Pitch and Roll. @@ -107,11 +103,11 @@

      Camera panned sideways

      - - + -
      [*]
      [*]
      Panned camera example © Tom! Striewisch
      +
      [*]
      [*]
      Panned camera example © Tom! Striewisch
      [*]
      [*]
      corrected image
      -
      +
      [*]
      [*]
      corrected image
      +

      Using a shift lens this would have been shot with camera film or sensor parallel to the subject and the lens shifted right or left. The respective parameter to simulate this in panotools is Yaw.

      It is not often necessary to correct for a panned camera since we are used to horizontal perspective distortion. One use is to shoot a mirror without the camera beeing mirrored.

      If the camera was level to the horizon, one pair of horizontal control points is enough to correct for horizontal perspective distortion. Go to Control points tab and set one point to the left of something horizontal in your image in the left pane and one point at the rigth of the same horizontal structure in the rigth pane. This horizontal structure must not go through or near the image center. Be sure to choose Horizontal line as control point type. @@ -123,13 +119,13 @@

      If the camera was rotated during shooting you need at least two horizontal control point pairs or one horizontal and one vertical. Proceed in an analogous manner as for rotated camera if tilted upwards

      -

      Camera panned, tilted and rotated

      +

      Camera panned, tilted and rotated

      - - + -
      [*]
      [*]
      Tight spaces example © Bruno Postle
      +
      [*]
      [*]
      Tight spaces example © Bruno Postle
      [*]
      [*]
      corrected image
      -
      +
      [*]
      [*]
      corrected image
      +

      Using a shift lens (provided you get one with a short enough focal length) this would have been shot with camera level and film or sensor parallel to the subject and the lens shifted diagonally. The respective parameters to simulate this in panotools are Yaw, Pitch and Roll.

      Sometimes you have to shoot in very tight spaces but would like to show the image in a frontal view.

      In this case two vertical pairs and two horizontal pairs are needed. Go to Control points tab and set two point pairs to the left and right of something horizontal in your image. Be sure to choose Horizontal line as control point type for these two and to set the lines as distant as possible. @@ -142,26 +138,13 @@

      Summary

      Only few control point pairs are needed to correct for perspective distortion.

      -
        -
      • Camera level. To correct for -
          -
        • falling lines (vertical perspective distortion) - set one pair to a vertical structure off center. Optimize for Pitch only. -
          • -
        • horizontal perspective distortion - set one pair to a horizontal structure off center. Optimize for Yaw only. -
          • -
        -
        • -
      • Camera rotated. To correct for -
          -
        • falling lines (vertical perspective distortion) - set at least one pair of vertical points to a vertical structure plus either one vertical pair apart from the other vertical one or a horizontal pair on a horizontal structure. Optimize for Pitch and Roll only. -
          • -
        • horizontal perspective distortion - set at least one pair of horizontal points to a horizontal structure plus either one horizontal pair apart from the other horizontal one or a vertical pair on a vertical structure. Optimize for Yaw and Roll only. -
          • -
        -
        • -
      • Camera tilted, panned and rotated - set two pairs to two different vertical structures apart from each other and two pairs to different horizontal structures apart from each other. Optimize for Yaw, Pitch, Roll and eventually Field of View. -
        • -
      +
      • Camera level. To correct for +
        • falling lines (vertical perspective distortion) - set one pair to a vertical structure off center. Optimize for Pitch only.
          • +
        • horizontal perspective distortion - set one pair to a horizontal structure off center. Optimize for Yaw only.
        • +
      • Camera rotated. To correct for +
        • falling lines (vertical perspective distortion) - set at least one pair of vertical points to a vertical structure plus either one vertical pair apart from the other vertical one or a horizontal pair on a horizontal structure. Optimize for Pitch and Roll only.
          • +
        • horizontal perspective distortion - set at least one pair of horizontal points to a horizontal structure plus either one horizontal pair apart from the other horizontal one or a vertical pair on a vertical structure. Optimize for Yaw and Roll only.
        • +
      • Camera tilted, panned and rotated - set two pairs to two different vertical structures apart from each other and two pairs to different horizontal structures apart from each other. Optimize for Yaw, Pitch, Roll and eventually Field of View.

      Adjust output

      In any case you should get an average control point distance of almost 0.0. And in any case the image will be shifted in some direction, hence the output image will be larger. The width and height of the output image can be adjusted, but it is not possible to crop either side individually in PTGui.

      Open Panorama Editor (Ctrl+E) and press the Fit panorama (Ctrl+F or menu: Edit -> Fit panorama) button. This will automatically adjust the output area to fit the corrected image. @@ -174,26 +157,33 @@

      unfortunately this feature has been removed in recent PTGui versions!

      If you want to batch process some equally sized images with the same correction values (only possible if you shot them all from a tripod without moving the camera) you can simply add them to the project on Source Images tab. -

      To correct them all for same Pitch and Roll (falling lines) you simply check the Link box on Optimizer tab for either parameter. -

      If you want to correct them all for Yaw too select the Yaw field on Image parameters tab and press Ctrl+C twice. Then hold down the shift key and press the down arrow until all Yaw field are selected. Press Ctrl+V twice to paste the value to all Yaw fields (same works for Pitch and Roll fields, too) -

      On Create Panorama tab page select Multi image TIFF for output. You get the images saved with the base name and a four digit number appended. +

      To correct them all for same Pitch and Roll (falling lines) you simply check the Link box on Optimizer tab for either parameter. +

      If you want to correct them all for Yaw too select the Yaw field on Image parameters tab and press Ctrl+C twice. Then hold down the shift key and press the down arrow until all Yaw field are selected. Press Ctrl+V twice to paste the value to all Yaw fields (same works for Pitch and Roll fields, too) +

      On Create Panorama tab page select Multi image TIFF for output. You get the images saved with the base name and a four digit number appended. -

      --Erik Krause[*] 18:38, 23 Jul 2005 (EDT) +

      --Erik Krause[*] 18:38, 23 Jul 2005 (EDT)

      - -
      This article is out of date. You can help Panotools Wiki by expanding it. -
      + +This article is out of date. You can help Panotools Wiki by expanding it. +

      Once the article is ok feel free to remove the {{Outdated}} template -

      +

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Perspective_correction&oldid=13987[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Perspective_correction&oldid=13987"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_distortion.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_distortion.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_distortion.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Perspective_distortion.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,41 +1,42 @@ - + Perspective distortion - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Perspective distortion

    -
    -
    From PanoTools.org Wiki
    +

    Perspective distortion

    +
    From PanoTools.org Wiki
    - -

    Image distortion caused by the fact that a 3-dimensional world is mapped to a 2-dimensional image +

    Image distortion caused by the fact that a 3-dimensional world is mapped to a 2-dimensional image For details see Perspective correction

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Perspective_distortion&oldid=9764[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Perspective_distortion&oldid=9764"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pfstmo.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pfstmo.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pfstmo.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pfstmo.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,47 +1,45 @@ - + Pfstmo - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pfstmo

    -
    -
    From PanoTools.org Wiki
    +

    Pfstmo

    +
    From PanoTools.org Wiki
    - -

    PFStmo is +

    PFStmo is a set of programs implementing different tone mapping operators.

    External links

    - - - + -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pfstmo&oldid=11952[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pfstmo&oldid=11952"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pincushion_distortion.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pincushion_distortion.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pincushion_distortion.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pincushion_distortion.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,43 +1,44 @@ - + Pincushion distortion - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pincushion distortion

    -
    -
    From PanoTools.org Wiki
    +

    Pincushion distortion

    +
    From PanoTools.org Wiki
    - -

    A lens distortion which causes straight lines outside the image center to be bent inwards (like a pincushion). Pincushion distortion is the opposite of barrel distortion. +

    A lens distortion which causes straight lines outside the image center to be bent inwards (like a pincushion). Pincushion distortion is the opposite of barrel distortion.

    It is a common Lens distortion that can be corrected by the lens correction model of panotools.

    -
    [*]
    A photograph showing exaggerated pincushion distortion
    - - +
    [*]
    A photograph showing exaggerated pincushion distortion
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pincushion_distortion&oldid=9455[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pincushion_distortion&oldid=9455"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pitch.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,42 +1,43 @@ - + Pitch - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pitch

    -
    -
    From PanoTools.org Wiki
    +

    Pitch

    +
    From PanoTools.org Wiki
    - -

    Angle up-and-down (above and below horizon). See also Roll and Yaw. +

    Angle up-and-down (above and below horizon). See also Roll and Yaw. Pitch is the angular deviation from the level (horizontal) shooting direction and part of the panotools Image positioning model, i.e., a rotation around the TrX axis.

    If you shoot a multi-row panorama you will have to tilt the camera up or down. The angle that the optical axis of the camera is tilted up (positive value) or down (negative value) is the pitch of the image. For example, the pitch of a zenith image (shot straight upwards) is 90°.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pitch&oldid=15650[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pitch&oldid=15650"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PNG.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PNG.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PNG.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PNG.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,44 +1,45 @@ - + PNG - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PNG

    -
    -
    From PanoTools.org Wiki
    +

    PNG

    +
    From PanoTools.org Wiki
    - -

    The -Portable Network Graphics Image format[*] +

    The +Portable Network Graphics Image format[*] is a common and free format used to store and exchange digital bitmapped images of all kinds. For general information see the PNG Wikipedia page[*] -

    PNG was originally created because of shortcomings and patent issues with widely used GIF format. It uses lossless compression and supports different bit depth and alpha channel transparency. It often compresses better than the different TIFF compressions. However, it is not very well supported by Photoshop[*] (you need a format plugin to support all flavors: [1]) +

    PNG was originally created because of shortcomings and patent issues with widely used GIF format. It uses lossless compression and supports different bit depth and alpha channel transparency. It often compresses better than the different TIFF compressions. However, it is not very well supported by Photoshop[*] (you need a format plugin to support all flavors: [1])

    Only recently PNG support of the Panorama tools core library pano12 was fixed.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=PNG&oldid=9544[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PNG&oldid=9544"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Portrait.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Portrait.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Portrait.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Portrait.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,41 +1,42 @@ - + Portrait - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Portrait

    -
    -
    From PanoTools.org Wiki
    +

    Portrait

    +
    From PanoTools.org Wiki
    - -

    Image orientation with the longer side in vertical direction like usually used for portrait photography (hence the name). +

    Image orientation with the longer side in vertical direction like usually used for portrait photography (hence the name).

    Most image sensors and many film types have a longer and a shorter side. Shooting portrait gives a wider vertical and a narrower horizontal Field of View in each single shot. For a cylindrical panorama you need more shots for a given field of view if you shoot portrait but you get a higher resolution.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Portrait&oldid=9462[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Portrait&oldid=9462"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PPI.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PPI.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PPI.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PPI.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,39 +1,35 @@ - + DPI - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    DPI

    -
    -
    From PanoTools.org Wiki
    -
    (Redirected from PPI[*])
    - -


    +

    DPI

    +
    From PanoTools.org Wiki
    (Redirected from PPI[*])
    + +


    -

    Contents

    +

    Contents

    -

    Does DPI/PPI Matter for Panoramas?

    +

    Does DPI/PPI Matter for Panoramas?

    Short answer

    No!

    @@ -65,12 +61,17 @@

    For the purposes of posting images online, or displaying in other digital mediums (DVD, CD-ROM, PDAs, etc), the ppi value is not even considered. All that matters for digital display is the absolute number of pixels. For people targeting these environments, do not worry about your image's PPI.

    For people targeting printed output, you'll need to adjust the PPI, and possibly the pixel dimensions (by "scaling") of your image using an image editor such as Photoshop in order to match both the PPI and physical dimensions of your output.

    -

    So, in a nutshell

    +

    So, in a nutshell

    The change in PPI during stitching does nothing to impact your image quality. If you're producing for print, you may have to re-set the PPI after stitching.

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=DPI&oldid=9388[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=DPI&oldid=9388"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Projections.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Projections.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Projections.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Projections.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,43 +1,39 @@ - + Projections - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Projections

    -
    -
    From PanoTools.org Wiki
    +

    Projections

    +
    From PanoTools.org Wiki
    - -


    +


    Representing a spherical view of the world on a flat computer monitor or print requires some manner of mapping from the 3D spherical scene in which the camera and viewer are embedded to the 2D medium on which they are rendered. The techniques used for mapping are of exactly the same type long used by map makers to project the entire globe, or portions of it, onto two dimensional maps. There is no single, unique projection for representing sections of the sphere on the globe. Instead, all projections have various attributes and limitations. There are many classes of projections used for various purposes (e.g. Mathworld's Projection Page), but only a few are traditionally used for panoramic imaging.


    First - a word of warning: If you are looking for a single projection, that will map a spherical (even partial) panorama on a flat surface without bending lines: This won't work!

    This link explains well why it is impossible: http://www.progonos.com/furuti/MapProj/Normal/CartDef/MapDef/mapDef.html

    Some of the most common projections when working with Panoramic imaging are:

    -

    Contents

    +

    Contents

    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Projections&oldid=15630[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Projections&oldid=15630"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PSD.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PSD.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PSD.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PSD.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,44 +1,45 @@ - + PSD - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PSD

    -
    -
    From PanoTools.org Wiki
    +

    PSD

    +
    From PanoTools.org Wiki
    - -

    The Photoshop Document Format is -a proprietary image format[*] by Adobe Inc used by Photoshop[*] and some other Adobe products. It stores any image content that Photoshop can handle. +

    The Photoshop Document Format is +a proprietary image format[*] by Adobe Inc used by Photoshop[*] and some other Adobe products. It stores any image content that Photoshop can handle.

    PSD is limited to 30,000 pixels either side. Since Photoshop version 8 (CS) a new format is available, that can store up to 300,000 pixel each side, the Photoshop large document format called PSB.

    Panotools can write 8 bit per channel PSD files with layers (sometimes called 24 bit files) or background layer only PSD files with 16 bit per channel (sometimes called 48 bit files).

    Some image viewers claim to be able to read PSD files. However, in each PSD file there is stored a flattened version of the contained multi layer image, which is displayed in this case.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=PSD&oldid=13737[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PSD&oldid=13737"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTblender.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTblender.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTblender.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTblender.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,40 +1,36 @@ - + PTblender - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PTblender

    -
    -
    From PanoTools.org Wiki
    +

    PTblender

    +
    From PanoTools.org Wiki
    - -

    PTblender is +

    PTblender is a command-line tool that implements just the colour and brightness correction functionality of PTmender (a replacement for PTStitcher). It was written by Daniel M German and is fully Open Source. A multi-platform version is now included with the pano12 library available at Sourceforge. -

    The algorithm is identical to that in PTStitcher, described in Helmut Dersch[*]'s article on Adjusting Colour And Brightness in Panoramas. +

    The algorithm is identical to that in PTStitcher, described in Helmut Dersch[*]'s article on Adjusting Colour And Brightness in Panoramas.

    Usage is like so: 

     PTblender [options] <tiffFiles>+
@@ -46,8 +42,13 @@
 assembly in a paint program.
 
    
 
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=PTblender&oldid=13477[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PTblender&oldid=13477"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTmender.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTmender.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTmender.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTmender.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,76 +1,60 @@ - + PTmender - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PTmender

    -
    -
    From PanoTools.org Wiki
    +

    PTmender

    +
    From PanoTools.org Wiki
    - -

    PTmender is -a replacement for Helmut Dersch[*]'s PTStitcher. It is fully Open Source and it was written by Daniel M German. A multi-platform version is now included +

    PTmender is +a replacement for Helmut Dersch[*]'s PTStitcher. It is fully Open Source and it was written by Daniel M German. A multi-platform version is now included with the pano12 and pano13 libraries available at Sourceforge.

    Most useful functionality of PTStitcher has already been implemented, particularly:

    -
      -
    • Compatibility with existing command line and script usage -
      • -
    • Colour and brightness correction -
      • -
    • Multiple TIFF output -
      • -
    • PSD output with layer masks -
      • -
    • Flattened TIFF, JPEG and PNG output -
      • -
    +
    • Compatibility with existing command line and script usage
      • +
    • Colour and brightness correction
      • +
    • Multiple TIFF output
      • +
    • PSD output with layer masks
      • +
    • Flattened TIFF, JPEG and PNG output

    There is also new useful functionality not available in PTStitcher:

    -
      -
    • cropped TIFF output -
      • -
    • LZW compression of TIFF output -
      • -
    • All the new projections supported by Hugin such as multiplane and Pannini -
      • -
    +
    • cropped TIFF output
      • +
    • LZW compression of TIFF output
      • +
    • All the new projections supported by Hugin such as multiplane and Pannini

    Functionality that hasn't been implemented:

    -
      -
    • Support for VRML, PICT, QTVR, IVR -
      • -
    • Support for other-than-rectilinear lenses such as fisheyes -
      • -
    • Probably lots of other stuff -
      • -
    - - +
    • Support for VRML, PICT, QTVR, IVR
      • +
    • Support for other-than-rectilinear lenses such as fisheyes
      • +
    • Probably lots of other stuff
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=PTmender&oldid=12181[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PTmender&oldid=12181"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_gen.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,39 +1,35 @@ - + Pto gen - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto gen

    -
    -
    From PanoTools.org Wiki
    +

    Pto gen

    +
    From PanoTools.org Wiki
    - -

    pto_gen assembles a Hugin .pto project file that is suitable as input for +

    pto_gen assembles a Hugin .pto project file that is suitable as input for further tools such as the cpfind control-point generator, or for opening with the Hugin panorama GUI itself. Functionality is similar to -match-n-shift[*]. +match-n-shift[*].

    The general use is 

       pto_gen *.jpg
@@ -42,48 +38,25 @@
 The project file is named first_file-last_file.pto using the same convention as the Hugin GUI.
 
    
 
    Options
    
-
      
-
    •  -o | --output output.pto Output a pto file with the given filename (instead of the default).
-
      • 
-
    
-
      
-
    •  -p | --projection number Sets the projection type for all images (0 - rectilinear, 2 - equirectangular, 3 - full-frame fisheye, ...).
-
      • 
-
    
-
      
-
    •  -f | --fov number Sets the horizontal field of view for all images. Useful if your lens does not store the focal length and/or crop factor correctly in the EXIF data.
-
      • 
-
    
-
      
-
    •  -c | --crop left,right,top,bottom Sets the input images crop to the given values.
-
      • 
-
    
-
      
-
    •  -s | --stacklength number Sets the number of images in each stack (default: automatic detection of stacks).
-
      • 
-
    
-
      
-
    •  -l | --linkstacks When given links the image positions in stacks.
-
      • 
-
    
-
      
-
    •  --distortion Tries to load distortion data for the images from the lens database.
-
      • 
-
    
-
      
-
    •  --vignetting Tries to load vignetting data for the images from the lens database.
-
      • 
-
    
-
      
-
    •  -h | --help Display help.
-
      • 
-
    
+
    • -o | --output output.pto Output a pto file with the given filename (instead of the default).
    
+
    • -p | --projection number Sets the projection type for all images (0 - rectilinear, 2 - equirectangular, 3 - full-frame fisheye, ...).
    
+
    • -f | --fov number Sets the horizontal field of view for all images. Useful if your lens does not store the focal length and/or crop factor correctly in the EXIF data.
    
+
    • -c | --crop left,right,top,bottom Sets the input images crop to the given values.
    
+
    • -s | --stacklength number Sets the number of images in each stack (default: automatic detection of stacks).
    
+
    • -l | --linkstacks When given links the image positions in stacks.
    
+
    • --distortion Tries to load distortion data for the images from the lens database.
    
+
    • --vignetting Tries to load vignetting data for the images from the lens database.
    
+
    • -h | --help Display help.
    
 
    Related links
    
 
    Panorama scripting in a nutshell - pto_gen is useful in stitching panoramas from the command-line
 
    
 
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_gen&oldid=15625[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_gen&oldid=15625"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_lensstack.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_lensstack.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_lensstack.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_lensstack.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,41 +1,37 @@ - + Pto lensstack - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto lensstack

    -
    -
    From PanoTools.org Wiki
    +

    Pto lensstack

    +
    From PanoTools.org Wiki
    - -

    Pto_lensstack can manipulate lenses and stacks in Hugin .pto project files. The intended use for Pto_lensstack is in Scripting. +

    Pto_lensstack can manipulate lenses and stacks in Hugin .pto project files. The intended use for Pto_lensstack is in Scripting.

    The general use is 

       pto_lensstack --output=output.pto --new-lens|--new-stack|--change-lens|--change-stack images input.pto
    -

    Assigning new lenses/stacks

    +

    Assigning new lenses/stacks

    You can assign a new lens or stack to an image or a set of images by providing a list of image numbers as parameters to the program. The counting starts with zero. Several images can be given at the same time. Separate them with a comma. So

    @@ -44,7 +40,7 @@

    will assign a new lens to image 1 and 3 and a new stack to images 2 and 4.

    -

    Changing lenses/stacks

    +

    Changing lenses/stacks

    For changing the lens or the stack provide a list of image numbers and the new lens/stack number. For both the counting starts with zero and you can supply several images separated by a comma at the same time.

    Examples:

    @@ -52,16 +48,16 @@ pto_lensstack --change-stack i2=0,i4=0 input.pto

    General options

    -
      -
    • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_lens" to the input filename. -
      • -
    • -h | --help Display help. -
      • -
    - - +
    • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_lens" to the input filename.
      • +
    • -h | --help Display help.
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_lensstack&oldid=14997[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_lensstack&oldid=14997"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_mask.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_mask.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_mask.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_mask.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,36 +1,32 @@ - + Pto mask - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto mask

    -
    -
    From PanoTools.org Wiki
    +

    Pto mask

    +
    From PanoTools.org Wiki
    - -

    Pto_mask can add mask to Hugin .pto project files. +

    Pto_mask can add mask to Hugin .pto project files.

    The general use is: 

       pto_mask [switches] --mask=mask.msk@imgNr input.pto
@@ -38,28 +34,21 @@
 
    --mask=mask.msk@imgNr Load the mask from the file named mask.msk and apply it to the image with the number imgNr. The mask file can be generated from the mask tab - Save mask. This switch can be specified several times to add several mask at once.
 
    
 
    Switches
    
-
      
-
    •  -o|--output output.pto Output a pto file with the given filename. If not given it will append "_mask" to the input filename.
-
      • 
-
    •  --rotate=CLOCKWISE|90|COUNTERCLOCKWISE|-90 Rotates the mask 90° clockwise or counter-clockwise before apply the mask to the image.
-
      • 
-
    •  --process=CLIP|SCALE|PROP_SCALE Processing options, if the mask size does not correspond to the image size
-
        
-
      •  CLIP Does clip the mask at the image borders.
-
        • 
-
      •  SCALE Scale the mask independently at x and y scale to fit inside the image. 
-
        • 
-
      •  PROP_SCALE Scale the mask proportional to fit inside the image.
-
        • 
-
      
-
      • 
-
    •  -h | --help Display help.
-
      • 
-
    
-
-
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_mask&oldid=15427[*]"
    -
    \ No newline at end of file +
    • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_mask" to the input filename.
      • +
    • --rotate=CLOCKWISE|90|COUNTERCLOCKWISE|-90 Rotates the mask 90° clockwise or counter-clockwise before apply the mask to the image.
      • +
    • --process=CLIP|SCALE|PROP_SCALE Processing options, if the mask size does not correspond to the image size +
      • CLIP Does clip the mask at the image borders.
        • +
      • SCALE Scale the mask independently at x and y scale to fit inside the image.
        • +
      • PROP_SCALE Scale the mask proportional to fit inside the image.
      • +
    • -h | --help Display help.
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_mask&oldid=15427"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_merge.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,36 +1,32 @@ - + Pto merge - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto merge

    -
    -
    From PanoTools.org Wiki
    +

    Pto merge

    +
    From PanoTools.org Wiki
    - -

    pto_merge can merge several project files to one project file, so that the final project contains every image only once. The same function can be accessed in Hugin by File>Merge project (see Main menu) +

    pto_merge can merge several project files to one project file, so that the final project contains every image only once. The same function can be accessed in Hugin by File>Merge project (see Main menu)

    Invoke it by 

      pto_merge -o merged.pto project1.pto project2.pto project3.pto
@@ -43,15 +39,17 @@
 
    will create a merged project file project1_merge.pto.
 
    Hint:
 
    
-
      
-
    •  pto_merge does not check for duplicate control points. It adds all control points found in the given input files.
-
      • 
-
    
+
    • pto_merge does not check for duplicate control points. It adds all control points found in the given input files.
    
 

    
 
    
 
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_merge&oldid=12817[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_merge&oldid=12817"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_move.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_move.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_move.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_move.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,71 +1,56 @@ - + Pto move - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto move

    -
    -
    From PanoTools.org Wiki
    +

    Pto move

    +
    From PanoTools.org Wiki
    - -

    Pto_move moves or copy Hugin .pto project files with all associated images. +

    Pto_move moves or copy Hugin .pto project files with all associated images.

    -
      -
    • Move a single project file -
      • -
    +
    • Move a single project file
       pto_move /path_source/source.pto /path_dest/destination.pto
    -
      -
    • Move several project files (also with wildcards) to same destination folder -
      • -
    +
    • Move several project files (also with wildcards) to same destination folder
       pto_move /path_source/project1.pto /path_source/project2.pto /path_dest/
    pto_move /path_source/project?.pto /path_dest/
    -
      -
    • Move all project files from the source folder to the destination folder -
      • -
    +
    • Move all project files from the source folder to the destination folder
       pto_move /path_source/ /path_dest/

    Switches

    -
      -
    • --copy Copies the project files instead of moving. -
      • -
    • --recursive Goes recursive through all sub folder. The folder structure relative to the source folder is maintained and recreated in the destination folder (only for folder with project files, folder without project files are ignored). Works only when specifying a source folder (and not project files). -
      • -
    • --overwrite Overwrites all existing files without confirmation. -
      • -
    • --help Display the help. -
      • -
    - - +
    • --copy Copies the project files instead of moving.
      • +
    • --recursive Goes recursive through all sub folder. The folder structure relative to the source folder is maintained and recreated in the destination folder (only for folder with project files, folder without project files are ignored). Works only when specifying a source folder (and not project files).
      • +
    • --overwrite Overwrites all existing files without confirmation.
      • +
    • --help Display the help.
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_move&oldid=15589[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_move&oldid=15589"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,39 +1,35 @@ - + PTOptimizer - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PTOptimizer

    -
    -
    From PanoTools.org Wiki
    +

    PTOptimizer

    +
    From PanoTools.org Wiki
    - -

    PTOptimizer was originally created by Helmut Dersch[*] as part of Panorama Tools[*], it is a simple wrapper program around control point optimization routines present in the pano12 library. +

    PTOptimizer was originally created by Helmut Dersch[*] as part of Panorama Tools[*], it is a simple wrapper program around control point optimization routines present in the pano12 library.

    Source code for the original PTOptimizer was never released, however reconstruction was quite straightforward and a multi-platform version is now included with the pano12 library available at Sourceforge.

    -

    Contents

    +

    Contents

    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=PTOptimizer&oldid=13475[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PTOptimizer&oldid=13475"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_template.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_template.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_template.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_template.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,52 +1,47 @@ - + Pto template - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto template

    -
    -
    From PanoTools.org Wiki
    +

    Pto template

    +
    From PanoTools.org Wiki
    - -

    Pto_template can apply a template to a Hugin .pto project files. +

    Pto_template can apply a template to a Hugin .pto project files.

    The general use is: 

       pto_template [--output=output.pto] --template=template.pto input.pto
    -
      -
    • --template=template.pto Specify the template file. This switch is required. -
      • -
    • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_template" to the input filename. -
      • -
    • -h | --help Display help. -
      • -
    - - +
    • --template=template.pto Specify the template file. This switch is required.
      • +
    • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_template" to the input filename.
      • +
    • -h | --help Display help.
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_template&oldid=15428[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_template&oldid=15428"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_var.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_var.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_var.html 2017-04-22 17:03:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Pto_var.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,36 +1,32 @@ - + Pto var - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Pto var

    -
    -
    From PanoTools.org Wiki
    +

    Pto var

    +
    From PanoTools.org Wiki
    - -

    Pto_var can manipulate image variables in Hugin .pto project files. The intended use of Pto_var is in Scripting. Pto_var can set image variables to a given value, it can change the link status and it can mark variables for optimisation. +

    Pto_var can manipulate image variables in Hugin .pto project files. The intended use of Pto_var is in Scripting. Pto_var can set image variables to a given value, it can change the link status and it can mark variables for optimisation.

    The general use is: 

       pto_var [switches] --output=output.pto --opt|--link|--unlink|--set|--set-from-file images input.pto
@@ -48,87 +44,50 @@

    The following image variables are allowed:

    -
      -
    • position: y, p, r, TrX, TrY, TrZ, Tpy, Tpp -
      • -
    • lens parameters: v, a, b, c, d, e, g, t -
      • -
    • photometric parameters: Eev, Er, Eb, Vb, Vc, Vd, Vx, Vy, Ra, Rb, Rc, Rd, Re (Vignetting and response parameter will treated as group.) -
      • -
    +
    • position: y, p, r, TrX, TrY, TrZ, Tpy, Tpp
      • +
    • lens parameters: v, a, b, c, d, e, g, t
      • +
    • photometric parameters: Eev, Er, Eb, Vb, Vc, Vd, Vx, Vy, Ra, Rb, Rc, Rd, Re (Vignetting and response parameter will treated as group.)

    The image numbers start with zero. If no number is given, the variables will be applied to all images. (In this case a special treatment applies to the position of the anchor image.)

    An exclamation mark before the variable will remove the variable from the list of variables to optimised.

    Examples:

    -
      -
    • --opt=y,p,r will optimize position for all images. -
      • -
    • --opt=v,!v0 will optimize field of view for all images except the first. -
      • -
    • --opt=Vb1,Ra1 will optimize vignetting and response curve for the second image. -
      • -
    • --modify-opt --opt=!v will not optimize field of view. -
      • -
    +
    • --opt=y,p,r will optimize position for all images.
      • +
    • --opt=v,!v0 will optimize field of view for all images except the first.
      • +
    • --opt=Vb1,Ra1 will optimize vignetting and response curve for the second image.
      • +
    • --modify-opt --opt=!v will not optimize field of view.

    Link or unlink image variables

    To modify the link status of an image variable use --link or -unlink. Supply a list of comma separated image variables with corresponding image number.

    Examples:

    -
      -
    • --link=v3 will link field of view of image 3. -
      • -
    • --link=a1,b1,c1 will link lens distortion for second image. -
      • -
    • --unlink=v0 will unlink field of view for the first image. -
      • -
    • --unlink=Vb3,Ra3 will unlink vignetting and response curve for image 3. -
      • -
    +
    • --link=v3 will link field of view of image 3.
      • +
    • --link=a1,b1,c1 will link lens distortion for second image.
      • +
    • --unlink=v0 will unlink field of view for the first image.
      • +
    • --unlink=Vb3,Ra3 will unlink vignetting and response curve for image 3.

    Set image variables

    With this switch you can set the image variable to the given value. This applies to all the image variables of that sort or only to a single image, when the image number is given.

    Examples:

    -
      -
    • --set=y=0,p=0,r=0 will reset all image positions. -
      • -
    • --set=a1=0,b1=-0.05,c1=0 will set the lens distortion parameters for the second image. -
      • -
    +
    • --set=y=0,p=0,r=0 will reset all image positions.
      • +
    • --set=a1=0,b1=-0.05,c1=0 will set the lens distortion parameters for the second image.

    You can also give a mathematical expression. Supported are:

    -
      -
    • the operators +-*/% and ^ (addition, subtraction, multiplication, division, modulo and exponentiation), -
      • -
    • parentheses, -
      • -
    • the functions abs, sin, cos, tan, asin, acos, atan, exp, ceil, floor and sqrt (trigonometric functions use the angle in radians), -
      • -
    • the constant pi and the functions deg and rad to convert to degrees or radians, -
      • -
    • the constant i holds the image number, -
      • -
    • the constant val contains the old value, -
      • -
    • a if statement: x?y:z. For the comparison statement you can use <, >, <=, >=, == (equal) and != (not equal) -
      • -
    -

    The expression should return one return value. It may be necessary to quote the string to correctly get the special characters read. +

    • the operators +-*/% and ^ (addition, subtraction, multiplication, division, modulo and exponentiation),
      • +
    • parentheses,
      • +
    • the functions abs, sin, cos, tan, asin, acos, atan, exp, ceil, floor and sqrt (trigonometric functions use the angle in radians),
      • +
    • the constant pi and the functions deg and rad to convert to degrees or radians,
      • +
    • the constant i holds the image number,
      • +
    • the constant val contains the old value,
      • +
    • a if statement: x?y:z. For the comparison statement you can use <, >, <=, >=, == (equal) and != (not equal)
      • +
    • since 2018.2: access to all image variables with the panotools syntax: e.g. y1 is the yaw value of the second image (These constants contains the values of the panorama when the parser is started. They don't change when you modify them in between.)
    +

    The expression should return exactly one value. It may be necessary to quote the string to correctly get the special characters read.

    See some examples:

    -
      -
    • --set=y1=val+10 will increase yaw of the second image by 10 degrees. -
      • -
    • --set=r2=val-90 will decrease the roll angle of third image by 90 degrees. -
      • -
    • --set=v=1.1*val will increase field of view for all images by 10 %. -
      • -
    • --set=Er=val/1.1,Eb=val/1.2 will divide the red multiplier by 1.1, and the blue multiplier by 1.2 respective for all images. -
      • -
    • --set=y=i*90,p=-1^i*20,r=0 a more complicated example for a fisheye panorama, sets yaw, pitch and roll -
      • -
    • --set="r=i<4?val+45:val" rotate the first 3 images by 45 degree individual (note: quoting for Windows) -
      • -
    +
    • --set=y1=val+10 will increase yaw of the second image by 10 degrees.
      • +
    • --set=r2=val-90 will decrease the roll angle of third image by 90 degrees.
      • +
    • --set=v=1.1*val will increase field of view for all images by 10 %.
      • +
    • --set=Er=val/1.1,Eb=val/1.2 will divide the red multiplier by 1.1, and the blue multiplier by 1.2 respective for all images.
      • +
    • --set=y=i*90,p=-1^i*20,r=0 a more complicated example for a fisheye panorama, sets yaw, pitch and roll
      • +
    • --set="r=i<4?val+45:val" rotate the first 3 images by 45 degree individual (note: quoting for Windows)

    You can also read the string from a text file. Use 

      pto_var --set-from-file filename --output=output.pto project.pto
@@ -136,16 +95,16 @@
 
    In the text file the individual variables can be separated by comma or a line break.
 
    
 
    General options
    
-
      
-
    •  -o|--output output.pto Output a pto file with the given filename. If not given it will append "_var" to the input filename.
-
      • 
-
    •  -h | --help Display help.
-
      • 
-
    
-
-
+
    • -o|--output output.pto Output a pto file with the given filename. If not given it will append "_var" to the input filename.
      • 
+
    • -h | --help Display help.
    
 
 
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Pto_var&oldid=15850[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Pto_var&oldid=16020"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTStitcher.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTStitcher.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTStitcher.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTStitcher.html 2019-01-10 15:34:51.000000000 +0000 @@ -1,38 +1,34 @@ - + PTStitcher - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PTStitcher

    -
    -
    From PanoTools.org Wiki
    +

    PTStitcher

    +
    From PanoTools.org Wiki
    - -


    +


    -

    Contents

    +

    Contents

    Preface

    -

    PTStitcher is one of the core applications of Panorama tools, together with PTOptimizer and the Panorama Tools Plugins[*]. -

    For stitching panoramas you most probably won't get in contact with PTStitcher frequently, since the scripting is more or less completely done by the various GUI front-ends[*] and some tools like PanoCube[*]. +

    PTStitcher is one of the core applications of Panorama tools, together with PTOptimizer and the Panorama Tools Plugins[*]. +

    For stitching panoramas you most probably won't get in contact with PTStitcher frequently, since the scripting is more or less completely done by the various GUI front-ends[*] and some tools like PanoCube[*].

    However, there are several occasions where you might need to write or at least understand the scripts or call PTStitcher directly (for some batch tasks f.e.).

    Updates

    The PTStitcher source code was never published, hence there are no changes possible to certain functions. But since a considerable part of its functionality is in pano12 library, PTStitcher benefits from every update of this core library. -

    You can take PTStitcher from any of the panotools distribution on one of the Mirrors[*]. In order to use new functionality you need a recent copy of pano12 library. Note that only win32, i386 Linux and mac classic binary versions were ever made available, so you are out of luck if you use OS X or a 64bit operating system. +

    You can take PTStitcher from any of the panotools distribution on one of the Mirrors[*]. In order to use new functionality you need a recent copy of pano12 library. Note that only win32, i386 Linux and mac classic binary versions were ever made available, so you are out of luck if you use OS X or a 64bit operating system.

    There is an open source replacement for PTStitcher called nona in the hugin project which has much (but not all) of the PTStitcher features. Another open source replacement is PTmender, part of the pano12 project at sourceforge.

    Intro

    @@ -78,48 +74,28 @@

    Accessible by GUI

    PTStitcher can stitch

    - +

    The capabilities of PTStitcher go far beyond panorama stitching: It can be used

    -
      -
    • to remap images between different Projections -
      • -
    • to extract and insert rectilinear images[*] from a spherical or cylindrical panorama. -
      • -
    • to remap a spherical panorama[*] such that Nadir and Zenith are editable. -
      • -
    • to down- or upsample images[*] with high quality interpolators. -
      • -
    • to correct perspective distortion. -
      • -
    +
    • to remap images between different Projections
      • +
    • to extract and insert rectilinear images[*] from a spherical or cylindrical panorama.
      • +
    • to remap a spherical panorama[*] such that Nadir and Zenith are editable.
      • +
    • to down- or upsample images[*] with high quality interpolators.
      • +
    • to correct perspective distortion.

    Accessible by Script or other Tool

    PTStitcher can be used stand alone or with some other (non-GUI) Tool:

    -
      -
    • together with some tool that separate color channels (ImageMagick[*]) to correct Chromatic aberration -
      • -
    • assembling 6 cube faces to an equirectangular panorama can be done by GUI but is more conveniently done by script, batch file or PanoCube Plus[*]. -
      • -
    +
    • together with some tool that separate color channels (ImageMagick[*]) to correct Chromatic aberration
      • +
    • assembling 6 cube faces to an equirectangular panorama can be done by GUI but is more conveniently done by script, batch file or PanoCube Plus[*].

    Example Script

    The updated original example script with lots of comments is below. Copied from Jim Watters' page

    -
    -#############           Example Script                  ##########################
+
    #############           Example Script                  ##########################
 #                       to run PTStitcher
 #
 #
@@ -136,8 +112,7 @@
 # the 'C'-line is optional and allows morphing of control points.
 
    
 
    p-line options
    
-
    -# 'p'-line options
+
    # 'p'-line options
 # w1000        width in pixels
 # h600         height in pixels (default: width/2)
 # f0           projection format,
@@ -192,16 +167,14 @@
 p w800 nPSD_mask
 
    
 
    i-line options
    
-
    -# The 'i' lines describe input images and is optional
+
    # The 'i' lines describe input images and is optional
 # nName        file name of the input image.
 #                  over ridable with command line parameters to PTStitcher
 
 i n"photo1.jpg"
 
    
 
    o-line options
    
-
    -# The 'o' lines describe input images. One line per image is required
+
    # The 'o' lines describe input images. One line per image is required
 # The width and height of the image is obtained from image
 # f0           projection format,
 #                  0 - rectilinear (normal lenses)
@@ -258,8 +231,7 @@
 o f2 r0   p0    y180   v183    a0 b-0.1 c0  S100,600,100,800
 
    
 
    m-line options
    
-
    -# 'm'-line options
+
    # 'm'-line options
 # ----------------
 # Set mode for stitcher, not required
 #
@@ -299,8 +271,7 @@
 m g1.5 i6 f0
 
    
 
    z-line options
    
-
    -# 'z'-lines options
+
    # 'z'-lines options
 # ----------------
 # Extended Depth-Of-Field, not required
 #
@@ -325,8 +296,7 @@
 z m2 f4 s4
 
    
 
    C-line options
    
-
    -# 'C' lines
+
    # 'C' lines
 # ----------------
 # Morphing of control point lines
 # One line per point
@@ -346,30 +316,24 @@
 
    Tutorials
    
 
    Information on how to create and use PTStitcher scripts can be found on the web and on the wiki:
 
    
-
      
-
    •  The original PTStitcher Readme[*] file contains basic information.
-
      • 
-
    •  The updated original example script with lots of comments is found at Jim Watters' page
-
      • 
-
    •  Ben Kreunen has an excellent list about the parameters of the p- o- and m-line and some example scripts.
-
      • 
-
    •  Frequently asked questions about PTStitcher including solutions to common problems are found at the unofficial Panorama Tools FAQ.
-
      • 
-
    •  On the wiki there are some techniques described that use PTStitcher:
-
        
-
      •  Upsampling a single image with ptstitcher[*]
-
        • 
-
      •  Extracting and inserting rectilinear Views[*]
-
        • 
-
      
-
      • 
-
    
+
    • The original PTStitcher Readme[*] file contains basic information.
      • 
+
    • The updated original example script with lots of comments is found at Jim Watters' page
      • 
+
    • Ben Kreunen has an excellent list about the parameters of the p- o- and m-line and some example scripts.
      • 
+
    • Frequently asked questions about PTStitcher including solutions to common problems are found at the unofficial Panorama Tools FAQ.
      • 
+
    • On the wiki there are some techniques described that use PTStitcher:
+
      • Upsampling a single image with ptstitcher[*]
        • 
+
      • Extracting and inserting rectilinear Views[*]
    
 
    Calling from the command line
    
-
    PTStitcher can be called from the command line (this is what all GUIs do, too). More information in the PTStitcher Readme[*]
+
    PTStitcher can be called from the command line (this is what all GUIs do, too). More information in the PTStitcher Readme[*]
 
    
 
+
+
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=PTStitcher&oldid=13362[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PTStitcher&oldid=13362"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html 2017-04-22 17:03:01.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html 2019-01-09 15:36:58.000000000 +0000 @@ -1,42 +1,38 @@ - + PTtiff2psd - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    PTtiff2psd

    -
    -
    From PanoTools.org Wiki
    +

    PTtiff2psd

    +
    From PanoTools.org Wiki
    - -

    PTtiff2psd is a utility to convert a set of TIFF files into a multi-layer -PSD file suitable for opening in Photoshop[*] or the Gimp[*]. It was written +

    PTtiff2psd is a utility to convert a set of TIFF files into a multi-layer +PSD file suitable for opening in Photoshop[*] or the Gimp[*]. It was written by Daniel M German. A multi-platform version is now included with the pano12 library available at Sourceforge. -

    The functionality is similar to Erik Krause's Photoshop stitching actions[*], except +

    The functionality is similar to Erik Krause's Photoshop stitching actions[*], except PTtiff2psd is a standalone command-line program. -

    Many tools such as PTStitcher, nona, PTGui[*], PTmender and +

    Many tools such as PTStitcher, nona, PTGui[*], PTmender and PTblender generate output in the form of multiple TIFF files that can be used as input for PTtiff2psd.

    Usage is like so: @@ -57,8 +53,12 @@ -h Show this message - - -

    - Retrieved from "http://wiki.panotools.org/index.php?title=PTtiff2psd&oldid=13146[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=PTtiff2psd&oldid=13146"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Qtvr2img.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Qtvr2img.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Qtvr2img.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Qtvr2img.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,42 +1,42 @@ - + Qtvr2img - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Qtvr2img

    -
    -
    From PanoTools.org Wiki
    +

    Qtvr2img

    +
    From PanoTools.org Wiki
    - -

    qtvr2img is a command-line tool for extracting content from QTVR panoramas. -

    Cubic Projection panoramas are extracted as six cube-faces in front, right, back, left, up, down order; Cylindrical Projection panoramas are extracted as a single rectangular image. Output is as PNM[*] portable anymap images with the same resolution as the JPEG tiles in the source file. +

    qtvr2img is a command-line tool for extracting content from QTVR panoramas. +

    Cubic Projection panoramas are extracted as six cube-faces in front, right, back, left, up, down order; Cylindrical Projection panoramas are extracted as a single rectangular image. Output is as PNM[*] portable anymap images with the same resolution as the JPEG tiles in the source file.

    qtvr2img is shipped with the Freepv panorama viewer.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Qtvr2img&oldid=11439[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Qtvr2img&oldid=11439"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/QTVR.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/QTVR.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/QTVR.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/QTVR.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,43 +1,44 @@ - + QTVR - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    QTVR

    -
    -
    From PanoTools.org Wiki
    +

    QTVR

    +
    From PanoTools.org Wiki
    - -

    QuickTime Virtual Reality is a subset of the functionality of Apple Quicktime[*] for non linear movie files. Like linear movies they have the extension .mov and need QuickTime player installed to be viewed. Very basic QTVR panoramas can also be viewed using PTViewer. +

    QuickTime Virtual Reality is a subset of the functionality of Apple Quicktime[*] for non linear movie files. Like linear movies they have the extension .mov and need QuickTime player installed to be viewed. Very basic QTVR panoramas can also be viewed using PTViewer.

    QTVR refers to the ability to display spherical panoramas in Cubic Projection, cylindrical, partial panoramas, multinode panoramas and objects in a viewer where the user can move around or rotate the object using the mouse and keyboard. The panoramas can be linked through hotspots in order to move from one panorama file to the other or link several panoramas in one multinode file. -

    Whereas the competitors (like PTViewer[*] or SPi-V[*]) are continously improved there was no major development in QTVR the last years. See Quicktime[*] for more information. -

    With the help of <EMBED> and <OBJECT> tags you can specify parameters directly in your HTML code. See also Dynamic Field of View for Embedded QTVRs[*]. +

    Whereas the competitors (like PTViewer[*] or SPi-V[*]) are continously improved there was no major development in QTVR the last years. See Quicktime[*] for more information. +

    With the help of <EMBED> and <OBJECT> tags you can specify parameters directly in your HTML code. See also Dynamic Field of View for Embedded QTVRs[*].

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=QTVR&oldid=9475[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=QTVR&oldid=9475"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RAW.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RAW.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RAW.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RAW.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,56 +1,53 @@ - + RAW - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    RAW

    -
    -
    From PanoTools.org Wiki
    +

    RAW

    +
    From PanoTools.org Wiki
    - -

    RAW refers to -a group of some hundred proprietary image formats[*] containg unprocessed sensor data from digital cameras. -

    They all have in common that they contain the unprossesed data as it comes from the analog/digital (A/D) converter. This files need to be processed - at least interpolated, since the color information for most of them is located in different pixels - and converted to a common image format[*] to be viewed or otherwise used. They might contain additional data comparable to the EXIF information. +

    RAW refers to +a group of some hundred proprietary image formats[*] containg unprocessed sensor data from digital cameras. +

    They all have in common that they contain the unprossesed data as it comes from the analog/digital (A/D) converter. This files need to be processed - at least interpolated, since the color information for most of them is located in different pixels - and converted to a common image format[*] to be viewed or otherwise used. They might contain additional data comparable to the EXIF information.

    RAW converters

    -

    There are numerous RAW converters but only few that can convert most or all RAW formats, most of them based on dcraw[*] written by David J. Coffin. Most of them offer sophisticated ways to control white balance[*], tonal range, contrast, shadow detail, exposure etc. Some even allow for correction of chromatic aberration or noise. -

    You can always try and find out how to extract more dynamic range from RAW files in these converters, but in order to get 16 bit per channel output files with full dynamic range follow the tutorial about RAW dynamic range extraction[*]. +

    There are numerous RAW converters but only few that can convert most or all RAW formats, most of them based on dcraw[*] written by David J. Coffin. Most of them offer sophisticated ways to control white balance[*], tonal range, contrast, shadow detail, exposure etc. Some even allow for correction of chromatic aberration or noise. +

    You can always try and find out how to extract more dynamic range from RAW files in these converters, but in order to get 16 bit per channel output files with full dynamic range follow the tutorial about RAW dynamic range extraction[*]. +

    Darktable an open source photography workflow application and raw developer can be extended with the "Hugin darktable Lua Script[*]" to create panoramas in Hugin.

    External links

    - - - + -
    - Retrieved from "http://wiki.panotools.org/index.php?title=RAW&oldid=9545[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=RAW&oldid=16045"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Rectilinear_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Rectilinear_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Rectilinear_Projection.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Rectilinear_Projection.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,44 +1,47 @@ - + Rectilinear Projection - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Rectilinear Projection

    -
    -
    From PanoTools.org Wiki
    +

    Rectilinear Projection

    +
    From PanoTools.org Wiki
    - -
    Rectilinear projection, with permission from Ben Kreunen[*]
    +


    +

    +
    Rectilinear projection, with permission from Ben Kreunen[*]

    Rectilinear is a type of projection for mapping a portion of the surface of a sphere to a flat image. It is also called the "gnomic", "gnomonic", or "tangent-plane" projection, and can be envisioned by imagining placing a flat piece of paper tangent to a sphere at a single point, and illuminating the surface from the spheres' center. Mathworld's page has an example and describes the mathematics underlying this projection.[1]

    The is a fundamental projection in panoramic imaging, because most ordinary (non-fisheye) camera lenses produce an image very close to being rectilinear over their entire field of view. Pin-hole cameras, in fact, provide exactly a tangent-plane mapping of the sphere onto their detector planes, and most simple imaging systems (consumer cameras with non-fisheye lenses among them) approximate this quite well. Thus it is the most common source image projection for partial panoramas. -

    The rectilinear projection also has the fundamental property that straight lines in real 3D space are mapped to straight lines in the projected image. This property makes the rectilinear image very useful for printed panoramas which do not cover an excessively large range of longitude or latitude (e.g. <120 degrees). Many Panorama Viewers[*] which show only a portion of a scene at a time do so using the rectilinear projection (regardless of what projection the full sphere source image was in). +

    The rectilinear projection also has the fundamental property that straight lines in real 3D space are mapped to straight lines in the projected image. This property makes the rectilinear image very useful for printed panoramas which do not cover an excessively large range of longitude or latitude (e.g. <120 degrees). Many Panorama Viewers[*] which show only a portion of a scene at a time do so using the rectilinear projection (regardless of what projection the full sphere source image was in).

    The Cubic Projection is a special sub-case of the rectilinear projection, in which 90 by 90 degree rectilinear sub-projections are made onto 6 faces of a cube.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Rectilinear_Projection&oldid=9477[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Rectilinear_Projection&oldid=9477"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RGBE.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RGBE.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RGBE.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/RGBE.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,41 +1,42 @@ - + RGBE - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    RGBE

    -
    -
    From PanoTools.org Wiki
    +

    RGBE

    +
    From PanoTools.org Wiki
    - -

    Radiance RGBE -is a HDR image format[*] invented by Greg Ward Larson for his Radiance rendering software. The file extension is usually .hdr. It stores pixels as one byte RGB (red, green, and blue) values with a one byte shared exponent. Thus it store four bytes per pixel and the dynamic range covers 80 decades. +

    Radiance RGBE +is a HDR image format[*] invented by Greg Ward Larson for his Radiance rendering software. The file extension is usually .hdr. It stores pixels as one byte RGB (red, green, and blue) values with a one byte shared exponent. Thus it store four bytes per pixel and the dynamic range covers 80 decades.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=RGBE&oldid=9530[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=RGBE&oldid=9530"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Roll.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Roll.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Roll.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Roll.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,49 +1,46 @@ - + Roll - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Roll

    -
    -
    From PanoTools.org Wiki
    +

    Roll

    +
    From PanoTools.org Wiki
    - -

    Rotation angle around the lens axis. See also Pitch and Yaw. +

    Rotation angle around the lens axis. See also Pitch and Yaw.

    Roll is the angle of camera rotation around its optical axis and part of the panotools Image positioning model.

    If your camera is not level this can be in two directions:

    -
      -
    • the image is tilted up or down, resulting in a Pitch value different from 0.0 -
      • -
    • the image is rotated such that the horizon is not horizontal if held upright, resulting in a Roll value different from 0.0 -
      • -
    - - +
    • the image is tilted up or down, resulting in a Pitch value different from 0.0
      • +
    • the image is rotated such that the horizon is not horizontal if held upright, resulting in a Roll value different from 0.0
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Roll&oldid=13823[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Roll&oldid=13823"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,63 +1,52 @@ - + SmartBlend - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    SmartBlend

    -
    -
    From PanoTools.org Wiki
    +

    SmartBlend

    +
    From PanoTools.org Wiki
    - -

    Smartblend is +

    Smartblend is an application for seamless image blending by Michael Norel. He can be reached at minorlogic{at}yahoo{dot}com

    The main goal of smartblend is panoramic image blending, though it can be used for other applications, such as creation of seamless textures, montage of photos or collage. Smartblend allows stitching of many problematic shots (parallaxed, with moving objects or with differing exposure).

    For example see the parallax picture below (from http://www.htu.at/~sascha/ptguide/01.htm described as "impossible to stitch" )

    -
    SB Parallax.jpg[*]

    -

    Just put one picture into another and note the great difference. +

    SB Parallax.jpg[*]


    +

    Just put one picture into another and note the great difference.

    -
    SB Parallax overlapped.jpg[*]

    -

    Picture below is blended by smartblend. +

    SB Parallax overlapped.jpg[*]


    +

    Picture below is blended by smartblend.

    -
    SB Blended.jpg[*]

    -

    Another smartblend example: http://www.photodan.com.au/misc/flamchen.htm +

    SB Blended.jpg[*]


    +

    Another smartblend example: http://www.photodan.com.au/misc/flamchen.htm

    If you don't know what is a "command line application" it can not be useful for you. But you still can use a frontend for smartblend:

    -
      -
    • PanoWizard[*] -
      • -
    • EnblendGUI[*] -
      • -
    • PTGui[*] -
      • -
    • PTAssembler[*] -
      • -
    • hugin (only together with the smartblend wrapper from sourceforge) -
      • -
    -

    Download SmartBlend, current version Smartblend_1_2_5.zip[*] +

    +

    Download SmartBlend, current version Smartblend_1_2_5.zip[*]

    How it works

    It finds the visual error on overlap region and searches for a seam line with minimal visual error. Than it blends pictures using an algorithm similar to a multiresolution spline. @@ -68,11 +57,17 @@

    (Text taken from original smartblend home page)

    smartblend on Mac

    -

    There used to be a nice tutorial on tweakbits.com which is gone. If anyone still has the know how, please write a wiki page: smartblend on Mac[*] For the time being you find the content retrieved from google cache on the corresponding discussion page. +

    There used to be a nice tutorial on tweakbits.com which is gone. If anyone still has the know how, please write a wiki page: smartblend on Mac[*] For the time being you find the content retrieved from google cache on the corresponding discussion page.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=SmartBlend&oldid=14181[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=SmartBlend&oldid=14181"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Spherical.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Spherical.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Spherical.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Spherical.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,40 +1,41 @@ - + Spherical - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Spherical

    -
    -
    From PanoTools.org Wiki
    +

    Spherical

    +
    From PanoTools.org Wiki
    - -

    A panorama format that can contain the whole sphere around the viewer. Most widely used spherical formats are equirectangular and cubic. +

    A panorama format that can contain the whole sphere around the viewer. Most widely used spherical formats are equirectangular and cubic.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Spherical&oldid=9481[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Spherical&oldid=9481"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,63 +1,63 @@ - + Stereographic Projection - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Stereographic Projection

    -
    -
    From PanoTools.org Wiki
    +

    Stereographic Projection

    +
    From PanoTools.org Wiki
    - -
    [*]
    Circular sterographic projection, based on Ben Kreunen equirectangular example
    +


    +

    +
    [*]
    Circular sterographic projection, based on Ben Kreunen equirectangular example

    stereographic is an alternative fisheye Projection which is conformal, making it more suitable for printing than standard fisheye images which are extremely distorted at the edges.

    All versions of the pano12 library since 2.8.1 have supported this and some other novel projections. -Various GUI front-ends[*] including hugin and PTAssembler[*] now support it directly. +Various GUI front-ends[*] including hugin and PTAssembler[*] now support it directly.

    - +


    Comparison with standard fisheye

    -
    [*]
    Example of a standard fisheye, Medinet Habu first courtyard
    -
    [*]
    Example of a stereographic image, Medinet Habu first courtyard
    -

    Stereographic 'little planet' images

    -

    Little planet[*] images are a nice way to represent a spherical -scene without requiring a panorama viewer[*], stereographic is generally superior +

    [*]
    Example of a standard fisheye, Medinet Habu first courtyard
    +
    [*]
    Example of a stereographic image, Medinet Habu first courtyard
    +

    Stereographic 'little planet' images

    +

    Little planet[*] images are a nice way to represent a spherical +scene without requiring a panorama viewer[*], stereographic is generally superior to standard fisheye Projection for these images.

    -
    [*]
    standard fisheye little planet
    -
    [*]
    sterographic little planet
    - - +
    [*]
    standard fisheye little planet
    +
    [*]
    sterographic little planet
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Stereographic_Projection&oldid=9550[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Stereographic_Projection&oldid=9550"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stitching_a_photo-mosaic.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stitching_a_photo-mosaic.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stitching_a_photo-mosaic.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Stitching_a_photo-mosaic.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,39 +1,35 @@ - + Stitching a photo-mosaic - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Stitching a photo-mosaic

    -
    -
    From PanoTools.org Wiki
    +

    Stitching a photo-mosaic

    +
    From PanoTools.org Wiki
    - -

    This section is a stub. +

    This section is a stub.


    -

    Contents

    +

    Contents

    • 1 Definition of photo-mosaic
    • 2 Understanding the mosaic lens model @@ -48,7 +44,7 @@

      Definition of photo-mosaic

      A photo-mosaic is an image that is stitched together by photographs all taken from different viewpoints. This differs from the panorama where all images are taken from one single viewpoint but with different angles. -

      The typical case of a photo-mosaic is the linear panorama[*], where one large subject like a wall, is photographed by taking photos of the wall, each covering a proportion of the wall, and moving the camera parallel to the wall with each shot. +

      The typical case of a photo-mosaic is the linear panorama[*], where one large subject like a wall, is photographed by taking photos of the wall, each covering a proportion of the wall, and moving the camera parallel to the wall with each shot.

      The classical way to stitch these kinds of mosaics was to lay the prints out on a light-table and glue them together. Now with the mosaic-mode in the panotools lens model, it is possible to use the software to estimate the camera position including angles, lens distortion etc. and to re-project and stitch the images to a photo-mosaic.


      @@ -60,35 +56,28 @@

      Mosaic lens model

      In order to generate a photo-mosaic from the individual images, the panotools lens model re-projects the images in the following way.

      -
        -
      • Each image is projected onto a plane with yaw Tpy and pitch Tpp (the translation remapping plane). This re-projection uses all the lens model's parameters; the position parameters described above, as well as FOV, distortion. etc. -
        • -
      • The plane is projected onto the panosphere. -
        • -
      • The panorama camera, which gives the viewpoint of the photo mosaic, sits in the center of the panosphere and looks straight ahead at the panosphere (and the perpendicular projection plane). This camera gives the FOV of the whole photo-mosaic. -
        • -
      +
      • Each image is projected onto a plane with yaw Tpy and pitch Tpp (the translation remapping plane). This re-projection uses all the lens model's parameters; the position parameters described above, as well as FOV, distortion. etc.
        • +
      • The plane is projected onto the panosphere.
        • +
      • The panorama camera, which gives the viewpoint of the photo mosaic, sits in the center of the panosphere and looks straight ahead at the panosphere (and the perpendicular projection plane). This camera gives the FOV of the whole photo-mosaic.


      To illustrate the model, consider the following picture, which looks straight down at a photo mosaic which consists of three images taken "to the right" of the center.

      -
        -
      • The unit-panosphere[*] is drawn in gray. -
        • -
      • "The panorama camera" is centered in Origin, X,Y,Z =0. The translation remapping plane has default position Tpy=0 and Tpp=0. -
        • -
      • Three photos are taken with camera positions 1, 2 and 3 by varying TrX,TrZ and Yaw -
        • -
      • The photos are reprojected to a plane (red) that touches the panosphere in (0,0,1) and then onto the panosphere using the "Panorama camera" -
        • -
      -

      Illustration4.png[*] +

      • The unit-panosphere[*] is drawn in gray.
        • +
      • "The panorama camera" is centered in Origin, X,Y,Z =0. The translation remapping plane has default position Tpy=0 and Tpp=0.
        • +
      • Three photos are taken with camera positions 1, 2 and 3 by varying TrX,TrZ and Yaw
        • +
      • The photos are reprojected to a plane (red) that touches the panosphere in (0,0,1) and then onto the panosphere using the "Panorama camera"
      +

      Illustration4.png[*]

      Result

      Because the projection plane is a plane and perpendicular to the panorama camera, there will be miss-fit when this assumption is not true for the real-world subject. For example, photos of a flat wall mural could be rendered perfect, while a three dimensional subject would not be.

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Stitching_a_photo-mosaic&oldid=15598[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Stitching_a_photo-mosaic&oldid=15598"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,36 +1,32 @@ - + Straight line control points - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Straight line control points

    -
    -
    From PanoTools.org Wiki
    +

    Straight line control points

    +
    From PanoTools.org Wiki
    - -


    +


    The panorama tools optimizer understands various different schemes for aligning photos using control points: Normal points are t0 points, horizontal control points are t1 points, @@ -43,7 +39,7 @@

    Although two points are sufficient to define a horizontal or vertical line, more are required for these lines at arbitrary angles. Since the script file format only supports 'pairs' of points, a straight line is generally defined with four, six or eight etc... control points. -

    Some of the GUI front-ends[*] support placing these straight line control points, see this +

    Some of the GUI front-ends[*] support placing these straight line control points, see this tutorial on correcting lens distortion with ptgui.

    Otherwise if you edit a PTOptimizer script and make more than one pair of existing points t3, then the optimiser will try to line them up as a straight @@ -51,8 +47,13 @@ that you want in different 'straight lines'.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Straight_line_control_points&oldid=12322[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Straight_line_control_points&oldid=12322"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,49 +1,46 @@ - + Swing rod - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Swing rod

    -
    -
    From PanoTools.org Wiki
    +

    Swing rod

    +
    From PanoTools.org Wiki
    - -

    A swing rod is a device for stabilising a camera position around the no-parallax point without needing a tripod[*], the principle is identical to a Philopod[*]. -

    A telescopic car aerial is used as the rod. Although heavier, this is more convenient to carry than a Philopod[*] where the string has to be wound/unwound and can get tangled easily. +

    A swing rod is a device for stabilising a camera position around the no-parallax point without needing a tripod[*], the principle is identical to a Philopod[*]. +

    A telescopic car aerial is used as the rod. Although heavier, this is more convenient to carry than a Philopod[*] where the string has to be wound/unwound and can get tangled easily.

    External links

    - - - + -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Swing_rod&oldid=12397[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Swing_rod&oldid=12397"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tca_correct.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tca_correct.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tca_correct.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tca_correct.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,39 +1,35 @@ - + Tca correct - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Tca correct

    -
    -
    From PanoTools.org Wiki
    +

    Tca correct

    +
    From PanoTools.org Wiki
    - -

    tca_correct is a command-line tool shipped with hugin that can be used to automatically calculate lens chromatic aberration[*] correction parameters. Ideal sample photos would have a lot of contrast over the entire image area, little saturated colour and no blown highlights. +

    tca_correct is a command-line tool shipped with hugin that can be used to automatically calculate lens chromatic aberration[*] correction parameters. Ideal sample photos would have a lot of contrast over the entire image area, little saturated colour and no blown highlights.

    Using with fulla

    -

    fulla is a command-line tool for correcting lens distortion, vignetting and TCA[*] (chromatic aberration). It is capable of applying the full panotools polynomial to the red and blue channels, thereby correcting any transverse chromatic aberration. +

    fulla is a command-line tool for correcting lens distortion, vignetting and TCA[*] (chromatic aberration). It is capable of applying the full panotools polynomial to the red and blue channels, thereby correcting any transverse chromatic aberration.

    First calculate some TCA correction parameters for a sample image, notice that I'm only going to bother optimising b and v parameters in the lens correction model, you might get better results with the full abcv set of parameters: 

     tca_correct -o bv DSC_3194.ppm
@@ -47,11 +43,11 @@
 
     fulla -r 0.0:0.0001197:0.0:0.9997630 -b 0.0:-0.0001142:0.0:1.0001841 -o corrected.tif DSC_3194.ppm
 
    
 
    Using with dcraw
    
-
    dcraw[*] is a command-line RAW converter with the ability to apply scaling of red/blue channels at the Bayer interpolation stage. Simple scaling is not as sophisticated as the panotools polynomial used in fulla but is good enough for nearly all purposes. Start by extracting a test image from a RAW file:
+
    dcraw[*] is a command-line RAW converter with the ability to apply scaling of red/blue channels at the Bayer interpolation stage. Simple scaling is not as sophisticated as the panotools polynomial used in fulla but is good enough for nearly all purposes. Start by extracting a test image from a RAW file:
 
    
 
     dcraw DSC_3194.NEF
 
    
-
    Then run tca_correct on this PPM image, but tell it to only optimise v field of view[*] for the red and blue channels:
+
    Then run tca_correct on this PPM image, but tell it to only optimise v field of view[*] for the red and blue channels:
 
    
 
     tca_correct -o v DSC_3194.ppm
 
    
@@ -64,13 +60,17 @@
 
     1 / 1.0005943 = 0.999406
  1 / 1.0008306 = 0.999170
 
    
-
    Now when converting RAW files from this lens you can use the dcraw -C parameter to correct TCA[*]:
+
    Now when converting RAW files from this lens you can use the dcraw -C parameter to correct TCA[*]:
 
    
 
     dcraw -C 0.999406 0.999170 [OPTIONS...] DSC_3194.NEF
 
    
 
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Tca_correct&oldid=11191[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Tca_correct&oldid=11191"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,42 +1,38 @@ - + The General Panini Projection - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    The General Panini Projection

    -
    -
    From PanoTools.org Wiki
    +

    The General Panini Projection

    +
    From PanoTools.org Wiki
    - -

    The general Panini projection is +

    The general Panini projection is an adjustable projection that can render convincing simulated perspective views of scenes up to 150 degrees wide, or even wider in some cases. It was first implemented in early 2009 in the panorama viewer, Panini, and in limited form in the panotools library. This page describes the improved version that was added to the panotools library in January 2010, and to PTStitcherNG in February 2010.

    The Pannini projection is a cylindrical projection, so it keeps vertical straight lines straight and vertical. Unlike other cylindrical projections, it keeps radial lines through image center straight as well. Those two kinds of straight lines are the most important perspective cues in many scenes, so a Pannini view often resembles a normal rectilinear perspective. But the horizontal field of view can be very wide, without the peripheral distortion (stretching) that is so noticeable when a rectilinear perspective is pushed too far.

    The general Panini projection is suitable for architectural subjects, especially interiors. It works best for views with a single central vanishing point -- straight down a city street, or the aisle of a church, for example. However it is good for oblique interior and street views too. It can make nice city-scapes, but is not suitable for close-up exterior views of buildings, especially when looking toward a corner of the building.

    For best results the general Panini projection should be used interactively: you adjust the control parameters until the image looks just right. The 'fast' preview window in the 2010 version of Hugin works well for that most of the time but has a few problems. However, it is possible to get equally good results with the 'slow' preview window, and with experience, even with scripts for the command line tools, PTStitcherNG or PTmender.

    -

    Contents

    +

    Contents

    Geometrical Description

    -
    [*]
    [*]
    Standard Panini projection, 10 degree intervals
    +
    [*]
    [*]
    Standard Panini projection, 10 degree intervals

    The basic Panini projection -- the cylindrical stereographic projection -- renders vertical, horizontal and radial straight lines as shown in the diagram at right. Verticals are straight, a prerequisite for any perspective view. Radial lines through the view center are also straight. That creates a convincing perspective illusion when there is a vanishing point at or near view center. But horizontal straight lines are curves, with the strongest curvature in the middle of the image. That makes many images seem to 'bulge' at top and bottom center.

    The general Panini adds two adjustable parameters to the basic projection. One sets the horizontal angle compression, so the projection can vary smoothly from rectilinear to a highly condensed form. The other reduces the curvature of horizontal lines. This can make many central perspectives look more natural, and can also improve the perspective illusion when the vanishing point is off-center. We call this a 'squeeze' parameter because early implementations actually compressed the middle of the image; current versions stretch the sides instead. The adjustment is purely vertical so that verticals remain straight. There are actually separate squeeze parameters for the top and bottom halves of the image.

    There are two kinds of squeeze, 'hard' and 'soft'. A hard squeeze can fully straighten horizontal lines, but only works on fields of view well under 180 degrees. A soft squeeze provides less complete straightening but works for wider fields of view. Of course nothing is free: reducing the curvature of horizontal lines comes at the cost of increasing the curvature of radial lines. Fortunately that curvature is strongest far from image center, and typically unnoticeable on fields of view of 130 degrees or less. @@ -67,36 +63,43 @@

    Applications

    Distortionless Wide-Angle Photos

    -
    [*]
    [*]
    Rectilinear, hfov 120 deg.
    -
    [*]
    [*]
    Panini(70,50,50), hfov 120 deg.
    +
    [*]
    [*]
    Rectilinear, hfov 120 deg.
    +
    [*]
    [*]
    Panini(70,50,50), hfov 120 deg.

    One of the best uses of the general Panini projection is simulating rectilinear perspective, without peripheral distortion, on fields of view typical of wide angle to super-wide angle camera lenses, say in the range of 75 to 120 degrees. A compression well under 100 is usually enough, plus a hard squeeze to straighten prominent transverse lines. The appropriate squeeze strength depends on the inclination of those lines: 100% if they are horizontal, less as the slope increases.

    Compare the shapes of the rose window (and other features) in the mild Panini perspective at left and the true rectilinear one at right.


    Perspective Views from Fish-Eye Photos

    -
    [*]
    [*]
    Panini view
    -
    [*]
    [*]
    Fisheye snapshot
    +
    [*]
    [*]
    Panini view
    +
    [*]
    [*]
    Fisheye snapshot

    Hugin with the general Panini projection is an excellent 'de-fishing' tool. Load a fisheye photo, adjust pitch and roll angles to align the true vertical with the vertical axis of the view, then adjust the general Panini parameters for a pleasing perspective -- anything from rectilinear to highly compressed and squeezed. Note that you can adjust pitch and roll by dragging in the fast preview window.

    If vertical lines look curved, you should adjust the lens focal length or FOV until they are straight. Temporarily switching to the rectilinear projection may make it easier to do this. The curvature results when the panotools lens model does not match the actual projection function of your lens. Adjusting the fov provides a first order correction that is usually 'close enough'; but for even better results, you could set the lens fov and a,b,c distortion parameters to values that were optimized on a well-aligned spherical panorama made with the same lens.


    Very Wide and Ultra-Wide Views from Panoramas

    -
    Pantheon-150x100-rect-panini.jpg[*]
    +
    Pantheon-150x100-rect-panini.jpg[*]

    With a panorama as the source image, the general Panini projection can be used like any other projection to render views in various directions. However it is best for views where the line of sight is not tilted up or down. It is important to align the vertical direction carefully in "roll" as well. Both pitch and roll alignment can be done by dragging the image in Hugin's fast preview window. To get a perfectly framed view, it may be necessary to render oversize and crop later.

    The image at right compares rectilinear (top) and general Pannini (bottom) projections of a panoramic view 150 degrees wide by 100 degrees high in the Pantheon (Rome), a large, perfectly circular space. The point of view here is well away from the middle of the room. Notice how the Pannini perspective both magnifies the center, so that people in the middle look closer, and condenses the periphery, so that people near the edges have more natural shapes -- for example, the man taking a picture at far right. A 50 percent "soft squeeze" has been applied at both top and bottom to improve the perspective of the floor and dome.

    It is often possible to render a convincing view more than 180 degrees wide, if the subject has a strong central perspective. The spectacular image of the main concourse at New York's Grand Central Station, below, is 220 degrees wide. The slanted walls at the sides are actually the ends of a transverse wall that stands well behind the point of view. This is a standard Pannini projection without any "squeeze".


    -
    [*]
    [*]
    Grand Central Terminal by Cristian Marchi; Panini projection, hFOV 220 degrees
    +
    [*]
    [*]
    Grand Central Terminal by Cristian Marchi; Panini projection, hFOV 220 degrees

    Software Versions

    Your libpano13 and hugin must have been built after 20 January 2010, from panotools source version SVN 1237 or later and hugin source version SVN 4920 or later. You have to build pre-release versions, or download them from a test builder's site, as the first official 2010 release of Hugin does not include the general Panini projection. You can get a self installing Win32 binary at http://tksharpless.net [click 'Panoramic Software', then double-click 'hugin-2010.1.0.4920.exe'. Running this creates a new self contained installation that won't interfere with any existing installation.] -

    In the first versions of hugin that support the general Panini projection, the 'fast' preview window sometimes has trouble displaying general Panini views, usually parts go black, occasionally it shows an apparently complete but incorrect view. The 'slow' preview window shows the true view in all cases; use it if the fast preview display seems garbled or unreliable. +

    In the first versions of Hugin that support the general Panini projection, the 'fast' preview window sometimes has trouble displaying general Panini views, usually parts go black, occasionally it shows an apparently complete but incorrect view. The 'slow' preview window shows the true view in all cases; use it if the fast preview display seems garbled or unreliable. Since 2015, the fast preview display is generally stable apart from sometimes showing crop bars after a field-of-view change. These normally disappear when the view is refreshed.

    Helmut Dersch's PTStitcherNG implements the general Panini projection just like libpano13. It only runs from scripts and provides no interactive preview; however it is so fast that an iterative adjustment of the script parameters is feasible. -

    -- T. K. Sharpless, 18 January 2010 - 21 June 2010 -- +

    The Panini projection is available in several panorama stitchers besides Hugin, notably PTGui (as "vedutismo") and PTAssembler (as "Recti-Perspective"). Those implementations provide adjustable compression but not the "squeeze" controls of the General Panini. +

    -- T. K. Sharpless, 18 January 2010 - 05 Jan 2018 --

    + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=The_General_Panini_Projection&oldid=12483[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=The_General_Panini_Projection&oldid=16015"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/TIFF.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/TIFF.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/TIFF.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/TIFF.html 2019-01-10 15:34:52.000000000 +0000 @@ -1,40 +1,36 @@ - + TIFF - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    TIFF

    -
    -
    From PanoTools.org Wiki
    +

    TIFF

    +
    From PanoTools.org Wiki
    - -

    The -Tagged Image File Format (TIFF) is a widely used and open image format[*] used to store and exchange digital images of all kinds. For general information see the w:TIFF[*] Wikipedia page -

    TIFF is a very versatile file format with many flavors. TIFF files typically have a .tif file extension. If you can't see file extensions, you may want to enable windows file extensions[*] as you will have great difficulty editing and manipulating image files otherwise. +

    The +Tagged Image File Format (TIFF) is a widely used and open image format[*] used to store and exchange digital images of all kinds. For general information see the w:TIFF[*] Wikipedia page +

    TIFF is a very versatile file format with many flavors. TIFF files typically have a .tif file extension. If you can't see file extensions, you may want to enable windows file extensions[*] as you will have great difficulty editing and manipulating image files otherwise.

    -

    Contents

    +

    Contents

    • 1 Compression issues
    • 2 Bit depth
      • @@ -49,81 +45,62 @@

      Compression issues

      TIFF can contain almost any image data. However, there are some common forms of image data compression found inside a TIFF file:

      -
        -
      • No compression is the most compatible form but results in the largest files. -
        • -
      • JPEG Simply a JPEG file stored inside a TIFF tag, lossy compression. -
        • -
      • LZW is a very common, lossless compression scheme resulting in smaller 8 bit files. LZW was patented in most countries until 2004 and hence was not found in many freeware distributions. This compression method is not useful for 16 bit TIFFs. -
        • -
      • ZIP (Deflate) is lossless too but not very common although it usually results in smaller files than LZW and was not patented. -
        • -
      • PackBits A not very common, lossless compression scarcely supported by image editing software. Photoshop[*] for example can read PackBits compressed TIFFs but not write them. -
        • -
      • G3 and G4 compression is used for 1-bit FAX documents only. -
        • -
      -

      PTStitcher (and hence all the GUI front-ends[*] that use it) outputs PackBits compressed image files if the output format is TIFF. There is a bug in Photoshop[*] prior to Version 9 (CS2) that prevents to open PackBits compressed files beyond a certain size. See opening large TIFFs with Photoshop[*] for details. +

      • No compression is the most compatible form but results in the largest files.
        • +
      • JPEG Simply a JPEG file stored inside a TIFF tag, lossy compression.
        • +
      • LZW is a very common, lossless compression scheme resulting in smaller 8 bit files. LZW was patented in most countries until 2004 and hence was not found in many freeware distributions. This compression method is not useful for 16 bit TIFFs.
        • +
      • ZIP (Deflate) is lossless too but not very common although it usually results in smaller files than LZW and was not patented.
        • +
      • PackBits A not very common, lossless compression scarcely supported by image editing software. Photoshop[*] for example can read PackBits compressed TIFFs but not write them.
        • +
      • G3 and G4 compression is used for 1-bit FAX documents only.
      +

      PTStitcher (and hence all the GUI front-ends[*] that use it) outputs PackBits compressed image files if the output format is TIFF. There is a bug in Photoshop[*] prior to Version 9 (CS2) that prevents to open PackBits compressed files beyond a certain size. See opening large TIFFs with Photoshop[*] for details.

      Bit depth

      TIFF can contain data of varying bit depth but for photographic purpose only 8-bit or 16-bit per channel are of interest. However, there is a specification that contains 32-bit data per channel floating point format for high dynamic range images.

      There can be any number of channels. Common examples are

      -
        -
      • a single channel specifying a black-and-white image -
        • -
      • three channels specifying a color image in RGB[*] color space -
        • -
      • four channels specifying a color image in CMYK[*] color space. -
        • -
      • any number of additional channels (called alpha channels) specifying masks, selections, additional color channels or what ever. -
        • -
      -

      All channels in an image have the same bit depth, hence a RGB[*] image with 16-bit per channel often is reffered to as a 48-bit image, with 8-bit per channel as a 24-bit image. -

      The Panotools main applications process 8-bit as well as 16-bit per channel images. Details see Full 16 bit workflow[*] +

      • a single channel specifying a black-and-white image
        • +
      • three channels specifying a color image in RGB[*] color space
        • +
      • four channels specifying a color image in CMYK[*] color space.
        • +
      • any number of additional channels (called alpha channels) specifying masks, selections, additional color channels or what ever.
      +

      All channels in an image have the same bit depth, hence a RGB[*] image with 16-bit per channel often is reffered to as a 48-bit image, with 8-bit per channel as a 24-bit image. +

      The Panotools main applications process 8-bit as well as 16-bit per channel images. Details see Full 16 bit workflow[*]

      Alpha channels and masks

      Alpha channels are used by panotools to store masks. A mask contains information to which extent the image should be used. For this purpose the alpha channel contains a black-and-white image where the pixel value determines the transparency of the corresponding image pixel.

      A white alpha channel pixel causes the corresponding image pixel to be seen to 100%, a black alpha channel pixel indicates a totally transparent image pixel. A alpha channel pixel with 50% gray indicates 50% transparency. -

      This is particularily useful to blend between images. PTStitcher, the main stitching application of the Panorama Tools[*], is capable of reading and writing masked TIFF image files in RGB color space. A mask in the source image is treated as image border and remapped to the output image accordingly. +

      This is particularily useful to blend between images. PTStitcher, the main stitching application of the Panorama Tools[*], is capable of reading and writing masked TIFF image files in RGB color space. A mask in the source image is treated as image border and remapped to the output image accordingly.

      -
        -
      • If the output type 'without feather' (TIFF_m) is used, a mask is created that reflects the remapped input image borders. -
        • -
      • For the 'with feather' (TIFF_mask) output the mask is calculated to give a seam between adjacent images that lies more or less in the middle of the overlap area. There is a 'feather' parameter to control the width of a grayscale gradient to allow for smooth blending between the images. See PTStitcher sample script on Jim Watters page for details: [1] -
        • -
      -

      In any case there is a problem to use this alpha channels as intended in Photoshop[*], since Photoshop does not know about the intended use. It loads the alpha channel but doesn't use it to control transparency. This can be achieved manually by loading the alpha channel as selection and creating a mask with 'reveal selection'. Erik Krause provides a Photoshop action set on his page that can be used to automate this for all images in a panorama: Stitching actions[*] +

      • If the output type 'without feather' (TIFF_m) is used, a mask is created that reflects the remapped input image borders.
        • +
      • For the 'with feather' (TIFF_mask) output the mask is calculated to give a seam between adjacent images that lies more or less in the middle of the overlap area. There is a 'feather' parameter to control the width of a grayscale gradient to allow for smooth blending between the images. See PTStitcher sample script on Jim Watters page for details: [1]
      +

      In any case there is a problem to use this alpha channels as intended in Photoshop[*], since Photoshop does not know about the intended use. It loads the alpha channel but doesn't use it to control transparency. This can be achieved manually by loading the alpha channel as selection and creating a mask with 'reveal selection'. Erik Krause provides a Photoshop action set on his page that can be used to automate this for all images in a panorama: Stitching actions[*]

      Layers

      -

      Standard TIFF doesn't support layers. If a Photoshop[*] document with layers is saved as TIFF Photoshop creates a flat TIFF image file (for compatibility) and the layer data in a separate TIFF tag. This separate TIFF tag can be compressed using RLE (run length encoding) or ZIP compression. ZIP usually results in smaller files, smaller even as if saved as PSD (where you can't choose the compression format). -

      Some applications (like for example nona, the PTStitcher replacement in the hugin package) can write single files that contain multiple TIFF images. If these TIFF files are loaded into Photoshop[*] only the first image will be visible. They can be split into single images with tiffsplit from the TIFF tools package or ImageMagick[*] (See Tools section). -

      Current versions of the Gimp[*] image editor can read these TIFF files with multiple images, though they are flattened to one image when saved - A workaround is to save these layers as separate files using the save-layers-tiff[*] plug-in. +

      Standard TIFF doesn't support layers. If a Photoshop[*] document with layers is saved as TIFF Photoshop creates a flat TIFF image file (for compatibility) and the layer data in a separate TIFF tag. This separate TIFF tag can be compressed using RLE (run length encoding) or ZIP compression. ZIP usually results in smaller files, smaller even as if saved as PSD (where you can't choose the compression format). +

      Some applications (like for example nona, the PTStitcher replacement in the hugin package) can write single files that contain multiple TIFF images. If these TIFF files are loaded into Photoshop[*] only the first image will be visible. They can be split into single images with tiffsplit from the TIFF tools package or ImageMagick[*] (See Tools section). +

      Current versions of the Gimp[*] image editor can read these TIFF files with multiple images, though they are flattened to one image when saved - A workaround is to save these layers as separate files using the save-layers-tiff[*] plug-in.

      nona and PTmender can create cropped TIFF output where the image data is just a small area within the final image dimensions. This is a useful way to save resources when assembling many images into a final panorama. Cropped TIFF input files are also supported by enblend.

      Non-image data

      -

      Since TIFF is a tagged format it can contain additional non-image data either comparable to the EXIF data in JPEG files or other. Photoshop[*] for example inserts XML formatted data that causes warning messages in some programs based on the common TIFF libraries. At least some of the EXIF tools can be used to view and/or manipulate the corresponding data in TIFF files, too. -

      TIFF supports embedded color profiles[*]. Unfortunately PTStitcher discards the profile information when it saves TIFF files (the nona stitcher doesn't have this bug). Hence the appropriate profile should be assigned to PTStitcher result images when loaded into a color management aware image editor. +

      Since TIFF is a tagged format it can contain additional non-image data either comparable to the EXIF data in JPEG files or other. Photoshop[*] for example inserts XML formatted data that causes warning messages in some programs based on the common TIFF libraries. At least some of the EXIF tools can be used to view and/or manipulate the corresponding data in TIFF files, too. +

      TIFF supports embedded color profiles[*]. Unfortunately PTStitcher discards the profile information when it saves TIFF files (the nona stitcher doesn't have this bug). Hence the appropriate profile should be assigned to PTStitcher result images when loaded into a color management aware image editor.

      Tools and sources

      Although the major image processors and viewers cope very well with TIFF it might be necessary from time to time to use some other tools - for batch processing, for conversion of scarcely supported TIFF flavors or simply to get enhanced information.

      -
        -
      • TIFF tools - A free package available from libtiff.org: [2] Windows executables at the Gnu Win32 Project: [3] -
        • -
      • ImageMagick[*] command line image processing package. -
        • -
      • TIFF libraries and specification from libtiff.org: [4] -
        • -
      • Little CMS[*] provides a tool called tifficc for applying an ICC colour profile to a TIFF file: wikipedia: LittleCMS[*] -
        • -
      +
      • TIFF tools - A free package available from libtiff.org: [2] Windows executables at the Gnu Win32 Project: [3]
        • +
      • ImageMagick[*] command line image processing package.
        • +
      • TIFF libraries and specification from libtiff.org: [4]
        • +
      • Little CMS[*] provides a tool called tifficc for applying an ICC colour profile to a TIFF file: wikipedia: LittleCMS[*]

      BigTiff

      One approach to overcome the current file size limitations of the format is a new TIFF specification called BigTiff for the free libTIFF library: http://bigtiff.org/

      + +
    - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=TIFF&oldid=15865[*]"
    -
    \ No newline at end of file +
    + Retrieved from "https://wiki.panotools.org/index.php?title=TIFF&oldid=15865"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tone_mapping.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tone_mapping.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tone_mapping.html 2017-04-22 17:03:04.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Tone_mapping.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,56 +1,51 @@ - + Tone mapping - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Tone mapping

    -
    -
    From PanoTools.org Wiki
    +

    Tone mapping

    +
    From PanoTools.org Wiki
    - -

    Many scenes we are photographing have a high contrast, or properly speaking a high dynamic range: part of the scene is in the shadows, part in the highlights. This is almost always the case for a panoramic scene, which is why capturing and reproducing dynamic range are important topics for panographers. +

    Many scenes we are photographing have a high contrast, or properly speaking a high dynamic range: part of the scene is in the shadows, part in the highlights. This is almost always the case for a panoramic scene, which is why capturing and reproducing dynamic range are important topics for panographers.

    Tone mapping deals with the issue of reproducing the dynamic range captured. Standard cameras are already able to capture around 10 stops of dynamic range once the effect of noise and other diminishing factors have been taken into account. This amounts to a tonal range of about 1,000:1 -- not enough to capture many high dynamic range scenes but still much more than your monitor or prints can reproduce (standard display devices have a dynamic range around 100:1).

    The difference between the dynamic range captured and the dynamic range of the reproducing medium becomes even higher when multiple exposures are taken and merged into a 32-bit HDR image. In such cases, the whole dynamic range of the scene (e.g. 100,000:1 or higher) has to be reproduced on a medium with less than 100:1 contrast ratio.

    This is why it becomes necessary to use techniques that scale the dynamic range down while preserving the appearance of the original image captured. Tone mapping refers to such techniques, though other terminologies are commonly used as well. -

    The most familiar form of tone mapping is the one performed in-camera or by RAW converters when the 12-bit worth of data captured by the sensors are processed into an image that looks good on your 8-bit monitor. For processing 32-bit HDR images, more sophisticated tone mapping algorithms are used, such as the "HDR Conversion" methods of Photoshop CS2 or the "Tone Mapping" tool of Photomatix[*] Pro, FDRTools[*], qtpfsgui[*] or pfstmo. +

    The most familiar form of tone mapping is the one performed in-camera or by RAW converters when the 12-bit worth of data captured by the sensors are processed into an image that looks good on your 8-bit monitor. For processing 32-bit HDR images, more sophisticated tone mapping algorithms are used, such as the "HDR Conversion" methods of Photoshop CS2 or the "Tone Mapping" tool of Photomatix[*] Pro, FDRTools[*], qtpfsgui[*] or pfstmo.

    Tone mapping operators are divided into two broad categories, global and local.

    -
      -
    • Global operators are simple and fast. They map each pixel based on its intensity and global image characteristics, regardless of the pixel's spatial location. Global operators are OK for mapping 12-bit sensor data but usually don't work well with HDR images. An example of a global type of tone mapping is a tonal curve. -
      • -
    -
      -
    • Local operators take into account the pixel's surroundings for mapping it. This means that a pixel of a given intensity will be mapped to a different value depending on whether it is located in a dark or bright area. This makes local operators slower (memory access is the major speed bottleneck on today's computers) but tends to produce more pleasing results, given that our eyes react locally to contrast. -
      • -
    +
    • Global operators are simple and fast. They map each pixel based on its intensity and global image characteristics, regardless of the pixel's spatial location. Global operators are OK for mapping 12-bit sensor data but usually don't work well with HDR images. An example of a global type of tone mapping is a tonal curve.
    +
    • Local operators take into account the pixel's surroundings for mapping it. This means that a pixel of a given intensity will be mapped to a different value depending on whether it is located in a dark or bright area. This makes local operators slower (memory access is the major speed bottleneck on today's computers) but tends to produce more pleasing results, given that our eyes react locally to contrast.

    Other possibilities

    -

    There are other possibilities that pass by the merge to HDR step and the related problems and directly go from the bracketed images to the compressed output. These possibilities are commonly referred to as Contrast Blending[*]. The basic idea is to take the "good" parts of any exposure step and merge directly into a low dynamic range image. The most advanced technique to do this is currently implemented by enfuse. +

    There are other possibilities that pass by the merge to HDR step and the related problems and directly go from the bracketed images to the compressed output. These possibilities are commonly referred to as Contrast Blending[*]. The basic idea is to take the "good" parts of any exposure step and merge directly into a low dynamic range image. The most advanced technique to do this is currently implemented by enfuse.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Tone_mapping&oldid=9894[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Tone_mapping&oldid=9894"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence_and_user_defined_assistant.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence_and_user_defined_assistant.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence_and_user_defined_assistant.html 2017-12-10 09:30:49.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence_and_user_defined_assistant.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ - - - - -User defined output sequence and user defined assistant - PanoTools.org Wiki - - - - - - - - - - - - - - - -
    -
    -
    - - - -

    User defined output sequence and user defined assistant

    - -
    -
    From PanoTools.org Wiki
    - - - - -

    Normally the stitching of Hugin is controlled by the settings on the stitcher tab and by the settings in the preferences dialog. In this case you can tweak a lot of options at both places, but you can't add additional steps to the processing queue. Also the assistant has a fixed algorithm suitable for normal panorama. But for same use case (e.g. stitching scanned images or multi-row panorama with orphaned images) this algorithm is not so good suited. For adjusting the work flow the concept of user defined output sequences and user defined assistant was introduced. -

    In an user defined output sequence / assistant you can define which programs should be executed. So you can add additional process step or add parameters which are not exposed in the normal processing. In case of user defined output sequence the settings on the stitcher tab and in the preferences are ignored. An exception are the projection, field of view and canvas size on the stitcher tab - these are used. -

    The user defined output sequences are defined in .executor files, the user defined assistant in .assistant files respectively. The format of these files is described in the files doc/executor_file_format.txt and doc/assistant_file_format.txt. Hugin_executor and Hugin can use these files for stitching. Also hugin_stitch_project can handle user defined output sequences. (PTBatcherGUI[*] can't handle the user defined output sequences and the user defined assistant.) -

    In Hugin you can open an executor file from any directory and stitch with the settings from this file your project. -Hugin 2017.1 and later lists the executor and assistant files from 2 directories in the menu bar for easier access: from a systemwide data directory and from an user data directory. On Windows the paths are install directory\share\hugin\data and c:\users\USERNAME\AppName\Roaming\hugin, on Linux the paths are /usr/share/hugin/data and ~/.hugindata. -

    - - - - - -
    -Retrieved from "https://wiki.panotools.org/index.php?title=User_defined_output_sequence_and_user_defined_assistant&oldid=16003"
    -
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence.html 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/User_defined_output_sequence.html 2019-01-09 15:36:59.000000000 +0000 @@ -0,0 +1,45 @@ + + + + +User defined output sequence and user defined assistant - PanoTools.org Wiki + + + + + + + + + + + + + + + + + + +
    + + +

    User defined output sequence and user defined assistant

    +
    From PanoTools.org Wiki
    (Redirected from User defined output sequence[*])
    + +

    Normally the stitching of Hugin is controlled by the settings on the stitcher tab and by the settings in the preferences dialog. In this case you can tweak a lot of options at both places, but you can't add additional steps to the processing queue. Also the assistant has a fixed algorithm suitable for normal panorama. But for same use case (e.g. stitching scanned images or multi-row panorama with orphaned images) this algorithm is not so good suited. For adjusting the work flow the concept of user defined output sequences and user defined assistant was introduced. +

    In an user defined output sequence / assistant you can define which programs should be executed. So you can add additional process step or add parameters which are not exposed in the normal processing. In case of user defined output sequence the settings on the stitcher tab and in the preferences are ignored. An exception are the projection, field of view and canvas size on the stitcher tab - these are used. +

    The user defined output sequences are defined in .executor files, the user defined assistant in .assistant files respectively. The format of these files is described in the files doc/executor_file_format.txt and doc/assistant_file_format.txt. Hugin_executor and Hugin can use these files for stitching. Also hugin_stitch_project can handle user defined output sequences. (PTBatcherGUI[*] can't handle the user defined output sequences and the user defined assistant.) +

    In Hugin you can open an executor file from any directory and stitch with the settings from this file your project. +Hugin 2017.1 and later lists the executor and assistant files from 2 directories in the menu bar for easier access: from a systemwide data directory and from an user data directory. On Windows the paths are install directory\share\hugin\data and c:\users\USERNAME\AppName\Roaming\hugin, on Linux the paths are /usr/share/hugin/data and ~/.hugindata. +

    + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=User_defined_output_sequence_and_user_defined_assistant&oldid=16003"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,56 +1,56 @@ - + Using Celeste with hugin - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Using Celeste with hugin

    -
    -
    From PanoTools.org Wiki
    +

    Using Celeste with hugin

    +
    From PanoTools.org Wiki
    - -

    Celeste is program used to remove cloud-like control points and can be run from within Hugin or from the command line. It was developed by Tim Nugent during Google's Summer of Code 2008. +

    Celeste is program used to remove cloud-like control points and can be run from within Hugin or from the command line. It was developed by Tim Nugent during Google's Summer of Code 2008.

    The problem is this: photo stitching software relies on objects within different images remaining in the same place. Control points are then used to match corresponding positons in each photo. However, panoramas are often captured over a number of minutes. During this time frame, non-static features such as clouds, water, and other objects (usually influenced by wind) may move significantly thus creating problems for automatic alignment tools. Should a control point be added to a cloud in photo A, the same cloud may have moved by the time photo B is taken, so the corresponding control point on the same cloud in photo B will actually be in the wrong position.

    To implement a solution to this problem, a classification algorithm called a w:Support vector machine[*] was used. SVMs are binary classifiers, so the objective is to use one to make a simple call: is this control point on a cloud, or not. The SVM uses textural and colour information around the control point to make this judgement, based on what it has been trained to recognise. The training process involves providing labeled example of each category (cloud/non-cloud) so the SVM can learn to discrminate between them.

    There are a few ways of running Celeste; I’ll show you how to do so via the control point editor panel first. -

    Celeste cpeditor pre.jpg[*] +

    Celeste cpeditor pre.jpg[*]


    Select a pair of images. For these two in the example, there are 15 control points connecting the two images, 6 of which are on clouds - we want to get rid of these. Hit the ‘Run Celeste’ button and wait a few seconds. A message box should pop up saying how many control points have been removed: -

    Celeste done.jpg[*] +

    Celeste done.jpg[*]

    Click OK then have another look at the control points. Of the 6 on clouds, 5 have been removed. In this example none of the non-cloud control points have been removed: -

    Celeste cpeditor post.jpg[*] +

    Celeste cpeditor post.jpg[*]

    The only cloud control point remaining is actually on an airline exhaust trail (which, being a fairly straight line, is not very cloud-like). So we do pretty well here - 15/16 control points correctly classified is about 93% accuracy. This is a good example; under stringent 10-fold cross validation, Celeste was 82% accurate.

    You can also run Celeste from the images panel. Simply select the images that you want to run Celeste on (or select all of them) and hit the ‘Run Celeste’ button again. Exactly the same thing should happen - a message will pop up saying how many control points have been removed: -

    Celeste images panel.jpg[*] +

    Celeste images panel.jpg[*]

    There’s one more way of running it - right at the start on the assistant panel. After control points have been generated, Celeste will scan all the images and remove cloud-like control points from the whole set. To run Celeste this way open up the preferences panel and activate the ‘Automatically run Celeste..’ option. Then hit ‘Align’ on the assistant panel, and Celeste will run after control point generation: -

    Celeste preferences.jpg[*] +

    Celeste preferences.jpg[*]

    And that’s it! There are a few other options on the preferences tab; to alter the sensitivity you can adjust the threshold value. The SVM will generate a score for each control point, where greater than 0.5 indicates a cloud. If you want to remove more control points reduce the threshold (try 0.4 to begin with), and raise it (e.g. 0.6) if you want to remove fewer. If there are lots of control points close to the image border, you may have more luck using the small filter size. In most cases you won’t need to adjust this though.

    There's also commandline version available, celeste_standalone.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Using_Celeste_with_hugin&oldid=11381[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Using_Celeste_with_hugin&oldid=11381"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Verdandi.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Verdandi.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Verdandi.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Verdandi.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,43 +1,35 @@ - + Verdandi - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Verdandi

    -
    -
    From PanoTools.org Wiki
    +

    Verdandi

    +
    From PanoTools.org Wiki
    - -

    verdandi is a tool to merge several images into a single image without a seam. It is similar to enblend and using similar command line switches. It tries to find the best seam, which is the least visible. Verdandi supports two different blend modes: +

    verdandi is a tool to merge several images into a single image without a seam. It is similar to enblend and using similar command line switches. It tries to find the best seam, which is the least visible. Verdandi supports two different blend modes:

    -
      -
    • --seam=hard: The blend mode is using a hard blend: each pixel is taken from exact one image. This behaviour (Seam Carving) is similar to the blending function used in Adobes Photomerge. -
      • -
    • --seam=blend: Blend the images in the gradient domain. The second image is here matched to the first image. This should reduce the differences between the images. But it is slower than the hard seam variant. -
      • -
    +
    • --seam=hard: The blend mode is using a hard blend: each pixel is taken from exact one image. This behaviour (Seam Carving) is similar to the blending function used in Adobes Photomerge.
      • +
    • --seam=blend: Blend the images in the gradient domain. The second image is here matched to the first image. This should reduce the differences between the images. But it is slower than the hard seam variant.


    Usage

    @@ -45,26 +37,20 @@

    will merge the images input1.tif, input2.tif and input3.tif to output.tif.

    -
      -
    • --output=OUTPUT_FILENAME: The output filename. It has to include the extension to deduce the format of the output file. -
      • -
    • --compression=COMPRESSION: Sets the compression for the output -
        -
      • For jpeg files use 0-100: This will set the quality of the jpeg file. Bigger number means better image quality. -
        • -
      • For tiff files the following compressions are supported: PACKBITS, DEFLATE and LZW. -
        • -
      -
      • -
    • --seam=hard|blend: Sets the blend mode (see above) -
      • -
    • --warp: Wraparound the 360 deg border. Otherwise the left and right borders are treated independent of each other. -
      • -
    - - - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Verdandi&oldid=15810[*]"
    -
    \ No newline at end of file +
    • --output=OUTPUT_FILENAME: The output filename. It has to include the extension to deduce the format of the output file.
      • +
    • --compression=COMPRESSION: Sets the compression for the output +
      • For jpeg files use 0-100: This will set the quality of the jpeg file. Bigger number means better image quality.
        • +
      • For tiff files the following compressions are supported: PACKBITS, DEFLATE and LZW.
      • +
    • --seam=hard|blend: Sets the blend mode (see above)
      • +
    • --wrap: Wraparound the 360 deg border. Otherwise the left and right borders are treated independent of each other.
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Verdandi&oldid=16068"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vertical_control_points.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,48 +1,49 @@ - + Vertical control points - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Vertical control points

    -
    -
    From PanoTools.org Wiki
    +

    Vertical control points

    +
    From PanoTools.org Wiki
    - -


    +


    The panorama tools optimizer understands various different schemes for aligning photos using control points: Normal points are t0 points, horizontal control points are t1 points, vertical control points are t2 points, and straight line control points are t3, t4, etc... points. -

    The main use of vertical control points is to change the perspective of the output panorama such that the marked structures are vertical in the output projection[*]. In a multi image panorama this is only possible if the optimization of Roll and Pitch is allowed for all images and of Yaw for all but the anchor image. +

    The main use of vertical control points is to change the perspective of the output panorama such that the marked structures are vertical in the output projection[*]. In a multi image panorama this is only possible if the optimization of Roll and Pitch is allowed for all images and of Yaw for all but the anchor image.

    You set vertical control points on a vertical structure as far apart from each other as possible. -

    Please note that all real world vertical lines only stay vertical in rectilinear[*], cylindrical and equirectangular projections. In fisheye[*] projection only the vertical line through the image center stays vertical. -

    More details in Perspective correction and Panotools internals[*], a tutorial using vertical line control points: Leveling a Finished Panorama[*] +

    Please note that all real world vertical lines only stay vertical in rectilinear[*], cylindrical and equirectangular projections. In fisheye[*] projection only the vertical line through the image center stays vertical. +

    More details in Perspective correction and Panotools internals[*], a tutorial using vertical line control points: Leveling a Finished Panorama[*]

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Vertical_control_points&oldid=12315[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Vertical_control_points&oldid=12315"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,40 +1,36 @@ - + Vignetting - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Vignetting

    -
    -
    From PanoTools.org Wiki
    +

    Vignetting

    +
    From PanoTools.org Wiki
    - -

    Definition

    -

    Light fall-off in the corners of images due to lens characteristics. There are mainly two types of vignetting. One caused by the lens housing sometimes called artificial vignetting and one caused by optical reasons (cosine-in-4th-power law) sometimes called natural vignetting. Only the last one can be easily corrected by the Panorama Tools Plugins[*] radial luminance filter. In principle Fulvio Senore[*]'s program for vignetting correction can correct both types of vignetting. -

    Although the Panorama Tools Plugins[*] radial luminance filter implements vignetting correction, this functionality was never added to PTStitcher. In this case it is necessary to pre-process photographs with the plugin or some other tool. +

    Definition

    +

    Light fall-off in the corners of images due to lens characteristics. There are mainly two types of vignetting. One caused by the lens housing sometimes called artificial vignetting and one caused by optical reasons (cosine-in-4th-power law) sometimes called natural vignetting. Only the last one can be easily corrected by the Panorama Tools Plugins[*] radial luminance filter. In principle Fulvio Senore[*]'s program for vignetting correction can correct both types of vignetting. +

    Although the Panorama Tools Plugins[*] radial luminance filter implements vignetting correction, this functionality was never added to PTStitcher. In this case it is necessary to pre-process photographs with the plugin or some other tool.

    nona, the stitcher supplied with hugin now implements vignetting correction at the stitching stage, this uses either a flatfield image or a polynomial function. fulla is an image pre-processor that uses the same technique to correct vignetting along with chromatic aberration and lens distortion. -

    hugin now has a feature for automatically deriving vignetting correction parameters from an assembled panorama. It compares the brightness gradient difference between overlapping photos at different radii, and calculates a suitable correction polynomial. PTGui[*] has implemented the same technique based on Pablo's paper. +

    hugin now has a feature for automatically deriving vignetting correction parameters from an assembled panorama. It compares the brightness gradient difference between overlapping photos at different radii, and calculates a suitable correction polynomial. PTGui[*] has implemented the same technique based on Pablo's paper.

    See also

    Wikipedia page on vignetting[*] @@ -42,8 +38,13 @@

    Pablo d'Angelo's paper on exposure, whitebalance and vignetting correction

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Vignetting&oldid=12956[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Vignetting&oldid=12956"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vig_optimize.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vig_optimize.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vig_optimize.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Vig_optimize.html 2019-01-09 15:36:59.000000000 +0000 @@ -1,49 +1,39 @@ - + Vig optimize - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Vig optimize

    -
    -
    From PanoTools.org Wiki
    +

    Vig optimize

    +
    From PanoTools.org Wiki
    - -

    Photometric parameters such as exposure (EV), vignetting, white balance[*] and camera response curve can be optimised by Hugin in a similar way to lens distortion. These photometric parameters can be edited in the Photos tab or calculated automatically in the Exposure tab. +

    Photometric parameters such as exposure (EV), vignetting, white balance[*] and camera response curve can be optimised by Hugin in a similar way to lens distortion. These photometric parameters can be edited in the Photos tab or calculated automatically in the Exposure tab.

    For this to work, photos first have to be aligned with correct relative positions and lens parameters. Hugin will compare randomly selected groups of pixels from matching areas in each of the overlapping photos. Exposure and response curve can be calculated with any kind of overlap, however vignetting calculations require partial overlap, ideally around 50%.

    As well as the GUI process of optimisation/calculation in the hugin Exposure tab, photometric calculation can also be performed on the command-line with the vig_optimize tool. This functionally is configured via 'v' variable lines in the .pto project file in a similar way to the autooptimiser tool:

    -
      -
    • The camera response curve is simplified using the EMoR[*] sensor model which reduces the variation to five numbers, these are the Ra, Rb, Rc, Rd & Re image (i) parameters (the default values of 0.0 are equivalent to an 'average' generic sensor). -
      • -
    • The vignetting model is represented by a polynomial with four parameters: Va (this is always 1.0 and doesn't need to be optimised) and Vb, Vc & Vd (which default to 0.0 - equivalent to no vignetting). The vignetting centre can also be different from the geometrical centre, this is specified by Vx & Vy (both default to 0.0). -
      • -
    • Exposure (EV) is represented by a single value Eev (defaults 0.0, equivalent to no-change). -
      • -
    • The white balance[*] is represented by multipliers for the red and blue channels Er and Eb (the defaults of 1.0 are equivalent to no-change). -
      • -
    +
    • The camera response curve is simplified using the EMoR[*] sensor model which reduces the variation to five numbers, these are the Ra, Rb, Rc, Rd & Re image (i) parameters (the default values of 0.0 are equivalent to an 'average' generic sensor).
      • +
    • The vignetting model is represented by a polynomial with four parameters: Va (this is always 1.0 and doesn't need to be optimised) and Vb, Vc & Vd (which default to 0.0 - equivalent to no vignetting). The vignetting centre can also be different from the geometrical centre, this is specified by Vx & Vy (both default to 0.0).
      • +
    • Exposure (EV) is represented by a single value Eev (defaults 0.0, equivalent to no-change).
      • +
    • The white balance[*] is represented by multipliers for the red and blue channels Er and Eb (the defaults of 1.0 are equivalent to no-change).

    A typical 'v' variable line configuration would look like this, i.e. optimise camera response curve and vignetting for image 0 and exposure for images 1, 2, 3 and 4: 

    v Ra0 Rb0 Rc0 Rd0 Re0 Vb0 Vc0 Vd0
@@ -55,8 +45,12 @@
 
     vig_optimize -o myproject.pto myproject.pto
 
    
 
-
-
-
    - Retrieved from "http://wiki.panotools.org/index.php?title=Vig_optimize&oldid=14921[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Vig_optimize&oldid=14921"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Wavy_distortion.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,44 +1,45 @@ - + Wavy distortion - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Wavy distortion

    -
    -
    From PanoTools.org Wiki
    +

    Wavy distortion

    +
    From PanoTools.org Wiki
    - -

    Wavy distortion - sometimes also called mustache distortion - is a mixed distortion, it is a radial image distortion introduced by the lens itself. +

    Wavy distortion - sometimes also called mustache distortion - is a mixed distortion, it is a radial image distortion introduced by the lens itself.

    It often shows barrel distortion near the center and pincushion distortion along the edges. This type forms a bubble in the image center and is also reffered to as bubble distortion. The opposite variant with pincushion distortion in the center and barrel distortion along the edges exists too, but is rarely seen in real life lenses.

    Wavy distortion of any variant is a common Lens distortion that can be corrected by the lens correction model of panotools.

    -
    [*]
    A photograph showing exaggerated wavy distortion (of the bubble variant)
    - - +
    [*]
    A photograph showing exaggerated wavy distortion (of the bubble variant)
    -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Wavy_distortion&oldid=12324[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Wavy_distortion&oldid=12324"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,43 +1,44 @@ - + Yaw - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Yaw

    -
    -
    From PanoTools.org Wiki
    +

    Yaw

    +
    From PanoTools.org Wiki
    - -

    Panning angle, left-and-right. See also Pitch and Roll. +

    Panning angle, left-and-right. See also Pitch and Roll.

    Yaw is the horizontal rotation angle of the camera and part of the panotools Image positioning model. -

    If shooting a panorama you rotate the camera horizontally (around a vertical axis, TrY). You will treat one image as an anchor image[*] which is considered to have yaw = 0. The angle you rotated your camera relative to this image is its Yaw value. +

    If shooting a panorama you rotate the camera horizontally (around a vertical axis, TrY). You will treat one image as an anchor image[*] which is considered to have yaw = 0. The angle you rotated your camera relative to this image is its Yaw value.

    For a typical 360° panorama the yaw difference from one image to the next can be estimated by dividing 360 by the number of images.

    - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Yaw&oldid=15651[*]"
    -
    \ No newline at end of file + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Yaw&oldid=15651"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Zenith.html hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Zenith.html --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Zenith.html 2017-04-22 17:03:05.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/help_en_EN/Zenith.html 2019-01-10 15:34:53.000000000 +0000 @@ -1,54 +1,49 @@ - + Zenith - PanoTools.org Wiki - - + + + - - - - - + + +
    -

    Zenith

    -
    -
    From PanoTools.org Wiki
    +

    Zenith

    +
    From PanoTools.org Wiki
    - -

    The Zenith is +

    The Zenith is the point directly above the person viewing or above the camera. The opposite (below) point is named Nadir. -

    The Zenith is stretched to a line in Equirectangular Projection, making it hard to edit it directly. However, a rectilinear view can be extracted[*] for editing. +

    The Zenith is stretched to a line in Equirectangular Projection, making it hard to edit it directly. However, a rectilinear view can be extracted[*] for editing.

    Related articles

    -
      -
    • How to use enblend for patching zenith and nadir images[*] -
      • -
    • Edit zenith and nadir in one go with PTGui[*] -
      • -
    • Edit zenith and nadir in one go with Adjust filter[*] -
      • -
    • Zenith and Nadir editing overview[*] -
      • -
    - - - - -
    - Retrieved from "http://wiki.panotools.org/index.php?title=Zenith&oldid=9492[*]"
    -
    \ No newline at end of file +
    • How to use enblend for patching zenith and nadir images[*]
      • +
    • Edit zenith and nadir in one go with PTGui[*]
      • +
    • Edit zenith and nadir in one go with Adjust filter[*]
      • +
    • Zenith and Nadir editing overview[*]
    + + + +
    + +
    + Retrieved from "https://wiki.panotools.org/index.php?title=Zenith&oldid=9492"
    +
    \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/intro.htm hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/intro.htm --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/intro.htm 2018-01-26 16:28:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/intro.htm 2019-01-13 11:54:05.000000000 +0000 @@ -1,6 +1,6 @@

    Hugin was originally developed by Pablo d'Angelo.
    -© 2004-2018 +© 2004-2019

    By setting his original software Free under the GPL, Pablo started what has become a thriving community and a project larger than any diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/upstream.txt hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/upstream.txt --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/data/upstream.txt 2016-03-26 08:31:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/data/upstream.txt 2018-02-03 14:34:24.000000000 +0000 @@ -1,22 +1,13 @@ -Hugin's source package also contains the following -(slightly modified) libraries. The improvements have been contributed -back to the upstream developers, if possible. Hugin would not have been -possible without them. Many thanks. +Hugin's source package also contains the following (slightly modified) libraries. The improvements have been contributed back to the upstream developers, if possible. Hugin would not have been possible without them. Many thanks. levmar by Manolis Lourakis http://www.ics.forth.gr/~lourakis/levmar FLANN by Marius Muja and David G. Lowe, http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN (used unmodified) -The camera response estimation uses the EMoR response model developed -at the Computer Vision Laboratory of the Columbia University. -"Modeling the Space of Camera Response Functions," -M.D. Grossberg and S.K. Nayar, -IEEE Transactions on Pattern Analysis and Machine Intelligence, -Vol.26, No.10, pp.1272-1282, Oct, 2004. +The camera response estimation uses the EMoR response model developed at the Computer Vision Laboratory of the Columbia University. "Modeling the Space of Camera Response Functions," M.D. Grossberg and S.K. Nayar, IEEE Transactions on Pattern Analysis and Machine Intelligence, Vol.26, No.10, pp.1272-1282, Oct, 2004. Hugin would not be what it is without the following packages: -Libpano is critically important for Hugin. Many thanks to its original developers Helmut Dersch, Rik Littlefield, Jim Watters, Fulvio Seniore, Max Lyons, Bruno Postle, and to those who continue their tradition. -http://panotools.sourceforge.net/ +Libpano is critically important for Hugin. Many thanks to its original developers Helmut Dersch, Rik Littlefield, Jim Watters, Fulvio Seniore, Max Lyons, Bruno Postle, and to those who continue their tradition. http://panotools.sourceforge.net/ Enblend-Enfuse originally by Andrew Mihal http://enblend.sourceforge.net/ @@ -37,4 +28,3 @@ Many thanks to the whole Hugin-PTX mailing list, for great feedback and interesting discussions. Last but not least, many thanks to Nils Lagerkvist for suggesting the program name, Hugin. - diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/dlg_warning.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/dlg_warning.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/dlg_warning.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/dlg_warning.xrc 2018-12-09 17:43:02.000000000 +0000 @@ -3,7 +3,8 @@ - + + wxHORIZONTAL @@ -32,8 +33,6 @@ wxEXPAND - - wxHORIZONTAL wxALL|wxEXPAND @@ -53,7 +52,69 @@ wxVERTICAL - Warning + Warning: Invalid filenames + + + + + + + wxHORIZONTAL + + + + + wxALL|wxALIGN_CENTRE_VERTICAL + 12 + + + + + + + + wxALL|wxEXPAND + 6 + + + + -1,100 + + + + wxALL|wxEXPAND + 6 + + wxVERTICAL + + + wxEXPAND + + + + wxALL|wxEXPAND + 6 + + + + + + + 1 + + + + + + + + + wxALL|wxEXPAND + 6 + + wxVERTICAL + + Overwrite existing images \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/images_panel.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/images_panel.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/images_panel.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/images_panel.xrc 2019-02-01 15:39:19.000000000 +0000 @@ -48,7 +48,7 @@ 65,-1 - Minimum overlap for output stack detection + Minimum overlap for output stack detection\nWith -1 the assigned stacks in the project are used. 0 1 @@ -178,7 +178,7 @@ - + wxALIGN_CENTRE_VERTICAL|wxRIGHT 6 @@ -200,7 +200,7 @@ - + wxALIGN_CENTRE_VERTICAL 1,5 @@ -409,7 +409,7 @@ wxVERTICAL - - + wxRIGHT|wxALIGN_CENTRE_VERTICAL diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/image_variable_dlg.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/image_variable_dlg.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/image_variable_dlg.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/image_variable_dlg.xrc 2018-02-03 14:34:24.000000000 +0000 @@ -66,7 +66,7 @@ - + wxALIGN_CENTRE_VERTICAL 4,0 @@ -79,7 +79,7 @@ - + wxALIGN_CENTRE_VERTICAL 5,0 @@ -105,7 +105,7 @@ - + wxALIGN_CENTRE_VERTICAL 4,2 @@ -118,7 +118,7 @@ - + wxALIGN_CENTRE_VERTICAL 5,2 @@ -452,7 +452,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL 3 @@ -464,7 +464,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL 3 @@ -476,7 +476,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL 3 @@ -495,7 +495,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL 3 @@ -507,7 +507,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL|wxALL 3 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/import_raw_dialog.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/import_raw_dialog.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/import_raw_dialog.xrc 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/import_raw_dialog.xrc 2019-02-02 10:11:01.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + wxVERTICAL + + + + + + + + + wxALL|wxALIGN_CENTRE_VERTICAL + 3 + + + + + wxALL|wxEXPAND + 3 + + wxHORIZONTAL + + wxALL|wxEXPAND + 3 + + wxVERTICAL + + + + + + + + + wxALIGN_CENTRE_VERTICAL + 0,0 + + + + + + + + wxALL|wxALIGN_CENTRE_VERTICAL + 3 + + + + + wxALL|wxEXPAND + 3 + + wxHORIZONTAL + + wxALL|wxEXPAND + 3 + 0,1 + + + + + + + wxEXPAND + 1,0 + 0,2 + + + + + + wxALIGN_CENTRE_VERTICAL + 2,0 + + + + + + + + wxALL|wxALIGN_CENTRE_VERTICAL + 3 + + + + Leave empty to use default settings in RawTherapee + + + wxALL|wxEXPAND + 3 + + + + + + wxALL + 3 + + wxHORIZONTAL + + wxALL|wxEXPAND + 3 + 2,1 + + + + + + + wxEXPAND + 3,0 + 0,2 + + + + + + wxTOP|wxBOTTOM + 3 + 4,0 + + 2 + 5 + 30 + 1 + + + wxEXPAND + + + wxVERTICAL + + + wxALL|wxEXPAND + 3 + + + + wxALL|wxEXPAND + 5 + + + + + + + + + + + + + wxALL|wxEXPAND + 3 + + + Import Raw Images + + + \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc 2018-01-26 16:28:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/lenscal_frame.xrc 2018-02-03 14:34:24.000000000 +0000 @@ -95,7 +95,7 @@ 6 - + wxALIGN_CENTRE_VERTICAL @@ -112,7 +112,7 @@ - + wxRIGHT|wxALIGN_CENTRE_VERTICAL diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/lensdb_dialogs.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/lensdb_dialogs.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/lensdb_dialogs.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/lensdb_dialogs.xrc 2018-02-03 14:34:25.000000000 +0000 @@ -44,7 +44,7 @@ - + wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL 3 @@ -84,7 +84,7 @@ - + wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL 3 @@ -242,7 +242,7 @@ - + wxALIGN_CENTRE_VERTICAL | wxALL 3 @@ -278,7 +278,7 @@ - + wxALIGN_CENTRE_VERTICAL | wxALL 3 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/mask_editor_panel.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/mask_editor_panel.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/mask_editor_panel.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/mask_editor_panel.xrc 2018-02-03 14:34:25.000000000 +0000 @@ -372,13 +372,13 @@ - 100% + 100% fit to window - 200% - 150% - 75% - 50% - 25% + 200% + 150% + 75% + 50% + 25% 1 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/pano_panel.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/pano_panel.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/pano_panel.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/pano_panel.xrc 2019-02-19 19:55:59.000000000 +0000 @@ -517,9 +517,9 @@ - TIFF - JPEG - PNG + TIFF + JPEG + PNG 0 @@ -552,9 +552,9 @@ None - Packbits - LZW - Deflate + Packbits + LZW + Deflate wxALIGN_CENTRE_VERTICAL @@ -588,8 +588,8 @@ - EXR - TIFF + EXR + TIFF 0 @@ -609,9 +609,9 @@ None - Packbits - LZW - Deflate + Packbits + LZW + Deflate wxALIGN_CENTRE_VERTICAL @@ -755,7 +755,7 @@ - Nona + Nona 0 @@ -782,7 +782,7 @@ - enfuse + enfuse 0 @@ -1117,7 +1117,7 @@ 80,-1 1 - 30000 + 300000 wxALL|wxALIGN_CENTRE_VERTICAL 3 @@ -1136,7 +1136,7 @@ 80,-1 1 - 30000 + 300000 wxALL|wxALIGN_CENTRE_VERTICAL 3 @@ -1160,9 +1160,9 @@ - TIFF - JPEG - PNG + TIFF + JPEG + PNG 0 @@ -1194,9 +1194,9 @@ None - Packbits - LZW - Deflate + Packbits + LZW + Deflate wxALIGN_CENTRE_VERTICAL @@ -1219,8 +1219,8 @@ - EXR - TIFF + EXR + TIFF 0 @@ -1241,9 +1241,9 @@ None - Packbits - LZW - Deflate + Packbits + LZW + Deflate wxALL|wxALIGN_CENTRE_VERTICAL diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/pref_dialog.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/pref_dialog.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/pref_dialog.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/pref_dialog.xrc 2019-02-02 10:11:00.000000000 +0000 @@ -34,7 +34,7 @@ - + wxALL|wxALIGN_CENTRE_VERTICAL 5 @@ -66,7 +66,7 @@ - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL 5 @@ -159,6 +159,89 @@ wxALL|wxEXPAND 5 + + + + wxVERTICAL + + + + + + + wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL + 3 + + + + (leave empty for OS default) + + + wxALL|wxEXPAND + 3 + + + + + + wxALL + 3 + + + + + + wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL + 3 + + + + (leave empty for OS default) + + + wxALL|wxEXPAND + 3 + + + + + + wxALL + 3 + + + + + + wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL + 3 + + + + (leave empty for OS default) + + + wxALL|wxEXPAND + 3 + + + + + + wxALL + 3 + + 3 + 3 + 1 + + wxALL|wxEXPAND + 3 + + + wxALL|wxEXPAND + 5 + @@ -418,7 +501,7 @@ gamma 2.2 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL 5 @@ -762,9 +845,9 @@ wxALL|wxALIGN_CENTRE_VERTICAL - TIFF - JPEG - PNG + TIFF + JPEG + PNG 0 default output format for final panorama @@ -783,9 +866,9 @@ None - Packbits - LZW - Deflate + Packbits + LZW + Deflate 0 default TIFF compression @@ -872,8 +955,8 @@ - PTBatcherGUI - Hugin_stitch_project + PTBatcherGUI + Hugin_stitch_project 0 The engine that will run the stitch @@ -1190,7 +1273,7 @@ - + Use video card GPU to speed up remapping wxLEFT|wxEXPAND @@ -1200,7 +1283,7 @@ wxEXPAND - + wxVERTICAL wxALL|wxEXPAND @@ -1270,7 +1353,7 @@ +Do not set -w, -o and --compression arguments, they are set by hugin. wxBOTTOM|wxLEFT|wxEXPAND 10 @@ -1349,7 +1432,7 @@ +Do not set -w, -o and --compression arguments, they are set by hugin. wxBOTTOM|wxLEFT 10 @@ -1412,7 +1495,7 @@ large - wxALL|wxEXPAND + wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL 5 diff -Nru hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc --- hugin-2018.0.0+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc 2018-01-13 07:52:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/hugin/xrc/preview_frame.xrc 2018-12-24 14:21:42.000000000 +0000 @@ -202,7 +202,7 @@ - + wxALIGN_CENTRE_VERTICAL|wxRIGHT 6 @@ -224,7 +224,7 @@ - + wxALIGN_CENTRE_VERTICAL 1,5 @@ -388,10 +388,36 @@ 0 -32767 32768 + wxALIGN_CENTRE_VERTICAL + + + + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL + 5 + + + + 30,-1 + + + wxALIGN_CENTRE_VERTICAL + + + + 0 + -32767 + 32768 + + + wxRIGHT|wxALIGN_CENTRE_VERTICAL + 5 + + + data/preview_white_balance.png @@ -439,7 +465,7 @@ 5 - #000000 + #000000 @@ -449,7 +475,6 @@ 4 - Preview panorama data/gl_preview_small.png @@ -537,7 +562,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL 4 @@ -750,7 +775,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL 5 @@ -765,7 +790,7 @@ - + wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL 5 @@ -805,7 +830,6 @@ 5 - Move the panorama or drag images into position data/drag_tool_small.png @@ -952,7 +976,6 @@ 5 - Change the panorama's cropping region data/crop_tool_small.png diff -Nru hugin-2018.0.0+dfsg/src/hugin1/icpfind/AutoCtrlPointCreator.cpp hugin-2019.0.0+dfsg/src/hugin1/icpfind/AutoCtrlPointCreator.cpp --- hugin-2018.0.0+dfsg/src/hugin1/icpfind/AutoCtrlPointCreator.cpp 2017-04-22 17:03:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/icpfind/AutoCtrlPointCreator.cpp 2019-03-09 08:36:00.000000000 +0000 @@ -48,7 +48,7 @@ #include "base_wx/huginConfig.h" #include "base_wx/wxPlatform.h" #include -#ifdef __WXMSW__ +#if defined __WXMSW__ || defined UNIX_SELF_CONTAINED_BUNDLE #include #endif @@ -169,7 +169,7 @@ if(!bundled.IsEmpty()) return bundled; #else -#ifdef __WXMSW__ +#if defined __WXMSW__ || defined UNIX_SELF_CONTAINED_BUNDLE wxFileName prog(progName); if(prog.IsAbsolute()) { @@ -203,7 +203,7 @@ else { wxPathList pathlist; -#ifdef __WXMSW__ +#if defined __WXMSW__ || defined UNIX_SELF_CONTAINED_BUNDLE const wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); pathlist.Add(exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR)); #endif @@ -224,6 +224,19 @@ return canStart; }; +wxString GetCheckedTempDir() +{ + wxString tempDir = wxConfigBase::Get()->Read(wxT("tempDir"), wxT("")); + if (!tempDir.IsEmpty()) + { + if (tempDir.Last() != wxFileName::GetPathSeparator()) + { + tempDir.Append(wxFileName::GetPathSeparator()); + }; + }; + return tempDir; +}; + HuginBase::CPVector AutoCtrlPointCreator::automatch(CPDetectorSetting &setting, HuginBase::Panorama & pano, const HuginBase::UIntSet & imgs, int nFeatures, wxWindow *parent) { @@ -310,7 +323,7 @@ { if(setting.IsTwoStepDetector()) { - if(keyFiles.size()>0) + if(!keyFiles.empty()) { for(unsigned int i=0;i keyFiles(pano.getNrOfImages()); @@ -375,8 +396,8 @@ wxString autopanoArgs = setting.GetArgs(); // TODO: create a secure temporary filename here - wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); - autopanoArgs.Replace(wxT("%o"), ptofile); + wxString ptofile = wxFileName::CreateTempFileName(GetCheckedTempDir() + wxT("ap_res")); + autopanoArgs.Replace(wxT("%o"), hugin_utils::wxQuoteFilename(ptofile)); wxString tmp; tmp.Printf(wxT("%d"), nFeatures); autopanoArgs.Replace(wxT("%p"), tmp); @@ -407,9 +428,9 @@ wxString namefile_name; if (use_namefile) { // create temporary file with image names. - namefile_name = wxFileName::CreateTempFileName(wxT("ap_imgnames"), &namefile); + namefile_name = wxFileName::CreateTempFileName(GetCheckedTempDir() + wxT("ap_imgnames"), &namefile); DEBUG_DEBUG("before replace %namefile: " << autopanoArgs.mb_str(wxConvLocal)); - autopanoArgs.Replace(wxT("%namefile"), namefile_name); + autopanoArgs.Replace(wxT("%namefile"), hugin_utils::wxQuoteFilename(namefile_name)); DEBUG_DEBUG("after replace %namefile: " << autopanoArgs.mb_str(wxConvLocal)); for (HuginBase::UIntSet::const_iterator it = imgs.begin(); it != imgs.end(); ++it) { @@ -432,15 +453,24 @@ wxString ptoinfile_name; if (use_inputscript) { wxFile ptoinfile; - ptoinfile_name = wxFileName::CreateTempFileName(wxT("ap_inproj")); - autopanoArgs.Replace(wxT("%s"), ptoinfile_name); + ptoinfile_name = wxFileName::CreateTempFileName(GetCheckedTempDir() + ("ap_inproj")); + autopanoArgs.Replace(wxT("%s"), hugin_utils::wxQuoteFilename(ptoinfile_name)); std::ofstream ptoinstream(ptoinfile_name.mb_str(wxConvFile)); //delete all existing control points in temp project //otherwise the existing control points will be loaded again HuginBase::Panorama tempPano = pano.duplicate(); - HuginBase::CPVector emptyCPV; - tempPano.setCtrlPoints(emptyCPV); + // exception is when we can geocpset + // geocpset needs the other cp to work properly + if (detectorNeedsOtherCp) + { + oldCpsSize = tempPano.getNrOfCtrlPoints(); + } + else + { + HuginBase::CPVector emptyCPV; + tempPano.setCtrlPoints(emptyCPV); + }; tempPano.printPanoramaScript(ptoinstream, tempPano.getOptimizeVector(), tempPano.getOptions(), imgs, false); } @@ -486,6 +516,11 @@ // read and update control points cps = readUpdatedControlPoints((const char*)ptofile.mb_str(HUGIN_CONV_FILENAME), pano, imgs, !use_inputscript); + if (detectorNeedsOtherCp && oldCpsSize >= 0) + { + // for geocpset remove all old cps from the vector + cps.erase(cps.begin(), cps.begin() + oldCpsSize); + }; if (namefile_name != wxString(wxT(""))) { namefile.Close(); @@ -507,7 +542,7 @@ int nFeatures, std::vector &keyFiles, int & ret_value, wxWindow *parent) { HuginBase::CPVector cps; - if (imgs.size() == 0) + if (imgs.empty()) { return cps; } @@ -518,10 +553,6 @@ wxString generateKeysArgs=setting.GetArgs(); wxString matcherArgs = setting.GetArgsMatcher(); - wxString tempDir= wxConfigBase::Get()->Read(wxT("tempDir"),wxT("")); - if(!tempDir.IsEmpty()) - if(tempDir.Last()!=wxFileName::GetPathSeparator()) - tempDir.Append(wxFileName::GetPathSeparator()); //check arguments if(generateKeysArgs.Find(wxT("%i"))==wxNOT_FOUND || generateKeysArgs.Find(wxT("%k"))==wxNOT_FOUND) { @@ -537,6 +568,7 @@ }; ret_value=0; + const wxString tempDir = GetCheckedTempDir(); for (HuginBase::UIntSet::const_iterator img = imgs.begin(); img != imgs.end(); ++img) { if(keyFiles[*img].IsEmpty()) @@ -580,8 +612,8 @@ }; // TODO: create a secure temporary filename here - wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); - matcherArgs.Replace(wxT("%o"), ptofile); + wxString ptofile = wxFileName::CreateTempFileName(GetCheckedTempDir() + wxT("ap_res")); + matcherArgs.Replace(wxT("%o"), hugin_utils::wxQuoteFilename(ptofile)); wxString tmp; tmp.Printf(wxT("%d"), nFeatures); matcherArgs.Replace(wxT("%p"), tmp); @@ -669,10 +701,10 @@ imgFiles.append(" ").append(hugin_utils::quoteFilename(pano.getImage(*it).getFilename())); } - wxString ptofilepath = wxFileName::CreateTempFileName(wxT("ap_res")); + wxString ptofilepath = wxFileName::CreateTempFileName(GetCheckedTempDir() + wxT("ap_res")); wxFileName ptofn(ptofilepath); wxString ptofile = ptofn.GetFullName(); - autopanoArgs.Replace(wxT("%o"), ptofile); + autopanoArgs.Replace(wxT("%o"), hugin_utils::wxQuoteFilename(ptofile)); wxString tmp; tmp.Printf(wxT("%d"), nFeatures); autopanoArgs.Replace(wxT("%p"), tmp); @@ -776,7 +808,7 @@ int nFeatures, int & ret_value, wxWindow *parent) { HuginBase::CPVector cps; - if (imgs.size() == 0) { + if (imgs.empty()) { return cps; }; std::vector stack_images; @@ -847,7 +879,7 @@ { AutoPanoSift matcher; HuginBase::CPVector new_cps = matcher.automatch(stack_setting, pano, images_stack, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps); if(ret_value!=0) return cps; @@ -885,7 +917,7 @@ new_cps=matcher.automatch(setting, pano, ImagePair, nFeatures, keyFiles, ret_value, parent); else new_cps=matcher.automatch(setting, pano, ImagePair, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps); if(ret_value!=0) { @@ -919,7 +951,7 @@ new_cps=matcher.automatch(setting, optPano, ImagesGroups, nFeatures, keyFiles, ret_value, parent); else new_cps=matcher.automatch(setting, optPano, ImagesGroups, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps,&optPano); if(ret_value!=0) { @@ -1002,7 +1034,7 @@ new_cps=matcher.automatch(newSetting, optPano, imgs, nFeatures, keyFiles, ret_value, parent); else new_cps=matcher.automatch(newSetting, optPano, imgs, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps); }; Cleanup(setting, pano, imgs, keyFiles, parent); @@ -1013,7 +1045,7 @@ int nFeatures, int & ret_value, wxWindow *parent) { HuginBase::CPVector cps; - if (imgs.size() == 0) { + if (imgs.empty()) { return cps; }; std::vector stack_images; @@ -1076,7 +1108,7 @@ { AutoPanoSift matcher; HuginBase::CPVector new_cps = matcher.automatch(stack_setting, pano, images_stack, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps); if(ret_value!=0) { @@ -1093,13 +1125,13 @@ HuginBase::UIntSet allImgs; fill_set(allImgs, 0, pano.getNrOfImages()-1); HuginBase::Panorama newPano = pano.getSubset(allImgs); - if(cps.size()>0) + if(!cps.empty()) for (HuginBase::CPVector::const_iterator it = cps.begin(); it != cps.end(); ++it) newPano.addCtrlPoint(*it); AutoPanoSiftMultiRow matcher; HuginBase::CPVector new_cps = matcher.automatch(setting, newPano, images_layer, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps); }; return cps; @@ -1166,7 +1198,7 @@ new_cps=matcher.automatch(setting, pano, images, nFeatures, keyFiles, ret_value, parent); else new_cps=matcher.automatch(setting, pano, images, nFeatures, ret_value, parent); - if(new_cps.size()>0) + if(!new_cps.empty()) AddControlPointsWithCheck(cps,new_cps); if(ret_value!=0) { diff -Nru hugin-2018.0.0+dfsg/src/hugin1/icpfind/CPDetectorConfig.cpp hugin-2019.0.0+dfsg/src/hugin1/icpfind/CPDetectorConfig.cpp --- hugin-2018.0.0+dfsg/src/hugin1/icpfind/CPDetectorConfig.cpp 2017-04-22 17:03:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/icpfind/CPDetectorConfig.cpp 2019-01-10 18:34:07.000000000 +0000 @@ -25,6 +25,11 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +// Mingw define still DIFFERENCE, which conflicts with vigra, so disable it +#undef DIFFERENCE +#endif #include "icpfind/CPDetectorConfig.h" #include "hugin_config.h" #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/icpfind/icpfind.cpp hugin-2019.0.0+dfsg/src/hugin1/icpfind/icpfind.cpp --- hugin-2018.0.0+dfsg/src/hugin1/icpfind/icpfind.cpp 2015-10-23 23:18:02.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/icpfind/icpfind.cpp 2018-03-13 20:52:38.000000000 +0000 @@ -33,6 +33,9 @@ #include #include #include "hugin/config_defaults.h" +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) +#include "base_wx/wxPlatform.h" +#endif extern "C" { @@ -41,6 +44,9 @@ void iCPApp::ReadDetectorConfig() { +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) + CheckConfigFilename(); +#endif wxConfig config(wxT("hugin")); //read cp detectors settings CPDetectorConfig cpdetector_config; @@ -130,7 +136,7 @@ HuginBase::CPVector cps = matcher.automatch(m_cpsetting,pano,imgs,m_matches,NULL); PT_setProgressFcn(NULL); PT_setInfoDlgFcn(NULL); - if(cps.size()==0) + if(cps.empty()) { return 1; }; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/Batch.cpp hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/Batch.cpp --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/Batch.cpp 2017-04-22 17:03:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/Batch.cpp 2019-03-13 19:19:19.000000000 +0000 @@ -24,12 +24,21 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "Batch.h" #include #ifdef __WXMSW__ #include +#ifdef _MSC_VER #pragma comment(lib, "PowrProf.lib") #endif +#endif +#include +#ifndef __WXMSW__ +#include +#endif BEGIN_EVENT_TABLE(Batch, wxFrame) EVT_END_PROCESS(-1, Batch::OnProcessTerminate) @@ -89,8 +98,8 @@ { wxFileName projectName(projectFile); wxFileName outName(outputFile); - projectName.Normalize(); - outName.Normalize(); + projectName.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_ENV_VARS); + outName.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_ENV_VARS); if(outputFile.Cmp(_T(""))!=0 || target==Project::DETECTING) { @@ -860,7 +869,7 @@ { bool value; bool repeat = true; - unsigned int i; + int i; while(((i=GetFirstAvailable())!=-1) && repeat) { //execute command line instructions @@ -880,6 +889,11 @@ } else { + if (m_projList.Item(i).status == Project::MISSING) + { + // skip non-existing project files + continue; + }; m_projList.Item(i).status=Project::RUNNING; m_running = true; if(m_projList.Item(i).target==Project::STITCHING) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/BatchFrame.cpp hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/BatchFrame.cpp --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/BatchFrame.cpp 2018-01-26 16:28:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/BatchFrame.cpp 2019-03-13 19:34:01.000000000 +0000 @@ -31,7 +31,9 @@ #include "FailedProjectsDialog.h" #ifdef __WXMSW__ #include +#ifdef _MSC_VER #pragma comment(lib, "PowrProf.lib") +#endif #if wxCHECK_VERSION(3,1,0) #include #endif @@ -472,7 +474,6 @@ void BatchFrame::AddToList(wxString aFile,Project::Target target) { - wxFileName name(aFile); m_batch->AddProjectToBatch(aFile,wxT(""),target); wxString s; switch(target) @@ -1041,36 +1042,42 @@ void BatchFrame::OnCheckOverwrite(wxCommandEvent& event) { + wxConfigBase* config=wxConfigBase::Get(); if(event.IsChecked()) { m_batch->overwrite = true; - wxConfigBase::Get()->Write(wxT("/BatchFrame/OverwriteCheck"), 1l); + config->Write(wxT("/BatchFrame/OverwriteCheck"), 1l); } else { m_batch->overwrite = false; - wxConfigBase::Get()->Write(wxT("/BatchFrame/OverwriteCheck"), 0l); + config->Write(wxT("/BatchFrame/OverwriteCheck"), 0l); } + config->Flush(); } void BatchFrame::OnChoiceEnd(wxCommandEvent& event) { m_batch->atEnd = static_cast((size_t)m_endChoice->GetClientData(event.GetSelection())); - wxConfigBase::Get()->Write(wxT("/BatchFrame/AtEnd"), static_cast(m_batch->atEnd)); + wxConfigBase* config=wxConfigBase::Get(); + config->Write(wxT("/BatchFrame/AtEnd"), static_cast(m_batch->atEnd)); + config->Flush(); } void BatchFrame::OnCheckVerbose(wxCommandEvent& event) { + wxConfigBase* config=wxConfigBase::Get(); if(event.IsChecked()) { m_batch->verbose = true; - wxConfigBase::Get()->Write(wxT("/BatchFrame/VerboseCheck"), 1l); + config->Write(wxT("/BatchFrame/VerboseCheck"), 1l); } else { m_batch->verbose = false; - wxConfigBase::Get()->Write(wxT("/BatchFrame/VerboseCheck"), 0l); - } + config->Write(wxT("/BatchFrame/VerboseCheck"), 0l); + }; + config->Flush(); m_batch->ShowOutput(m_batch->verbose); } @@ -1395,7 +1402,9 @@ void BatchFrame::OnMinimizeTrayMenu(wxCommandEvent& event) { UpdateTrayIcon(event.IsChecked()); - wxConfigBase::Get()->Write(wxT("/BatchFrame/minimizeTray"), event.IsChecked()); + wxConfigBase* config=wxConfigBase::Get(); + config->Write(wxT("/BatchFrame/minimizeTray"), event.IsChecked()); + config->Flush(); } void BatchFrame::UpdateTrayIcon(const bool createTrayIcon) diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/Batch.h hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/Batch.h --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/Batch.h 2016-03-20 14:43:03.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/Batch.h 2018-12-22 12:06:48.000000000 +0000 @@ -29,10 +29,6 @@ #include #include "ProjectArray.h" -#include -#ifndef __WXMSW__ -#include -#endif #include "RunStitchFrame.h" #if wxCHECK_VERSION(3,1,0) #include diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.cpp hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.cpp --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.cpp 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.cpp 2019-01-27 09:53:22.000000000 +0000 @@ -32,6 +32,10 @@ #include "hugin_utils/alphanum.h" #include "hugin/config_defaults.h" #include "wx/mstream.h" +#ifdef _WIN32 +// workaround for a conflict between exiv2 and wxWidgets/CMake built +#define HAVE_PID_T 1 +#endif #include "exiv2/exiv2.hpp" #include "exiv2/preview.hpp" #ifdef _WIN32 @@ -166,6 +170,7 @@ m_thumbs = new wxImageList(THUMBSIZE, THUMBSIZE, true, 0); m_thumbsList = XRCCTRL(*this, "find_pano_selected_thumbslist", wxListCtrl); m_thumbsList->SetImageList(m_thumbs, wxIMAGE_LIST_NORMAL); + m_thumbsList->Bind(wxEVT_MOTION, &FindPanoDialog::OnListMouseMove, this); #ifdef _WIN32 // default image spacing is too big, wxWidgets does not provide direct // access to the spacing, so using the direct API function @@ -206,13 +211,10 @@ void FindPanoDialog::CleanUpPanolist() { - if(m_panos.size()>0) + while(!m_panos.empty()) { - while(!m_panos.empty()) - { - delete m_panos.back(); - m_panos.pop_back(); - }; + delete m_panos.back(); + m_panos.pop_back(); }; }; @@ -232,10 +234,10 @@ void FindPanoDialog::OnButtonClose(wxCommandEvent& e) { - if(m_panos.size()>0) + if(!m_panos.empty()) { if(wxMessageBox(_("The list contains possibly unprocessed panoramas.\nIf you close the dialog, you will lose them.\nContinue anyway?"), - _("Question"),wxYES_NO|wxICON_QUESTION,this)==wxNO) + _("Question"),wxYES_NO|wxICON_WARNING,this)==wxNO) { return; }; @@ -267,10 +269,10 @@ m_start_dir=m_textctrl_dir->GetValue(); if(wxDir::Exists(m_start_dir)) { - if(m_panos.size()>0) + if(!m_panos.empty()) { - if(wxMessageBox(_("The list contains still not yet processed panoramas.\nIf you continue, they will be disregarded.\nDo you still want to continue?"), - _("Question"),wxYES_NO|wxICON_QUESTION,this)==wxNO) + if (wxMessageBox(_("The list contains still not yet processed panoramas.\nIf you continue, they will be disregarded.\nDo you still want to continue?"), + _("Question"),wxYES_NO|wxICON_WARNING,this)==wxNO) { return; }; @@ -298,7 +300,7 @@ void FindPanoDialog::OnButtonSend(wxCommandEvent& e) { - if(m_panos.size()==0) + if(m_panos.empty()) { return; } @@ -360,7 +362,7 @@ XRCCTRL(*this, "find_pano_selected_lens", wxStaticText)->SetLabel(m_panos[selected]->GetLensName()); XRCCTRL(*this, "find_pano_selected_focallength", wxStaticText)->SetLabel(m_panos[selected]->GetFocalLength()); XRCCTRL(*this, "find_pano_selected_date_time", wxStaticText)->SetLabel(m_panos[selected]->GetStartString() + wxT(" (")+ m_panos[selected]->GetDuration() + wxT(")")); - m_panos[selected]->PopulateListCtrl(m_thumbsList, m_thumbs); + m_panos[selected]->PopulateListCtrl(m_thumbsList, m_thumbs, m_tooltips); } else { @@ -370,6 +372,7 @@ XRCCTRL(*this, "find_pano_selected_date_time", wxStaticText)->SetLabel(wxEmptyString); m_thumbsList->DeleteAllItems(); m_thumbs->RemoveAll(); + m_tooltips.Clear(); }; }; @@ -453,7 +456,25 @@ }; }; }; -} +} + +void FindPanoDialog::OnListMouseMove(wxMouseEvent & e) +{ + if (m_tooltips.IsEmpty()) + { + return; + } + int flags; + long item = m_thumbsList->HitTest(e.GetPosition(), flags); + if (item != wxNOT_FOUND && (flags&wxLIST_HITTEST_ONITEM) && item < m_tooltips.GetCount()) + { + m_thumbsList->SetToolTip(m_tooltips[item]); + } + else + { + m_thumbsList->UnsetToolTip(); + }; +}; int SortWxFilenames(const wxString& s1,const wxString& s2) { @@ -536,7 +557,7 @@ //allow processing events wxGetApp().Yield(true); }; - if(!m_stopped && newPanos.size()>0) + if(!m_stopped && !newPanos.empty()) { for(size_t i=0; iSetLabel(_("Start")); EnableButtons(true); //enable send button if at least one panorama found - m_button_send->Enable(m_panos.size()>0); - if(m_panos.size()>0) + m_button_send->Enable(!m_panos.empty()); + if(!m_panos.empty()) { m_statustext->SetLabel(wxString::Format(_("Found %d possible panoramas."), static_cast(m_panos.size()))); } @@ -777,9 +798,21 @@ return wxEmptyString; }; //generate panorama + double redBalanceAnchor = (*m_images.begin())->getExifRedBalance(); + double blueBalanceAnchor = (*m_images.begin())->getExifBlueBalance(); + if (fabs(redBalanceAnchor)<1e-2) + { + redBalanceAnchor = 1; + }; + if (fabs(blueBalanceAnchor)<1e-2) + { + blueBalanceAnchor = 1; + }; HuginBase::Panorama pano; for(ImageSet::iterator it=m_images.begin(); it!=m_images.end(); ++it) { + (*it)->setWhiteBalanceRed((*it)->getExifRedBalance() / redBalanceAnchor); + (*it)->setWhiteBalanceBlue((*it)->getExifBlueBalance() / blueBalanceAnchor); pano.addImage(*(*it)); }; //assign all images the same lens number @@ -787,28 +820,9 @@ HuginBase::ImageVariableGroup& lenses = variable_groups.getLenses(); if(pano.getNrOfImages()>1) { - double redBalanceAnchor=pano.getImage(pano.getOptions().colorReferenceImage).getExifRedBalance(); - double blueBalanceAnchor=pano.getImage(pano.getOptions().colorReferenceImage).getExifBlueBalance(); - if(fabs(redBalanceAnchor)<1e-2) - { - redBalanceAnchor=1; - }; - if(fabs(blueBalanceAnchor)<1e-2) - { - blueBalanceAnchor=1; - }; for(unsigned int i=1; iDeleteAllItems(); thumbs->RemoveAll(); + tooltips.Clear(); wxBusyCursor cursor; for (ImageSet::iterator it = m_images.begin(); it != m_images.end(); ++it) { @@ -981,6 +1000,27 @@ x = (THUMBSIZE - newWidth) / 2; y = 0; } + // rotate according to orientation tag + if ((*it)->getRoll() == 90) + { + rawImage = rawImage.Rotate90(); + std::swap(x, y); + } + else + { + if ((*it)->getRoll() == 270) + { + rawImage = rawImage.Rotate90(false); + std::swap(x, y); + } + else + { + if ((*it)->getRoll() == 180) + { + rawImage = rawImage.Rotate180(); + }; + }; + }; // create final bitmap with centered thumbnail wxBitmap bitmap(THUMBSIZE, THUMBSIZE); wxMemoryDC dc(bitmap); @@ -999,6 +1039,10 @@ // create item in thumb list wxFileName fn(wxString((*it)->getFilename().c_str(), HUGIN_CONV_FILENAME)); list->InsertItem(list->GetItemCount(), fn.GetFullName(), index); + // build tooltip text + tooltips.Add(fn.GetFullName() + "\n" + FormatString::GetAperture(*it) + ", " + + FormatString::GetExposureTime(*it) + ", " + _("ISO") + FormatString::GetIso(*it) + + "\n" + FormatString::GetExifDateTime(*it)); }; }; diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.h hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.h --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.h 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/FindPanoDialog.h 2019-01-27 09:04:55.000000000 +0000 @@ -74,6 +74,8 @@ void OnRemoveImage(wxCommandEvent &e); /** event handler to split into 2 panos */ void OnSplitPanos(wxCommandEvent &e); + /** mouse move handler for tooltips */ + void OnListMouseMove(wxMouseEvent &e); private: BatchFrame* m_batchframe; @@ -93,6 +95,7 @@ wxSpinCtrl* m_sc_maxTimeDiff; wxImageList* m_thumbs; wxListCtrl* m_thumbsList; + wxArrayString m_tooltips; wxChoice* m_ch_blender; std::vector m_panos; @@ -157,7 +160,7 @@ /** returns the duration as string */ wxString GetDuration(); /** add all images to wxListCtrl */ - void PopulateListCtrl(wxListCtrl* list, wxImageList* thumbs); + void PopulateListCtrl(wxListCtrl* list, wxImageList* thumbs, wxArrayString& tooltips); /** removes the image at given index */ void RemoveImage(const unsigned int index); /** split pano into 2 subpanos, index is used as first image of second pano diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/ProjectArray.cpp hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/ProjectArray.cpp --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/ProjectArray.cpp 2015-10-23 21:31:12.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/ProjectArray.cpp 2018-12-22 15:40:49.000000000 +0000 @@ -24,6 +24,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "ProjectArray.h" #include #include "base_wx/huginConfig.h" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/ProjectListBox.cpp hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/ProjectListBox.cpp --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/ProjectListBox.cpp 2017-04-22 17:03:06.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/ProjectListBox.cpp 2018-12-22 15:40:55.000000000 +0000 @@ -24,6 +24,9 @@ * */ +#ifdef _WIN32 +#include "wx/msw/wrapwin.h" +#endif #include "ProjectListBox.h" enum diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI.cpp 2019-03-13 19:34:22.000000000 +0000 @@ -26,7 +26,7 @@ #include "PTBatcherGUI.h" #include -#ifdef __WXMSW__ +#if defined __WXMSW__ || defined UNIX_SELF_CONTAINED_BUNDLE #include #endif #include "lensdb/LensDB.h" @@ -63,6 +63,9 @@ #endif // Required to access the preferences of hugin SetAppName(wxT("hugin")); +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) + CheckConfigFilename(); +#endif // need to explicitly initialize locale for C++ library/runtime setlocale(LC_ALL, ""); @@ -99,6 +102,18 @@ } } + +#elif defined UNIX_SELF_CONTAINED_BUNDLE + // initialize paths + { + wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); + exePath.RemoveLastDir(); + const wxString huginRoot(exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR)); + m_xrcPrefix = huginRoot + wxT("share/hugin/xrc/"); + + // locale setup + m_locale.AddCatalogLookupPathPrefix(huginRoot + wxT("share/locale")); + } #else // add the locale directory specified during configure m_xrcPrefix = wxT(INSTALL_XRC_DIR); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI_rc.rc hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI_rc.rc --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI_rc.rc 2011-07-17 08:39:25.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/PTBatcherGUI_rc.rc 2018-02-23 16:15:35.000000000 +0000 @@ -7,9 +7,4 @@ AppIcon ICON "../hugin/xrc/data/ptbatcher.ico" IDI_ICON1 ICON "../hugin/xrc/data/ptbatcher.ico" -// set this to 1 if you don't want to use manifest resource (manifest resource -// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt -// for more information) -#define wxUSE_NO_MANIFEST 1 - #include "wx/msw/wx.rc" diff -Nru hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/RunStitchFrame.h hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/RunStitchFrame.h --- hugin-2018.0.0+dfsg/src/hugin1/ptbatcher/RunStitchFrame.h 2015-10-23 21:21:18.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/ptbatcher/RunStitchFrame.h 2018-12-22 15:41:17.000000000 +0000 @@ -26,13 +26,13 @@ #ifndef RUNSTITCHFRAME_H #define RUNSTITCHFRAME_H +#include "base_wx/platform.h" #include "panoinc_WX.h" #include #include "base_wx/RunStitchPanel.h" #include "base_wx/huginConfig.h" -#include "base_wx/platform.h" // somewhere SetDesc gets defined.. this breaks wx/cmdline.h on OSX #ifdef SetDesc diff -Nru hugin-2018.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project.cpp hugin-2019.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project.cpp --- hugin-2018.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project.cpp 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project.cpp 2018-11-02 15:26:26.000000000 +0000 @@ -29,7 +29,7 @@ #include "panoinc.h" #include -#ifdef __WXMSW__ +#if defined __WXMSW__ || defined UNIX_SELF_CONTAINED_BUNDLE #include #endif @@ -265,6 +265,9 @@ { // Required to access the preferences of hugin SetAppName(wxT("hugin")); +#if defined __WXGTK__ && wxCHECK_VERSION(3,1,1) + CheckConfigFilename(); +#endif // need to explicitly initialize locale for C++ library/runtime setlocale(LC_ALL, ""); @@ -283,6 +286,15 @@ // locale setup m_locale.AddCatalogLookupPathPrefix(exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + wxT("share\\locale")); +#elif defined UNIX_SELF_CONTAINED_BUNDLE + // initialize paths + { + wxFileName exePath(wxStandardPaths::Get().GetExecutablePath()); + exePath.RemoveLastDir(); + const wxString huginRoot=exePath.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); + // add the locale directory specified during configure + m_locale.AddCatalogLookupPathPrefix(huginRoot + wxT("share/locale")); + } #else // add the locale directory specified during configure m_locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR)); diff -Nru hugin-2018.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project_rc.rc hugin-2019.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project_rc.rc --- hugin-2018.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project_rc.rc 2011-07-17 08:39:25.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin1/stitch_project/hugin_stitch_project_rc.rc 2018-02-23 16:15:35.000000000 +0000 @@ -7,10 +7,5 @@ AppIcon ICON "../hugin/xrc/data/hugin.ico" IDI_ICON1 ICON "../hugin/xrc/data/hugin.ico" -// set this to 1 if you don't want to use manifest resource (manifest resource -// is needed to enable visual styles on Windows XP - see docs/msw/winxp.txt -// for more information) -#define wxUSE_NO_MANIFEST 1 - #include "wx/msw/wx.rc" diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/algorithms/basic/LayerStacks.cpp hugin-2019.0.0+dfsg/src/hugin_base/algorithms/basic/LayerStacks.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/algorithms/basic/LayerStacks.cpp 2016-03-17 20:58:36.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/algorithms/basic/LayerStacks.cpp 2018-12-18 18:38:39.000000000 +0000 @@ -46,8 +46,21 @@ // overlap calculation if (opts.outputStacksMinOverlap < 0) { + // first get all stacks HuginBase::ConstStandardImageVariableGroups variable_groups(pano); - return variable_groups.getStacks().getPartsSet(); + std::vector allStacks = variable_groups.getStacks().getPartsSet(); + std::vector activeStacks; + for (const auto& singleStack : allStacks) + { + // now check that each stack contains only active images + UIntSet activeImgsInStack; + std::set_intersection(singleStack.begin(), singleStack.end(), allImgs.begin(), allImgs.end(), std::inserter(activeImgsInStack, activeImgsInStack.begin())); + if (!activeImgsInStack.empty()) + { + activeStacks.push_back(activeImgsInStack); + }; + } + return activeStacks; }; UIntSet stack; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/algorithms/control_points/CleanCP.cpp hugin-2019.0.0+dfsg/src/hugin_base/algorithms/control_points/CleanCP.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/algorithms/control_points/CleanCP.cpp 2017-04-22 17:03:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/algorithms/control_points/CleanCP.cpp 2018-02-03 14:34:25.000000000 +0000 @@ -187,7 +187,7 @@ { HuginBase::UIntSet cps; HuginBase::CPVector cpList=pano.getCtrlPoints(); - if(cpList.size()>0) + if(!cpList.empty()) { for(unsigned int i=0;i0) + if(!masks.empty()) { unsigned int j=0; while((!insideMask) && (j0) + if(!masks.empty()) { unsigned int j=0; while((!insideMask) && (j 0); + assert(!m_vars[i].imgs.empty()); // get corresponding image number unsigned j = *(m_vars[i].imgs.begin()); // get value @@ -137,7 +137,7 @@ for (size_t i=0; i < m_vars.size(); i++) { // TODO: transform some variables, such as the vignetting center! - assert(m_vars[i].imgs.size() > 0); + assert(!m_vars[i].imgs.empty()); // copy value int all images for (std::set::const_iterator it = m_vars[i].imgs.begin(); it != m_vars[i].imgs.end(); ++it) diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp hugin-2019.0.0+dfsg/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp 2016-03-18 18:36:53.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp 2018-02-03 14:34:25.000000000 +0000 @@ -184,7 +184,7 @@ //std::cout << "result:" << std::endl; //pano->printPanoramaScript(std::cerr, m_localPano->getOptimizeVector(), pano->getOptions(), imgs, true ); - if (m_opt_second_pass.size() > 0) { + if (!m_opt_second_pass.empty()) { m_localPano->setOptimizeVector(m_opt_second_pass); //std::cout << "Optimizing with hfov" << std::endl; //pano->printPanoramaScript(std::cerr, m_localPano->getOptimizeVector(), pano->getOptions(), imgs, true ); diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/appbase/DocumentData.h hugin-2019.0.0+dfsg/src/hugin_base/appbase/DocumentData.h --- hugin-2018.0.0+dfsg/src/hugin_base/appbase/DocumentData.h 2011-07-17 08:39:26.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/appbase/DocumentData.h 2018-10-06 07:18:41.000000000 +0000 @@ -48,7 +48,7 @@ public: - enum ReadWriteError { SUCCESSFUL=-1, UNKNOWN_ERROR, INCOMPATIBLE_TYPE, INVALID_DATA, PARCER_ERROR }; + enum ReadWriteError { SUCCESSFUL=-1, UNKNOWN_ERROR, INCOMPATIBLE_TYPE, INVALID_DATA, PARSER_ERROR }; virtual ReadWriteError readData(std::istream& dataInput, std::string documentType = "") =0; virtual ReadWriteError writeData(std::ostream& dataOutput, std::string documentType = "") =0; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/CMakeLists.txt hugin-2019.0.0+dfsg/src/hugin_base/CMakeLists.txt --- hugin-2018.0.0+dfsg/src/hugin_base/CMakeLists.txt 2017-12-10 09:30:50.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/CMakeLists.txt 2018-11-12 17:13:46.000000000 +0000 @@ -29,7 +29,6 @@ hugin_math/Vector3.cpp hugin_utils/alphanum.cpp hugin_utils/utils.cpp -hugin_utils/platform.cpp lensdb/LensDB.cpp lines/FindLines.cpp lines/FindN8Lines.cpp @@ -92,6 +91,7 @@ hugin_math/Matrix3.h hugin_math/Vector3.h hugin_utils/alphanum.h +hugin_utils/filesystem.h hugin_utils/openmp_lock.h hugin_utils/platform.h hugin_utils/stl_utils.h diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/filesystem.h hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/filesystem.h --- hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/filesystem.h 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/filesystem.h 2018-02-16 16:01:55.000000000 +0000 @@ -0,0 +1,64 @@ +// -*- c-basic-offset: 4 -*- + +/** @file filesystem.cpp + * + * @brief wrapper around different filesystem headers + * + * + * @author T. Modes + * + */ + +/* This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software. If not, see + * . + * + */ + +#ifndef _HUGIN_UTILS_FILESYSTEM_H +#define _HUGIN_UTILS_FILESYSTEM_H +#include "hugin_config.h" +#ifdef HAVE_STD_FILESYSTEM + #include + #if defined _MSC_VER && _MSC_VER <= 1900 + // MSVC 2015 has implemented in std::tr2::sys + namespace fs = std::tr2::sys; + #define OVERWRITE_EXISTING std::tr2::sys::copy_options::overwrite_existing + #else + // MSVC 2017 is using experimental namespace + namespace fs = std::experimental::filesystem; + #define OVERWRITE_EXISTING std::experimental::filesystem::copy_options::overwrite_existing + #endif +#else + // use Boost::Filesystem as fallback + #define BOOST_FILESYSTEM_VERSION 3 + #ifdef __GNUC__ + #include + #if BOOST_VERSION<105700 + #if BOOST_VERSION>=105100 + // workaround a bug in boost filesystem + // boost filesystem is probably compiled with C++03 + // but Hugin is compiled with C++11, this results in + // conflicts in boost::filesystems at a enum + // see https://svn.boost.org/trac/boost/ticket/6779 + #define BOOST_NO_CXX11_SCOPED_ENUMS + #else + #define BOOST_NO_SCOPED_ENUMS + #endif + #endif + #endif + #include + namespace fs = boost::filesystem; + #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists +#endif +#endif // _HUGIN_UTILS_FILESYSTEM_H diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/platform.cpp hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/platform.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/platform.cpp 2015-05-10 06:52:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/platform.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -// -*- c-basic-offset: 4 -*- - -/** @file hugin_utils/platform.cpp - * - * @author Pablo d'Angelo - * - * $Id: utils.cpp 2570 2007-12-18 16:53:54Z dangelo $ - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this software. If not, see - * . - * - */ - -#include "platform.h" - - -#ifdef _WIN32 -#include "vigra/windows.h" -#elif defined(sun) || defined(__sun) || defined(__sun__) -#include -#else -#include -#include -#endif - -namespace hugin_utils { - -#ifdef _WIN32 - -int getCPUCount() -{ - SYSTEM_INFO si; - GetSystemInfo(&si); - return si.dwNumberOfProcessors; -} - -#else - -int getCPUCount() -{ - #ifdef HW_NCPU - // BSD and OSX like system - int mib[2]; - int numCPUs = 1; - size_t len = sizeof(numCPUs); - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - sysctl(mib, 2, &numCPUs, &len, 0, 0); - return numCPUs; - - #elif defined(_SC_NPROCESSORS_ONLN) - // Linux and Solaris - long nProcessorsOnline = sysconf(_SC_NPROCESSORS_ONLN); - return nProcessorsOnline; - #else - #warning sysconf or sysctl does not support quering the number of processors/cores. - return -1; - #endif -} - -#endif - -} //namespace diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/platform.h hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/platform.h --- hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/platform.h 2015-09-15 15:21:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/platform.h 2018-11-12 17:14:05.000000000 +0000 @@ -31,14 +31,6 @@ #include #include -#if 0 -// ?????????????????????????????????????????? -#ifdef MSVC -#define snprintf _snprintf -#endif -// ?????????????????????????????????????????? -#endif - // Platform identifiers #ifndef MAC_OS_X #if ((defined __APPLE__) && (defined __MACH__)) @@ -57,9 +49,6 @@ namespace hugin_utils { - /// return the CPU count. On error returns a cpu count of 0 or -1 - IMPEX int getCPUCount(); - /// utility function; escapes characters in replacements with quotechar. template str quoteStringInternal(const str & arg, const str & quotechar, diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/utils.cpp hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/utils.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/hugin_utils/utils.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/hugin_utils/utils.cpp 2019-01-26 16:55:26.000000000 +0000 @@ -48,14 +48,7 @@ #include #endif #include -#ifdef HAVE_STD_FILESYSTEM -#include -namespace fs = std::tr2::sys; -#else -#define BOOST_FILESYSTEM_VERSION 3 -#include -namespace fs = boost::filesystem; -#endif +#include #include #ifdef __APPLE__ @@ -413,23 +406,13 @@ #ifdef _WIN32 char buffer[MAX_PATH];//always use MAX_PATH for filepaths GetModuleFileName(NULL,buffer,sizeof(buffer)); - std::string working_path(buffer); - std::string data_path(""); - //remove filename - std::string::size_type pos=working_path.rfind("\\"); - if(pos!=std::string::npos) - { - working_path.erase(pos); - //remove last dir: should be bin - pos=working_path.rfind("\\"); - if(pos!=std::string::npos) - { - working_path.erase(pos); - //append path delimiter and path - working_path.append("\\share\\hugin\\data\\"); - data_path=working_path; - } - } + fs::path data_path(buffer); + data_path.remove_filename(); + if (data_path.has_parent_path()) + { + return (data_path.parent_path() / "share/hugin/data").string() + "\\"; + }; + return std::string(); #elif defined MAC_SELF_CONTAINED_BUNDLE char path[PATH_MAX + 1]; uint32_t size = sizeof(path); @@ -439,12 +422,41 @@ data_path=dirname(path); data_path.append("/../Resources/xrc/"); } + return data_path; +#elif defined UNIX_SELF_CONTAINED_BUNDLE + fs::path data_path = fs::read_symlink("/proc/self/exe"); + data_path.remove_filename(); + if (data_path.has_parent_path()) + { + return (data_path.parent_path() / "share/hugin/data").string() + "/"; + }; + return std::string(); #else - std::string data_path = (INSTALL_DATA_DIR); + return std::string(INSTALL_DATA_DIR); #endif - return data_path; }; +#ifndef _WIN32 +std::string GetHomeDir() +{ + char *homedir = getenv("HOME"); + struct passwd *pw; + if (homedir == NULL) + { + pw = getpwuid(getuid()); + if (pw != NULL) + { + homedir = pw->pw_dir; + }; + }; + if (homedir == NULL) + { + return std::string(); + }; + return std::string(homedir); +} +#endif + std::string GetUserAppDataDir() { fs::path path; @@ -457,25 +469,39 @@ path = fs::path(fullpath); path /= "hugin"; #else - char *homedir = getenv("HOME"); - struct passwd *pw; - if (homedir == NULL) - { - pw = getpwuid(getuid()); - if(pw != NULL) +#ifdef USE_XDG_DIRS + char *xdgDataDir = getenv("XDG_DATA_HOME"); + if (strlen(xdgDataDir) == 0) + { + // no XDG_DATA_HOME enviroment variable set + // use $HOME/.local/share instead + const std::string homeDir = GetHomeDir(); + if (homeDir.empty()) { - homedir = pw->pw_dir; + return std::string(); }; + path = fs::path(homeDir); + path /= ".local/share/hugin"; + } + else + { + // XDG_DATA_HOME set, use hugindata sub directory + path = fs::path(xdgDataDir); + path /= "hugin"; }; - if(homedir == NULL) +#else + // old behaviour, save in users home directory, sub-directory .hugindata + const std::string homeDir = GetHomeDir(); + if (homeDir.empty()) { return std::string(); }; - path = fs::path(homedir); + path = fs::path(homeDir); // we have already a file with name ".hugin" for our wxWidgets settings // therefore we use directory ".hugindata" in homedir path /= ".hugindata"; #endif +#endif if (!fs::exists(path)) { if (!fs::create_directories(path)) @@ -594,6 +620,91 @@ } #else +#if defined HAVE_EGL && HAVE_EGL +#include + +struct ContextSettings +{ + EGLDisplay m_display; + EGLContext m_context; +}; + +static ContextSettings context; + +static const EGLint configAttribs[] = { + EGL_BLUE_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_RED_SIZE, 8, + EGL_ALPHA_SIZE, 8, + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, + EGL_CONFORMANT, EGL_OPENGL_BIT, + EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER, + EGL_NONE +}; + +bool CreateContext(int *argcp, char **argv) +{ + // get display connection + context.m_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); + if (context.m_display == EGL_NO_DISPLAY) + { + std::cerr << "Could not connect to EGL_DEFAULT_DISPLAY" << std::endl; + return false; + }; + // initialize egl + EGLint major, minor; + if (eglInitialize(context.m_display, &major, &minor) != EGL_TRUE) + { + std::cerr << "Could not initialize EGL" << std::endl + << "Error: 0x" << std::hex << eglGetError() << std::endl; + return false; + }; + std::cout << "Init OpenGL ES " << major << "." << minor << std::endl; + std::cout << "Client API: " << eglQueryString(context.m_display, EGL_CLIENT_APIS) << std::endl + << "Vendor: " << eglQueryString(context.m_display, EGL_VENDOR) << std::endl + << "Version: " << eglQueryString(context.m_display, EGL_VERSION) << std::endl + << "EGL Extensions: " << eglQueryString(context.m_display, EGL_EXTENSIONS) << std::endl; + // bind OpenGL API (not OpenGL ES) + if (!eglBindAPI(EGL_OPENGL_API)) + { + std::cerr << "Could not bind OpenGL API" << std::endl + << "Error: 0x" << std::hex << eglGetError() << std::endl; + return false; + }; + // choose config + EGLint numConfigs; + EGLConfig egl_config; + if (eglChooseConfig(context.m_display, configAttribs, &egl_config, 1, &numConfigs) != EGL_TRUE) + { + std::cerr << "Cound not set egl config" << std::endl + << "Error: 0x" << std::hex << eglGetError() << std::endl; + return false; + }; + // create surface + // create context and make it current + context.m_context = eglCreateContext(context.m_display, egl_config, EGL_NO_CONTEXT, NULL); + if (context.m_context == EGL_NO_CONTEXT) + { + std::cerr << "Cound not create context" << std::endl + << "Error: 0x" << std::hex << eglGetError() << std::endl; + return false; + }; + if (eglMakeCurrent(context.m_display, EGL_NO_SURFACE, EGL_NO_SURFACE, context.m_context) != EGL_TRUE) + { + std::cerr << "Could not make current context" << std::endl + << "Error: 0x" << std::hex << eglGetError() << std::endl; + return false; + }; + return true; +} + +void DestroyContext() +{ + // terminate egl at end + eglTerminate(context.m_display); +}; + +#else #include #include #include @@ -685,6 +796,7 @@ }; }; #endif +#endif bool initGPU(int *argcp, char **argv) { diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/lensdb/LensDB.cpp hugin-2019.0.0+dfsg/src/hugin_base/lensdb/LensDB.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/lensdb/LensDB.cpp 2017-06-15 16:52:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/lensdb/LensDB.cpp 2018-04-22 16:08:25.000000000 +0000 @@ -2573,7 +2573,18 @@ { if (img0.getExifCropFactor() < 0.1f) { - lensDB.SaveCameraCrop(camMaker, camModel, img0.getCropFactor()); + double cropFactor = img0.getCropFactor(); + if (cropFactor == 1 && img0.getExifFocalLength() > 0) + { + // a cropfactor of 1 can also mean unknown crop factor + // so recalculate crop factor with HFOV and EXIF focal length + cropFactor = HuginBase::SrcPanoImage::calcCropFactor(img0.getProjection(), img0.getHFOV(), img0.getExifFocalLength(), img0.getSize()); + if (std::abs(cropFactor - 1) < 0.1) + { + cropFactor = 1; + }; + }; + lensDB.SaveCameraCrop(camMaker, camModel, cropFactor); }; // now check EMoR parameters const std::vector emor=img0.getEMoRParams(); diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/lines/FindLines.cpp hugin-2019.0.0+dfsg/src/hugin_base/lines/FindLines.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/lines/FindLines.cpp 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/lines/FindLines.cpp 2019-03-09 08:15:55.000000000 +0000 @@ -155,23 +155,81 @@ #define MAX_RESIZE_DIM 1600 -struct VerticalLine +//return footpoint of point p on line between point p1 and p2 +vigra::Point2D GetFootpoint(const vigra::Point2D& p, const vigra::Point2D& p1, const vigra::Point2D& p2, double& u) { - vigra::Point2D start; - vigra::Point2D end; + hugin_utils::FDiff2D diff = p2 - p1; + u = ((p.x - p1.x)*(p2.x - p1.x) + (p.y - p1.y)*(p2.y - p1.y)) / hugin_utils::sqr(hugin_utils::norm(diff)); + diff *= u; + return vigra::Point2D(p1.x + diff.x, p1.y + diff.y); }; -typedef std::vector VerticalLineVector; +vigra::Point2D GetFootpoint(const vigra::Point2D& p, const vigra::Point2D& p1, const vigra::Point2D& p2) +{ + double u; + return GetFootpoint(p, p1, p2, u); +}; -//return footpoint of point p on line between point p1 and p2 -vigra::Point2D GetFootpoint(vigra::Point2D p, vigra::Point2D p1, vigra::Point2D p2) +class VerticalLine { - hugin_utils::FDiff2D diff=p2-p1; - double u=((p.x-p1.x)*(p2.x-p1.x)+(p.y-p1.y)*(p2.y-p1.y))/hugin_utils::sqr(hugin_utils::norm(diff)); - diff*=u; - return vigra::Point2D(p1.x+diff.x,p1.y+diff.y); +public: + void SetStart(const vigra::Point2D point) + { + m_start = point; + }; + void SetStart(const int x, const int y) + { + m_start = vigra::Point2D(x, y); + }; + void SetEnd(const vigra::Point2D point) + { + m_end = point; + }; + void SetEnd(const int x, const int y) + { + m_end = vigra::Point2D(x, y); + }; + double GetLineLength() const + { + return (m_end - m_start).magnitude(); + }; + double GetEstimatedDistance(const VerticalLine& otherLine) const + { + auto getDist = [](const vigra::Point2D& p, const vigra::Point2D& p1, const vigra::Point2D& p2)->double + { + double t; + const vigra::Point2D endPoint = GetFootpoint(p, p1, p2, t); + if (-0.1 < t && t < 1.1) + { + return (endPoint - p).magnitude(); + } + else + { + return DBL_MAX; + }; + }; + return std::min({getDist(otherLine.GetStart(), m_start, m_end), getDist(otherLine.GetEnd(), m_start, m_end), + getDist(m_start, otherLine.GetStart(), otherLine.GetEnd()), getDist(m_end, otherLine.GetStart(), otherLine.GetEnd())}); + } + double GetAngle() const + { + return atan2(m_end.y - m_start.y, m_end.x - m_start.x); + }; + const vigra::Point2D& GetStart() const + { + return m_start; + }; + const vigra::Point2D& GetEnd() const + { + return m_end; + }; +private: + vigra::Point2D m_start; + vigra::Point2D m_end; }; +typedef std::vector VerticalLineVector; + //linear fit of given line, returns endpoints of fitted line VerticalLine FitLine(SingleLine line) { @@ -191,10 +249,8 @@ if(std::abs(s_x2-s_x*s_x)<0.00001) { //vertical line needs special treatment - vl.start.x=s_x; - vl.start.y=line.line[0].y; - vl.end.x=s_x; - vl.end.y=line.line[n-1].y; + vl.SetStart(s_x, line.line[0].y); + vl.SetEnd(s_x, line.line[n - 1].y); } else { @@ -205,8 +261,8 @@ vigra::Point2D p1(0,offset); vigra::Point2D p2(100,100*slope+offset); //calculate footpoint of first and last point - vl.start=GetFootpoint(line.line[0],p1,p2); - vl.end=GetFootpoint(line.line[n-1],p1,p2); + vl.SetStart(GetFootpoint(line.line[0], p1, p2)); + vl.SetEnd(GetFootpoint(line.line[n - 1], p1, p2)); }; return vl; }; @@ -216,19 +272,44 @@ VerticalLineVector FilterLines(Lines lines,double roll) { VerticalLineVector vertLines; - if(lines.size()>0) + if(!lines.empty()) { for(Lines::const_iterator it=lines.begin(); it!=lines.end(); ++it) { if((*it).status==valid_line && (*it).line.size()>2) { VerticalLine vl=FitLine(*it); - vigra::Diff2D diff=vl.end-vl.start; + const vigra::Diff2D diff = vl.GetEnd() - vl.GetStart(); + // check that line is long enough if(diff.magnitude()>20) { + // now check angle with respect to roll angle, accept only deviation of 5 (sin 5=0.1) if(std::abs((diff.x*cos(DEG_TO_RAD(roll))+diff.y*sin(DEG_TO_RAD(roll)))/diff.magnitude())<0.1) { - vertLines.push_back(vl); + // check distance and angle to other lines + bool distanceBig = true; + for (auto& otherLine : vertLines) + { + // distance should be at least 80 pixel = 5 % from image width + if (vl.GetEstimatedDistance(otherLine) < 80) + { + // now check if line are parallel = have the same angle (tan(3)=0.05) + if (std::abs(vl.GetAngle() - otherLine.GetAngle()) < 0.05) + { + distanceBig = false; + // both lines are close to each other, keep only the longer one + if (vl.GetLineLength() > otherLine.GetLineLength()) + { + otherLine = vl; + } + continue; + }; + }; + } + if (distanceBig) + { + vertLines.push_back(vl); + }; }; }; }; @@ -243,8 +324,24 @@ return cp1.error + value_type operator()(ITERATOR const & i) const + { + return 255 - (*i); + } + template + value_type operator()(ITERATOR const & i, DIFFERENCE d) const + { + return 255 - i[d]; + } +}; + template -HuginBase::CPVector _getVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,ImageType& image, const unsigned int nrLines) +HuginBase::CPVector _getVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,ImageType& image, vigra::BImage& mask, const unsigned int nrLines) { HuginBase::CPVector verticalLines; HuginBase::CPVector detectedLines; @@ -288,19 +385,39 @@ fitPano.run(); opts.setHFOV(fitPano.getResultHorizontalFOV()); opts.setHeight(hugin_utils::roundi(fitPano.getResultHeight())); + if (opts.getVFOV() > 100) + { + // limit vertical fov to 100 deg to prevent finding lines + // near nadir/zenit which are probably wrong with this simple + // line finding algorithmus + opts.setHeight(hugin_utils::roundi(opts.getHeight() * 90.0 / opts.getVFOV())); + }; tempPano.setOptions(opts); //finally remap image HuginBase::Nona::RemappedPanoImage* remapped=new HuginBase::Nona::RemappedPanoImage; AppBase::ProgressDisplay* progress=new AppBase::DummyProgressDisplay(); remapped->setPanoImage(remappedImage,opts,opts.getROI()); - remapped->remapImage(vigra::srcImageRange(image),vigra_ext::INTERP_CUBIC, progress); + if (mask.size().area() > 0) + { + remapped->remapImage(vigra::srcImageRange(image), vigra::srcImage(mask), vigra_ext::INTERP_CUBIC, progress); + } + else + { + remapped->remapImage(vigra::srcImageRange(image), vigra_ext::INTERP_CUBIC, progress); + }; ImageType remappedBitmap=remapped->m_image; + mask = remapped->m_mask; //detect edges edge=detectEdges(remappedBitmap,2,4,std::max(remappedBitmap.width(),remappedBitmap.height())+10,size_factor); delete remapped; delete progress; }; + // ignore all edges outside of masked areas + if (mask.size().area() > 0) + { + vigra::initImageIf(vigra::destImageRange(*edge), vigra::srcImage(mask, InvertedMaskAccessor()), vigra::UInt8(255)); + }; //detect lines //we need the focal length double focalLength=srcImage.getExifFocalLength(); @@ -314,7 +431,7 @@ //filter results VerticalLineVector filteredLines=FilterLines(foundLines,roll); //create control points - if(filteredLines.size()>0) + if(!filteredLines.empty()) { //we need to transform the coordinates to image coordinates because the detection //worked on smaller images or in remapped image @@ -331,22 +448,22 @@ cp.mode=HuginBase::ControlPoint::X; if(!needsRemap) { - cp.x1=filteredLines[i].start.x*size_factor; - cp.y1=filteredLines[i].start.y*size_factor; - cp.x2=filteredLines[i].end.x*size_factor; - cp.y2=filteredLines[i].end.y*size_factor; + cp.x1 = filteredLines[i].GetStart().x*size_factor; + cp.y1 = filteredLines[i].GetStart().y*size_factor; + cp.x2 = filteredLines[i].GetEnd().x*size_factor; + cp.y2 = filteredLines[i].GetEnd().y*size_factor; } else { double xout; double yout; - if(!transform.transformImgCoord(xout,yout,filteredLines[i].start.x,filteredLines[i].start.y)) + if(!transform.transformImgCoord(xout,yout,filteredLines[i].GetStart().x,filteredLines[i].GetStart().y)) { continue; }; cp.x1=xout; cp.y1=yout; - if(!transform.transformImgCoord(xout,yout,filteredLines[i].end.x,filteredLines[i].end.y)) + if(!transform.transformImgCoord(xout,yout,filteredLines[i].GetEnd().x,filteredLines[i].GetEnd().y)) { continue; }; @@ -411,7 +528,7 @@ maxError=std::max(detectedLines[i].error,maxError); }; }; - if(detectedLines.size()>0 && maxError>0) //security check, should never be false + if(!detectedLines.empty() && maxError>0) //security check, should never be false { //now keep only the best nrLines lines //we are using error and line length as figure of merrit @@ -454,14 +571,14 @@ return verticalLines; }; -HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,vigra::UInt8RGBImage& image, const unsigned int nrLines) +HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,vigra::UInt8RGBImage& image, vigra::BImage& mask, const unsigned int nrLines) { - return _getVerticalLines(pano, imgNr, image, nrLines); + return _getVerticalLines(pano, imgNr, image, mask, nrLines); }; -HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,vigra::BImage& image, const unsigned int nrLines) +HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,vigra::BImage& image, vigra::BImage& mask, const unsigned int nrLines) { - return _getVerticalLines(pano, imgNr, image, nrLines); + return _getVerticalLines(pano, imgNr, image, mask, nrLines); }; }; //namespace diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/lines/FindLines.h hugin-2019.0.0+dfsg/src/hugin_base/lines/FindLines.h --- hugin-2018.0.0+dfsg/src/hugin_base/lines/FindLines.h 2017-04-22 17:03:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/lines/FindLines.h 2018-03-18 14:48:20.000000000 +0000 @@ -74,7 +74,7 @@ * @param nrLine maximal number of lines to return * @return HuginBase::CPVector with all vertical control points */ - IMPEX HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,vigra::UInt8RGBImage& image,const unsigned int nrLines); - IMPEX HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano,const unsigned int imgNr,vigra::BImage& image,const unsigned int nrLines); + IMPEX HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano, const unsigned int imgNr, vigra::UInt8RGBImage& image, vigra::BImage& mask, const unsigned int nrLines); + IMPEX HuginBase::CPVector GetVerticalLines(const HuginBase::Panorama& pano, const unsigned int imgNr, vigra::BImage& image, vigra::BImage& mask, const unsigned int nrLines); }; #endif diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/nona/RemappedPanoImage.h hugin-2019.0.0+dfsg/src/hugin_base/nona/RemappedPanoImage.h --- hugin-2018.0.0+dfsg/src/hugin_base/nona/RemappedPanoImage.h 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/nona/RemappedPanoImage.h 2019-02-18 17:03:33.000000000 +0000 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -417,6 +418,15 @@ } } +/** copies image into new image with changed size */ +template +ImageType CopyImageNewSize(const ImageType& image, const vigra::Size2D& newSize) +{ + ImageType newImage(newSize); + vigra::omp::copyImage(vigra::srcImageRange(image, vigra::Rect2D(newSize)), vigra::destImage(newImage)); + return newImage; +}; + /** remap a image without alpha channel*/ template template @@ -463,12 +473,12 @@ vigra_ext::EMoR::createEMoRLUT(m_destImg.outputEMoRParams, outLut); }; double maxVal = vigra_ext::LUTTraits::max(); - if (m_destImg.outputPixelType.size() > 0) { + if (!m_destImg.outputPixelType.empty()) { maxVal = vigra_ext::getMaxValForPixelType(m_destImg.outputPixelType); } invResponse.setOutput(1.0/pow(2.0,m_destImg.outputExposureValue), outLut, - maxVal); + maxVal, m_destImg.outputRangeCompression); } else { invResponse.setHDROutput(true,1.0/pow(2.0,m_destImg.outputExposureValue)); } @@ -546,6 +556,15 @@ m_srcImg.horizontalWarpNeeded(), interpol, progress); + if (Base::boundingBox().right() > m_destImg.getROI().right()) + { + // dest image was enlarged for GPU alignment issue + // delete the pixels outside + vigra::Rect2D newBoundingBox = Base::boundingBox() & m_destImg.getROI(); + Base::m_image = CopyImageNewSize(Base::m_image, newBoundingBox.size()); + Base::m_mask = CopyImageNewSize(Base::m_mask, newBoundingBox.size()); + Base::m_region = newBoundingBox; + }; } else { transformImageAlpha(srcImg, vigra::srcImage(alpha), @@ -591,6 +610,15 @@ interpol, progress); } + if (Base::boundingBox().right() > m_destImg.getROI().right()) + { + // dest image was enlarged for GPU alignment issue + // delete the pixels outside + vigra::Rect2D newBoundingBox = Base::boundingBox() & m_destImg.getROI(); + Base::m_image = CopyImageNewSize(Base::m_image, newBoundingBox.size()); + Base::m_mask = CopyImageNewSize(Base::m_mask, newBoundingBox.size()); + Base::m_region = newBoundingBox; + }; } else { transformImage(srcImg, destImageRange(Base::m_image), @@ -647,7 +675,7 @@ std::vector outLut; // scale up to desired output format double maxVal = vigra_ext::LUTTraits::max(); - if (m_destImg.outputPixelType.size() > 0) { + if (!m_destImg.outputPixelType.empty()) { maxVal = vigra_ext::getMaxValForPixelType(m_destImg.outputPixelType); } if (!m_destImg.outputEMoRParams.empty()) @@ -656,7 +684,7 @@ vigra_ext::enforceMonotonicity(outLut); }; invResponse.setOutput(1.0/pow(2.0,m_destImg.outputExposureValue), outLut, - maxVal); + maxVal, m_destImg.outputRangeCompression); } else { invResponse.setHDROutput(true,1.0/pow(2.0,m_destImg.outputExposureValue)); } @@ -723,6 +751,15 @@ m_srcImg.horizontalWarpNeeded(), interp, progress); + if (Base::boundingBox().right() > m_destImg.getROI().right()) + { + // dest image was enlarged for GPU alignment issue + // delete the pixels outside + vigra::Rect2D newBoundingBox = Base::boundingBox() & m_destImg.getROI(); + Base::m_image = CopyImageNewSize(Base::m_image, newBoundingBox.size()); + Base::m_mask = CopyImageNewSize(Base::m_mask, newBoundingBox.size()); + Base::m_region = newBoundingBox; + }; } else { vigra_ext::transformImageAlpha(srcImg, vigra::srcImage(alpha), @@ -749,6 +786,15 @@ m_srcImg.horizontalWarpNeeded(), interp, progress); + if (Base::boundingBox().right() > m_destImg.getROI().right()) + { + // dest image was enlarged for GPU alignment issue + // delete the pixels outside + vigra::Rect2D newBoundingBox = Base::boundingBox() & m_destImg.getROI(); + Base::m_image = CopyImageNewSize(Base::m_image, newBoundingBox.size()); + Base::m_mask = CopyImageNewSize(Base::m_mask, newBoundingBox.size()); + Base::m_region = newBoundingBox; + }; } else { vigra_ext::transformImageAlpha(srcImg, alphaImg, diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/nona/SpaceTransform.h hugin-2019.0.0+dfsg/src/hugin_base/nona/SpaceTransform.h --- hugin-2018.0.0+dfsg/src/hugin_base/nona/SpaceTransform.h 2015-05-10 06:52:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/nona/SpaceTransform.h 2018-02-03 14:34:25.000000000 +0000 @@ -176,7 +176,7 @@ /** returns true if this transform is an identity transform */ bool isIdentity() { - return m_Stack.size() == 0; + return m_Stack.empty(); } diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/nona/Stitcher.cpp hugin-2019.0.0+dfsg/src/hugin_base/nona/Stitcher.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/nona/Stitcher.cpp 2017-04-22 17:03:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/nona/Stitcher.cpp 2018-02-03 14:34:25.000000000 +0000 @@ -77,7 +77,7 @@ // DEBUG_DEBUG("Output pixel type: " << pixelType); PanoramaOptions opts = opt; if (opts.outputMode == PanoramaOptions::OUTPUT_HDR) { - if (opts.outputPixelType.size() == 0) { + if (opts.outputPixelType.empty()) { opts.outputPixelType = "FLOAT"; } } else { @@ -91,7 +91,7 @@ // clear the parameters to indicatate these should not be used opts.outputEMoRParams.clear(); }; - if (opts.outputPixelType.size() == 0) { + if (opts.outputPixelType.empty()) { opts.outputPixelType = pixelType; } else { // if output format is specified, use output format as stitching format diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/nona/Stitcher.h hugin-2019.0.0+dfsg/src/hugin_base/nona/Stitcher.h --- hugin-2018.0.0+dfsg/src/hugin_base/nona/Stitcher.h 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/nona/Stitcher.h 2018-12-08 10:44:34.000000000 +0000 @@ -159,17 +159,7 @@ { exinfo1.setPosition(remapped.boundingBox().upperLeft()); exinfo1.setCanvasSize(vigra::Size2D(opts.getWidth(), opts.getHeight())); - vigra::Rect2D rect = remapped.boundingBox(); - if (rect.right() > opts.getROI().right()) - { - rect &= opts.getROI(); - rect.moveBy(-rect.upperLeft()); - vigra::exportImage(srcImageRange(remapped.m_mask, rect), exinfo1); - } - else - { - vigra::exportImage(srcImageRange(remapped.m_mask), exinfo1); - }; + vigra::exportImage(srcImageRange(remapped.m_mask), exinfo1); } // calculate real alpha for saving with the image @@ -177,7 +167,6 @@ remapped.calcAlpha(); } - vigra::Rect2D subImage; if (!opts.tiff_saveROI) { // FIXME: this is stupid. Should not require space for full image... @@ -203,11 +192,6 @@ { final_img = &remapped.m_image; alpha_img = &remapped.m_mask; - if (remapped.boundingBox().right() > opts.getROI().right()) - { - subImage = remapped.boundingBox() & opts.getROI(); - subImage.moveBy(-subImage.upperLeft()); - }; } std::string ext = opts.getOutputExtension(); @@ -230,7 +214,7 @@ exinfo.setPosition(opts.getROI().upperLeft()); exinfo.setCanvasSize(vigra::Size2D(opts.getWidth(), opts.getHeight())); } - if (opts.outputPixelType.size() > 0) + if (!opts.outputPixelType.empty()) { exinfo.setPixelType(opts.outputPixelType.c_str()); } @@ -250,27 +234,13 @@ }; } - if (subImage.area() > 0) + if (supportsAlpha) { - if (supportsAlpha) - { - vigra::exportImageAlpha(srcImageRange(*final_img, subImage), srcImage(*alpha_img), exinfo); - } - else - { - vigra::exportImage(srcImageRange(*final_img, subImage), exinfo); - }; + vigra::exportImageAlpha(srcImageRange(*final_img), srcImage(*alpha_img), exinfo); } else { - if (supportsAlpha) - { - vigra::exportImageAlpha(srcImageRange(*final_img), srcImage(*alpha_img), exinfo); - } - else - { - vigra::exportImage(srcImageRange(*final_img), exinfo); - }; + vigra::exportImage(srcImageRange(*final_img), exinfo); }; }; } // namespace detail @@ -321,6 +291,7 @@ if (GetAdvancedOption(advOptions, "ignoreExposure", false)) { modOptions.outputExposureValue = Base::m_pano.getImage(*it).getExposureValue(); + modOptions.outputRangeCompression = 0.0; }; RemappedPanoImage * remapped = remapper.getRemapped(Base::m_pano, modOptions, *it, @@ -525,11 +496,12 @@ if (GetAdvancedOption(advOptions, "ignoreExposure", false)) { modOptions.outputExposureValue = Base::m_pano.getImage(*it).getExposureValue(); + modOptions.outputRangeCompression = 0.0; }; RemappedPanoImage * remapped = remapper.getRemapped(Base::m_pano, modOptions, *it, Base::m_rois[std::distance(imgSet.begin(), imgSet.find(*it))], Base::m_progress); - if(iccProfile.size()==0) + if(iccProfile.empty()) { iccProfile=remapped->m_ICCProfile; }; @@ -600,7 +572,7 @@ exinfo.setXResolution(150); exinfo.setYResolution(150); exinfo.setICCProfile(iccProfile); - if (opts.outputPixelType.size() > 0) { + if (!opts.outputPixelType.empty()) { exinfo.setPixelType(opts.outputPixelType.c_str()); } @@ -738,7 +710,7 @@ // Base::m_progress.setMessage("saving result: " + hugin_utils::stripPath(outputfile)); DEBUG_DEBUG("Saving panorama: " << outputfile); vigra::ImageExportInfo exinfo(outputfile.c_str(), GetAdvancedOption(advOptions, "useBigTIFF", false) ? "w8" : "w"); - if (opts.outputPixelType.size() > 0) { + if (!opts.outputPixelType.empty()) { exinfo.setPixelType(opts.outputPixelType.c_str()); } exinfo.setXResolution(150); @@ -802,7 +774,7 @@ // but should be enought for the preview. remapped[i] = remapper.getRemapped(Base::m_pano, opts, *it, Base::m_rois[i], Base::m_progress); - if(iccProfile.size()==0) + if(iccProfile.empty()) { iccProfile=remapped[i]->m_ICCProfile; }; @@ -881,7 +853,7 @@ RemappedPanoImage * remapped = remapper.getRemapped(Base::m_pano, opts, *it, Base::m_rois[i], Base::m_progress); - if (iccProfile.size() == 0) { + if (iccProfile.empty()) { // try to extract icc profile. iccProfile = remapped->m_ICCProfile; } diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Exiv2Helper.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/Exiv2Helper.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Exiv2Helper.cpp 2015-05-10 06:52:11.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Exiv2Helper.cpp 2018-11-12 17:45:31.000000000 +0000 @@ -29,6 +29,7 @@ #include "hugin_math/hugin_math.h" #include "hugin_utils/utils.h" #include "exiv2/easyaccess.hpp" +#include "exiv2/version.hpp" namespace HuginBase { @@ -232,7 +233,7 @@ return false; }; }; -#if EXIV2_TEST_VERSION(0,23,0) +#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0) if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) && _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2)) { @@ -563,7 +564,7 @@ std::string lensName; // first we are reading LensModel in Exif section, this is only available // with EXIF >= 2.3 -#if EXIV2_TEST_VERSION(0,22,0) +#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0) //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName)) #else diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/ImageVariable.h hugin-2019.0.0+dfsg/src/hugin_base/panodata/ImageVariable.h --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/ImageVariable.h 2015-07-22 18:56:43.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/ImageVariable.h 2018-06-30 09:34:12.000000000 +0000 @@ -23,6 +23,7 @@ #ifndef _PANODATA_IMAGEVARIABLE_H #define _PANODATA_IMAGEVARIABLE_H +#include namespace HuginBase @@ -65,7 +66,7 @@ /** Copy constructor * - * Genrally copied for a getSrcImage call, so make the copy independant from + * Generally copied for a getSrcImage call, so make the copy independant from * the other image variables. */ ImageVariable(const ImageVariable &source); @@ -95,20 +96,6 @@ * either variable. * (i.e. Links are bidirectional and accumlative) * - * It takes longer to link when this element is already linked to many - * other variables. The fastest way to link an array of variables is: - * @code - * for (int index = 1; index < size; index++) - * { - * variables_array[index].linkWith(&(variables_array[index - 1])); - * } - * @endcode - * When called like this, each call to linkWith is constant time. - * - * worst case time is O(n+m) where n is the number of linked variables to - * the object you are calling from, and m is the number of linked variables - * of the object you pass as a pointer. - * * @param link a pointer to the variable to link with. */ void linkWith(ImageVariable * link); @@ -132,15 +119,6 @@ * Find if this variable has been linked (either directly or indirectly) * with the variable pointed to by otherVariable. * - * The execution time depends on how the variables were linked. If linked - * like in the example in linkWith, then it is fastest to use the variable - * with the largest array index to look for the other one. - * - * In the worst case, the variables are not linked, and the time taken is - * O(n) where n is the number of linked variables to this object. - * - * @see ImageVariable::linkWith - * * @param otherVariable the variable to check linkage with. * * @return true if this variable is linked with otherVariable, @@ -149,71 +127,7 @@ bool isLinkedWith(const ImageVariable * otherVariable) const; protected: - /** @note - * To keep the set of images linked, we store two pointers to other items - * in the set, like a doubly linked list. - * When copying variable values, we send it down the list in either - * direction from the variable where setData(data) was called. - * - * @par - * When unlinking, we point the items linked to to each other, replacing - * their links to us. - * - * @par - * When creating links, we need to check for circular lists. We check for - * the presence of the item we are linking to in either direction before - * linking to it. Since we are merging two sets that are either disjoint or - * identical, this is enough. - * The actual linking is done by linking the end of our list with the - * beginning of the one containg the one we were passed in linkWith - * - * @par - * To find the links, we search in both directions. - * - * @par - * We search the previous links first, then the proceeding ones. - */ - - /** Find if we are linked to another ImageVariable earlier in the list. - * - * @param otherVariable the variable to look for - * @return true if the variable is linked earilier in the list. - */ - bool searchBackwards(const ImageVariable * otherVariable) const; - - /** Find if we are linked to another ImageVariable later in the list. - * - * @param otherVariable the variable to look for - * @return true if the variable is linked later in the list. - */ - bool searchForwards(const ImageVariable * otherVariable) const; - - /** Find the first item in the list of links with this ImageVariable. - */ - ImageVariable * findStart(); - - /** Find the last item in the list of links with this ImageVariable. - */ - ImageVariable * findEnd(); - - /** Set all linked variables earlier in the list to some given data. - */ - void setBackwards(const Type data); - - /** Set all linked variables later in the list to some given data. - */ - void setForwards(const Type data); - - /////////////////// - // Member variables - - /// the data that will be returned when getData() is called. - Type m_data; - - /// The item preceding us in the list of links - ImageVariable * m_linkPrevious; - /// The item following us in the list of links - ImageVariable * m_linkNext; + std::shared_ptr m_ptr; }; // ImageVariable class ///////////////////////////// @@ -223,40 +137,23 @@ // Constructors template -ImageVariable::ImageVariable() +ImageVariable::ImageVariable() : m_ptr(new Type()) { - // Start not linked to anything, so the variable is independant. - m_linkPrevious = 0; - m_linkNext = 0; } template -ImageVariable::ImageVariable(Type data) +ImageVariable::ImageVariable(Type data) : m_ptr(new Type(data)) { - // Use the data given - m_data = data; - // ...and start not linked to anything. - m_linkPrevious = 0; - m_linkNext = 0; } template -ImageVariable::ImageVariable(ImageVariable * link) +ImageVariable::ImageVariable(ImageVariable * link) : m_ptr(link->m_ptr) { - // So we don't break linkWith: - m_linkPrevious = 0; - m_linkNext = 0; - // make the link. Note this sets our data from linked variables. - linkWith(link); } template -ImageVariable::ImageVariable(const ImageVariable & source) +ImageVariable::ImageVariable(const ImageVariable & source) : m_ptr(new Type(*source.m_ptr)) { - // When creating a copy, make independant. - m_data = source.m_data; - m_linkNext = 0; - m_linkPrevious = 0; } // Destructor @@ -264,9 +161,6 @@ template ImageVariable::~ImageVariable() { - // We will need to remove the links to this variable to keep the list sane. - removeLinks(); - // it is safe to delete this object now. } // Other public member functions @@ -274,138 +168,48 @@ template Type ImageVariable::getData() const { - return m_data; + return *m_ptr; } template void ImageVariable::setData(const Type data) { - /* We keep multiple copies of the data. - * Hopefully the data isn't too large, and setData is called far less often - * then getData, so it should be fast enough this way. - */ - // set all the linked variables. - // these both set this variables data. - setBackwards(data); - setForwards(data); + *m_ptr = data; } template void ImageVariable::linkWith(ImageVariable * link) { // We need to first check that we aren't linked already. - if (searchBackwards(link) || searchForwards(link)) + if (m_ptr == link->m_ptr) { DEBUG_INFO("Attempt to link already linked variables"); return; } else { - // not linked, it is safe to merge them. - /* we need to merge the two sets together. We link the end of the list - * with this object in it to the beginning of the list passed to us. - */ - ImageVariable *end = findEnd(); - ImageVariable *beginning = link->findStart(); - end->m_linkNext = beginning; - beginning->m_linkPrevious = end; - // now we must set the data from what we were linked to. - /* the link target has the same data, but the stuff previously linked - * with us might have something different. - */ - setBackwards(link->m_data); + + m_ptr = link->m_ptr; } } template void ImageVariable::removeLinks() { - if (m_linkPrevious) - { - // there is something before us, link it to the item after, or 0 if none - m_linkPrevious->m_linkNext = m_linkNext; - } - if (m_linkNext) - { - // there is something after us, link it to the item before, or 0 if none - m_linkNext->m_linkPrevious = m_linkPrevious; - m_linkNext = 0; - } - m_linkPrevious = 0; + m_ptr.reset(new Type(*m_ptr)); } template bool ImageVariable::isLinked() const { - // return true if there are any links, false if this variable is independant - return (m_linkPrevious || m_linkNext); + return m_ptr.use_count() > 1; } template bool ImageVariable::isLinkedWith(const ImageVariable * otherVariable) const { // return true if we can find a link with the given item. - return (searchBackwards(otherVariable) || searchForwards(otherVariable)); -} - -//////////////////////////////// -// Protected member functions // -//////////////////////////////// - -template -bool ImageVariable::searchBackwards(const ImageVariable * otherVariable) const -{ - // is this what we are looking for? - if (this == otherVariable) return true; - // are there any more items to check? - if (!m_linkPrevious) return false; - // try another one. - return m_linkPrevious->searchBackwards(otherVariable); -} - -template -bool ImageVariable::searchForwards(const ImageVariable * otherVariable) const -{ - // is this what we are looking for? - if (this == otherVariable) return true; - // are there any more items to check? - if (!m_linkNext) return false; - // try another one. - return m_linkNext->searchForwards(otherVariable); -} - -template -ImageVariable * ImageVariable::findStart() -{ - // Is this the start of the list? - if (!m_linkPrevious) return this; - // look father back - return m_linkPrevious->findStart(); -} - -template -ImageVariable * ImageVariable::findEnd() -{ - // Is this the end of the list? - if (!m_linkNext) return this; - // look father forwards - return m_linkNext->findEnd(); -} - -template -void ImageVariable::setBackwards(const Type data) -{ - // set this and all proceeding items. - m_data = data; - if (m_linkPrevious) m_linkPrevious->setBackwards(data); -} - -template -void ImageVariable::setForwards(const Type data) -{ - // set this and all proceeding items. - m_data = data; - if (m_linkNext) m_linkNext->setForwards(data); + return m_ptr == otherVariable->m_ptr; } } // HuginBase namespace diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/image_variables.h hugin-2019.0.0+dfsg/src/hugin_base/panodata/image_variables.h --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/image_variables.h 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/image_variables.h 2018-06-30 09:09:04.000000000 +0000 @@ -64,7 +64,7 @@ // projection variables image_variable( Projection, HuginBase::BaseSrcPanoImage::Projection, RECTILINEAR ) image_variable( HFOV, double, 50.0 ) -image_variable( CropFactor, double, 0 ) +image_variable( CropFactor, double, 0.0 ) // colour response variables image_variable( ResponseType, HuginBase::BaseSrcPanoImage::ResponseType, RESPONSE_EMOR ) @@ -90,11 +90,11 @@ image_variable( Stack, double, 0.0 ) // radial lens distortion -image_variable( RadialDistortion, std::vector, distortion_default ) +image_variable( RadialDistortion, std::vector, std::vector({ 0.0, 0.0, 0.0, 1.0 })) // radial lens distortion (red, blue channel), for TCA correction -image_variable( RadialDistortionRed, std::vector, distortion_default ) -image_variable( RadialDistortionBlue, std::vector, distortion_default ) +image_variable( RadialDistortionRed, std::vector, std::vector({ 0.0, 0.0, 0.0, 1.0 })) +image_variable( RadialDistortionBlue, std::vector, std::vector({ 0.0, 0.0, 0.0, 1.0 })) // Center shift image_variable( RadialDistortionCenterShift, hugin_utils::FDiff2D, hugin_utils::FDiff2D(0.0, 0.0) ) @@ -112,7 +112,7 @@ // coefficients for vignetting correction (even degrees: 0,2,4,6, ...) image_variable( FlatfieldFilename, std::string, "" ) -image_variable( RadialVigCorrCoeff, std::vector, RadialVigCorrCoeff_default ) +image_variable(RadialVigCorrCoeff, std::vector, std::vector({ 1.0, 0.0, 0.0, 0.0 })) image_variable( RadialVigCorrCenterShift, hugin_utils::FDiff2D, hugin_utils::FDiff2D(0.0, 0.0) ) // linear pixel transform @@ -126,18 +126,18 @@ image_variable( ExifModel, std::string, "" ) image_variable( ExifMake, std::string, "" ) image_variable( ExifLens, std::string, "" ) -image_variable( ExifFocalLength, double, 0 ) -image_variable( ExifOrientation, double, 0 ) -image_variable( ExifAperture, double, 0 ) -image_variable( ExifISO, double, 0 ) -image_variable( ExifDistance, double, 0 ) -image_variable( ExifFocalLength35, double, 0) -image_variable( ExifCropFactor, double, 0) -image_variable( ExifExposureTime, double, 0) +image_variable( ExifFocalLength, double, 0.0 ) +image_variable( ExifOrientation, double, 0.0 ) +image_variable( ExifAperture, double, 0.0 ) +image_variable( ExifISO, double, 0.0 ) +image_variable( ExifDistance, double, 0.0 ) +image_variable( ExifFocalLength35, double, 0.0) +image_variable( ExifCropFactor, double, 0.0) +image_variable( ExifExposureTime, double, 0.0) image_variable( ExifDate, std::string, "") -image_variable( ExifExposureMode, int, 0) -image_variable( ExifRedBalance, double, 1) -image_variable( ExifBlueBalance, double, 1) +image_variable( ExifExposureMode, int, 0.0) +image_variable( ExifRedBalance, double, 1.0) +image_variable( ExifBlueBalance, double, 1.0) image_variable( FileMetadata, HuginBase::FileMetaData, HuginBase::FileMetaData()) #if 0 @@ -152,10 +152,10 @@ // mask handling // Masks is list of loaded or created textures -image_variable( Masks, HuginBase::MaskPolygonVector, defaultMaskVector) +image_variable( Masks, HuginBase::MaskPolygonVector, HuginBase::MaskPolygonVector()) // ActiveMasks contains list of all negative masks, which should be applied to // a given image, this is used to propagate positive masks -image_variable( ActiveMasks, HuginBase::MaskPolygonVector, defaultMaskVector) +image_variable( ActiveMasks, HuginBase::MaskPolygonVector, HuginBase::MaskPolygonVector()) // If the image is selected to be used in the preview and for optimisation. image_variable( Active, bool, true ) diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Lens.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/Lens.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Lens.cpp 2015-10-23 22:22:34.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Lens.cpp 2019-02-11 17:20:21.000000000 +0000 @@ -42,7 +42,6 @@ const char* Lens::variableNames[] = { "v", "a", "b", "c", "d", "e", "g", "t", "Va", "Vb", "Vc", "Vd", "Vx", "Vy", - "Eev", "Er", "Eb", "Ra", "Rb", "Rc", "Rd", "Re", 0}; double Lens::getHFOV() const @@ -62,11 +61,6 @@ return SrcPanoImage::calcFocalLength(m_projectionFormat,HFOV,getCropFactor(),m_imageSize); } -void Lens::setEV(double ev) -{ - map_get(variables, "Eev").setValue(ev); -} - double Lens::getAspectRatio() const { return (double)m_imageSize.x / m_imageSize.y; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Lens.h hugin-2019.0.0+dfsg/src/hugin_base/panodata/Lens.h --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Lens.h 2015-05-10 06:52:11.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Lens.h 2019-02-11 17:19:48.000000000 +0000 @@ -85,9 +85,6 @@ */ bool isLandscape() const; - /** set the exposure value */ - void setEV(double ev); - /** get the image size, in pixels */ vigra::Size2D getImageSize() const { return m_imageSize; } diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Mask.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/Mask.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Mask.cpp 2016-03-27 13:19:35.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Mask.cpp 2018-06-30 09:21:41.000000000 +0000 @@ -205,7 +205,7 @@ void MaskPolygon::calcBoundingBox() { - if(m_polygon.size()>0) + if(!m_polygon.empty()) { m_boundingBox.setUpperLeft(vigra::Point2D(m_polygon[0].x,m_polygon[0].y)); m_boundingBox.setLowerRight(vigra::Point2D(m_polygon[0].x+1,m_polygon[0].y+1)); @@ -329,6 +329,7 @@ m_polygon=clip_onPlane(m_polygon, rect, clipRight); m_polygon=clip_onPlane(m_polygon, rect, clipTop); m_polygon=clip_onPlane(m_polygon, rect, clipBottom); + calcBoundingBox(); return (m_polygon.size()>2); }; @@ -401,7 +402,7 @@ */ void generateArc(VectorPolygon& poly, const hugin_utils::FDiff2D s, const hugin_utils::FDiff2D center, const double radius, const bool clockwise) { - if(poly.size()==0) + if(poly.empty()) { return; }; @@ -473,7 +474,7 @@ std::vector points=clip_getIntersectionCircle(p,s,center,radius); DEBUG_ASSERT(points.size()==1); angleCovered+=angle_between(s-center,points[0]-center); - if(newPolygon.size()==0) + if(newPolygon.empty()) { needsFinalArc=true; angleCoveredOffset=angleCovered; @@ -496,7 +497,7 @@ if(points.size()>1) { angleCovered+=angle_between(s-center,points[0]-center); - if(newPolygon.size()==0) + if(newPolygon.empty()) { needsFinalArc=true; angleCoveredOffset=angleCovered; @@ -531,6 +532,7 @@ generateArc(newPolygon,newPolygon[0],center,radius,(angleCovered+angleCoveredOffset)<0); }; m_polygon=newPolygon; + calcBoundingBox(); return (m_polygon.size()>2); }; @@ -551,11 +553,12 @@ m_polygon[i].y=maskWidth-p.x; }; }; + calcBoundingBox(); }; -unsigned int MaskPolygon::FindPointNearPos(const hugin_utils::FDiff2D p, const double tol) +unsigned int MaskPolygon::FindPointNearPos(const hugin_utils::FDiff2D p, const double tol) const { - if(m_polygon.size()==0) + if(m_polygon.empty()) return UINT_MAX; hugin_utils::FDiff2D p1; unsigned int j=m_polygon.size()-1; @@ -616,6 +619,7 @@ }; }; }; + calcBoundingBox(); return m_polygon.size()>2; }; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Mask.h hugin-2019.0.0+dfsg/src/hugin_base/panodata/Mask.h --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Mask.h 2015-10-23 22:08:36.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Mask.h 2018-06-30 09:21:43.000000000 +0000 @@ -117,7 +117,7 @@ void subSample(const double max_distance); /** search a point which lies near the polygon line and return the index for inserting the new point */ - unsigned int FindPointNearPos(const hugin_utils::FDiff2D p, const double tol); + unsigned int FindPointNearPos(const hugin_utils::FDiff2D p, const double tol) const; //operators /** assign operator */ diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Panorama.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/Panorama.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Panorama.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Panorama.cpp 2019-02-02 12:20:40.000000000 +0000 @@ -636,7 +636,7 @@ o << " Vm" << img.getVigCorrMode(); } - if (img.getFlatfieldFilename().size() > 0) { + if (!img.getFlatfieldFilename().empty()) { o << " Vf\"" << img.getFlatfieldFilename() << "\""; } if (img.getResponseType() > 0) { @@ -653,7 +653,7 @@ << (img.getMorph() ? " o" : ""); #endif std::string fname = img.getFilename(); - if (stripPrefix.size() > 0) { + if (!stripPrefix.empty()) { // strip prefix from image names. // check if the prefix is acutally the same std::string tmp = fname.substr(0,stripPrefix.size()); @@ -754,6 +754,8 @@ o << "#hugin_outputStacksMinOverlap " << std::setprecision(3) << output.outputStacksMinOverlap << endl; o << "#hugin_outputLayersExposureDiff " << std::setprecision(2) << output.outputLayersExposureDiff << endl; + o << "#hugin_outputRangeCompression " << std::setprecision(2) << output.outputRangeCompression << endl; + if(optvars==getOptimizeVector()) { o << "#hugin_optimizerMasterSwitch " << getOptimizerSwitch() << endl; @@ -968,7 +970,7 @@ void Panorama::changeFinished(bool keepDirty) { - if (state.images.size() == 0) { + if (state.images.empty()) { // force an empty update if all images have been // removed DEBUG_DEBUG("forcing images update, with no images"); @@ -983,7 +985,7 @@ std::ostream_iterator(t, " ")); DEBUG_TRACE("changed image(s) " << t.str() << " begin"); //force update of crops - if(changedImages.size()>0) + if(!changedImages.empty()) { for(UIntSet::iterator it=changedImages.begin();it!=changedImages.end();++it) { @@ -1002,7 +1004,7 @@ std::list::iterator it; for(it = observers.begin(); it != observers.end(); ++it) { DEBUG_TRACE("notifying listener"); - if (changedImages.size() > 0 || m_forceImagesUpdate) { + if (!changedImages.empty() || m_forceImagesUpdate) { (*it)->panoramaImagesChanged(*this, changedImages); } (*it)->panoramaChanged(*this); @@ -1027,7 +1029,7 @@ void Panorama::transferMask(MaskPolygon mask,unsigned int imgNr, const UIntSet& targetImgs) { - if(targetImgs.size()==0) + if(targetImgs.empty()) { return; }; @@ -1436,7 +1438,7 @@ void Panorama::updateOptimizeVector() { - if(state.images.size()==0) + if(state.images.empty()) { return; }; @@ -2013,7 +2015,7 @@ // now check if we have to update the masks HuginBase::MaskPolygonVector masksOld=getImage(j).getMasks(); HuginBase::MaskPolygonVector masksNew=newPano.getImage(i).getMasks(); - if(masksNew.size()>0) + if(!masksNew.empty()) { for(unsigned int k=0;k> value; - if (value.length() > 0) { + if (!is.fail() && value.length() > 0) { options.enblendOptions += " "; options.enblendOptions += value; } @@ -2890,7 +2874,7 @@ options.enfuseOptions = value; while (!is.eof()) { is >> value; - if (value.length() > 0) { + if (!is.fail() && value.length() > 0) { options.enfuseOptions += " "; options.enfuseOptions += value; } @@ -2899,7 +2883,7 @@ options.hdrmergeOptions = value; while (!is.eof()) { is >> value; - if (value.length() > 0) { + if (!is.fail() && value.length() > 0) { options.hdrmergeOptions += " "; options.hdrmergeOptions += value; } @@ -2908,7 +2892,7 @@ options.verdandiOptions = value; while (!is.eof()) { is >> value; - if (value.length() > 0) { + if (!is.fail() && value.length() > 0) { options.verdandiOptions += " "; options.verdandiOptions += value; } @@ -2964,6 +2948,9 @@ options.outputImageTypeHDR = value; } else if (var == "#hugin_outputImageTypeHDRCompression") { options.outputImageTypeHDRCompression = value; + } else if (var == "#hugin_outputRangeCompression") { + options.outputRangeCompression = atof(value.c_str()); + options.outputRangeCompression = std::max(0.0, std::min(options.outputRangeCompression, 20.0)); } else if (var == "#hugin_optimizerMasterSwitch") { optSwitch = atoi(value.c_str()); } else if (var == "#hugin_optimizerPhotoMasterSwitch") { @@ -3273,23 +3260,30 @@ }; }; - if (options.optimizeReferenceImage < 0 || options.optimizeReferenceImage >= images.size()) + if (images.empty()) { - // optimize reference images reference to non-existing image - options.optimizeReferenceImage = 0; - std::cout << "WARNING: Optimize reference image refers to non existing image. Reset to default value." << std::endl; - }; - if (options.colorReferenceImage < 0 || options.colorReferenceImage >= images.size()) + std::cerr << "ERROR: Project file contains no images." << std::endl; + } + else { - // optimize reference images reference to non-existing image - options.colorReferenceImage = 0; - std::cout << "WARNING: Optimize photometric reference image refers to non existing image. Reset to default value." << std::endl; + if (options.optimizeReferenceImage < 0 || options.optimizeReferenceImage >= images.size()) + { + // optimize reference images reference to non-existing image + options.optimizeReferenceImage = 0; + std::cout << "WARNING: Optimize reference image refers to non existing image. Reset to default value." << std::endl; + }; + if (options.colorReferenceImage < 0 || options.colorReferenceImage >= images.size()) + { + // optimize reference images reference to non-existing image + options.colorReferenceImage = 0; + std::cout << "WARNING: Optimize photometric reference image refers to non existing image. Reset to default value." << std::endl; + }; }; // reset locale setlocale(LC_NUMERIC,old_locale); free(old_locale); - return true; + return !images.empty(); } } // namespace diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/Panorama.h hugin-2019.0.0+dfsg/src/hugin_base/panodata/Panorama.h --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/Panorama.h 2017-04-22 17:03:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/Panorama.h 2018-06-30 09:22:54.000000000 +0000 @@ -208,7 +208,7 @@ }; /// get a panorama image, counting starts with 0 - const SrcPanoImage & getImage(std::size_t nr) const + inline const SrcPanoImage & getImage(std::size_t nr) const { assert(nr < state.images.size()); return *state.images[nr]; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.cpp 2015-10-23 22:45:20.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.cpp 2018-12-25 13:03:57.000000000 +0000 @@ -111,7 +111,7 @@ // the new exposure options o << " E" << outputExposureValue; o << " R" << outputMode; - if (outputPixelType.size() > 0) { + if (!outputPixelType.empty()) { o << " T" << outputPixelType; } if (m_roi != vigra::Rect2D(m_size)) { @@ -119,7 +119,7 @@ } } - if (m_projectionParams.size() > 0) { + if (!m_projectionParams.empty()) { o << " P\""; for (int i=0; i < (int) m_projectionParams.size(); i++) { o << m_projectionParams[i]; @@ -146,20 +146,7 @@ o << std::endl; // misc options - o << "m g" << gamma << " i" << interpolator; - switch (remapAcceleration) { - case NO_SPEEDUP: - break; - case MAX_SPEEDUP: - o << " f0"; - break; - case MEDIUM_SPEEDUP: - o << " f1"; - } - o << " m" << huberSigma; - - // options for photometric estimation. - o << " p" << photometricHuberSigma; + o << "m i" << interpolator; o << std::endl; } @@ -383,47 +370,26 @@ transf.createTransform(src, *this); hugin_utils::FDiff2D pmiddle; - hugin_utils::FDiff2D pcorner; - transf.transform(pmiddle, hugin_utils::FDiff2D(0, m_size.y / 2.0)); -// transf.transform(pcorner, FDiff2D(m_size.x/2.0, m_size.y/2.0)); - double VFOV; - if (pmiddle.x > 90 ||pmiddle.y < -90) { - // the pole has been crossed - VFOV = 2*(180-pmiddle.y); - } else { - VFOV = 2*pmiddle.y; - } - //double VFOV = 2.0*std::max(pcorner.y, pmiddle.y); - - /* - double VFOV; - switch (m_projectionFormat) { - case PanoramaOptions::RECTILINEAR: - VFOV = 2.0 * atan( (double)m_height * tan(DEG_TO_RAD(m_hfov)/2.0) / m_width); - VFOV = RAD_TO_DEG(VFOV); - break; - case PanoramaOptions::CYLINDRICAL: + if (transf.transform(pmiddle, hugin_utils::FDiff2D(0, m_size.y / 2.0))) + { + double VFOV; + if (pmiddle.x > 90 || pmiddle.y < -90) { - // equations: w = f * v (f: focal length, in pixel) - double f = m_width / DEG_TO_RAD(m_hfov); - VFOV = 2*atan(m_height/(2.0*f)); - VFOV = RAD_TO_DEG(VFOV); - break; + // the pole has been crossed + VFOV = 2 * (180 - pmiddle.y); } - case PanoramaOptions::EQUIRECTANGULAR: - // FIXME: This is wrong! - case TRANSVERSE_MERCATOR: - case MERCATOR: - VFOV = m_hfov * m_height / m_width; - break; - case PanoramaOptions::FULL_FRAME_FISHEYE: - VFOV = m_hfov * m_height / m_width; - break; + else + { + VFOV = 2 * pmiddle.y; + } + DEBUG_DEBUG(" HFOV: " << m_hfov << " size: " << m_size << " roi: " << m_roi << " => vfov: " << VFOV); + return VFOV; + } + else + { + DEBUG_DEBUG(" HFOV: " << m_hfov << " size: " << m_size << " roi: " << m_roi << " => vfov: " << getMaxVFOV() << " (setting to max)"); + return getMaxVFOV(); } - */ - DEBUG_DEBUG(" HFOV: " << m_hfov << " size: " << m_size << " roi: " << m_roi << " => vfov: " << VFOV); - - return VFOV; } const std::string PanoramaOptions::fileformatNames[] = diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.h hugin-2019.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.h --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.h 2016-05-20 18:46:17.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/PanoramaOptions.h 2018-12-07 20:58:37.000000000 +0000 @@ -192,18 +192,15 @@ m_hfov = 360; m_size = vigra::Size2D(3000, 1500); m_roi = vigra::Rect2D(m_size); - outfile = "panorama"; tiff_saveROI = true; tiffCompression = "LZW"; quality = 100; colorCorrection = NONE; colorReferenceImage = 0; optimizeReferenceImage = 0; - gamma = 1.0; interpolator = vigra_ext::INTERP_CUBIC; // featherWidth = 10; outputFormat = TIFF_m; - remapAcceleration = MAX_SPEEDUP; blendMode = ENBLEND_BLEND; hdrMergeMode = HDRMERGE_AVERAGE; remapper = NONA; @@ -237,6 +234,7 @@ outputEMoRParams.resize(5,0.0f); outputExposureValue = 0.0; + outputRangeCompression = 0.0; outputPixelType = ""; panoProjectionFeaturesQuery(m_projectionFormat, &m_projFeatures); @@ -343,7 +341,6 @@ public: //TODO: Write accessor methods; make instance variables private unless absolutely neccesary for backward-compatibility. - std::string outfile; FileFormat outputFormat; // jpeg options @@ -357,13 +354,11 @@ unsigned int colorReferenceImage; // misc options - double gamma; vigra_ext::Interpolator interpolator; unsigned int optimizeReferenceImage; // unsigned int featherWidth; - PTStitcherAcceleration remapAcceleration; BlendingMechanism blendMode; HDRMergeType hdrMergeMode; Remapper remapper; @@ -403,6 +398,7 @@ // select the exposure of the output images in LDR mode. double outputExposureValue; std::vector outputEMoRParams; + double outputRangeCompression; // choose pixel type for output images. std::string outputPixelType; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/ParseExp.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/ParseExp.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/ParseExp.cpp 2017-12-21 15:16:30.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/ParseExp.cpp 2018-02-24 08:37:53.000000000 +0000 @@ -788,6 +788,20 @@ { Parser::ConstantMap constants; constants["imax"] = pano.getNrOfImages() - 1; + for (size_t i = 0; i < pano.getNrOfImages(); ++i) + { + const HuginBase::SrcPanoImage& img = pano.getImage(i); + const std::string imgNr = std::to_string(i); + HuginBase::VariableMap vars; +#define image_variable( name, type, default_value ) \ + HuginBase::PTOVariableConverterFor##name::addToVariableMap(img.get##name##IV(), vars); +#include "panodata/image_variables.h" +#undef image_variable + for (auto& var : vars) + { + constants[var.first + imgNr] = var.second.getValue(); + } + } for (auto& var:setVars) { if (!var.flag) diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/PTScriptParsing.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/PTScriptParsing.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/PTScriptParsing.cpp 2015-05-10 06:52:11.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/PTScriptParsing.cpp 2018-02-03 14:34:25.000000000 +0000 @@ -164,7 +164,7 @@ { std::string val; if (getPTParam(val,line, var)) { - DEBUG_ASSERT(line.size() > 0); + DEBUG_ASSERT(!line.empty()); DEBUG_DEBUG(var << ":" < distortion_default(4, 0.0); - distortion_default[3] = 1; - - std::vector RadialVigCorrCoeff_default(4, 0.0); - RadialVigCorrCoeff_default[0] = 1; - HuginBase::MaskPolygonVector defaultMaskVector; -#define image_variable( name, type, default_value ) m_##name.setData(default_value); -#include "image_variables.h" -#undef image_variable -} - bool SrcPanoImage::isInside(vigra::Point2D p, bool ignoreMasks) const { bool insideCrop=false; @@ -235,7 +218,7 @@ double SrcPanoImage::getVar(const std::string & code) const { DEBUG_TRACE(""); - assert(code.size() > 0); + assert(!code.empty()); #define image_variable( name, type, default_value ) \ if (PTOVariableConverterFor##name::checkApplicability(code)) \ return PTOVariableConverterFor##name::getValueFromVariable(code, m_##name );\ @@ -251,7 +234,7 @@ void SrcPanoImage::setVar(const std::string & code, double val) { DEBUG_TRACE("Var:" << code << " value: " << val); - assert(code.size() > 0); + assert(!code.empty()); #define image_variable( name, type, default_value ) \ if (PTOVariableConverterFor##name::checkApplicability(code)) \ {PTOVariableConverterFor##name::setValueFromVariable(code, m_##name, val);}\ @@ -342,12 +325,10 @@ Exiv2::Image::AutoPtr image; try { image = Exiv2::ImageFactory::open(filename.c_str()); - }catch(...) { - std::cerr << __FILE__ << " " << __LINE__ << " Error opening file" << std::endl; - return false; } - if (image.get() == 0) { - std::cerr << "Unable to open file to read EXIF data: " << filename << std::endl; + catch (const Exiv2::Error& e) + { + std::cerr << "Exiv2: Error reading metadata (" << e.what() << ")" << std::endl; return false; } @@ -539,7 +520,7 @@ }; }; // check results, if 35 mm focal length is too small reset crop factor to 0 - if (focalLength > 0 && cropFactor > 0 && focalLength*cropFactor < 8) + if (focalLength > 0 && cropFactor > 0 && focalLength*cropFactor < 6) { cropFactor = 0; // check alternative way to calculate crop factor, e.g. when focal length and focal length in 35 mm are given @@ -547,7 +528,7 @@ const double newCropFactor = Exiv2Helper::getCropFactor(exifData, getWidth(), getHeight()); if (newCropFactor > 0) { - if (focalLength*newCropFactor > 8) + if (focalLength*newCropFactor >= 6) { cropFactor = newCropFactor; } @@ -676,9 +657,27 @@ return std::string(); }; +bool isFisheye(const BaseSrcPanoImage::Projection& proj) +{ + switch (proj) + { + case BaseSrcPanoImage::CIRCULAR_FISHEYE: + case BaseSrcPanoImage::FULL_FRAME_FISHEYE: + case BaseSrcPanoImage::FISHEYE_ORTHOGRAPHIC: + case BaseSrcPanoImage::FISHEYE_STEREOGRAPHIC: + case BaseSrcPanoImage::FISHEYE_EQUISOLID: + case BaseSrcPanoImage::FISHEYE_THOBY: + return true; + default: + return false; + }; + return false; +}; + bool SrcPanoImage::readProjectionFromDB() { bool success=false; + double oldFocal = 0; const std::string lensname = getDBLensName(); const double focal = getExifFocalLength(); if (!lensname.empty()) @@ -687,22 +686,37 @@ Projection dbProjection; if(lensDB.GetProjection(lensname, dbProjection)) { + oldFocal = calcFocalLength(getProjection(), getHFOV(), getCropFactor(), getSize()); setProjection(dbProjection); - success=true; + success = true; }; if (focal>0) { double fov; - if (lensDB.GetFov(lensname, focal, fov)) - { - // 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); + // read fov only for non rectilinear images + // for these relay on the EXIF data, because often user manage to store + // wrong values in the database, so ignore them for rectilinear images + if (getProjection() != RECTILINEAR && 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); + oldFocal = 0; + // for fisheye lenses read also automatically the distortions parameters from lens db + // because fisheye often don't follow exactly one of the projection models and need + // the distortion parameters to model the real projection of the used fisheye lens + if(isFisheye(getProjection())) + { + std::vector dist; + if (lensDB.GetDistortion(lensname, focal, dist)) + { + if (dist.size() == 3) + { + dist.push_back(1.0 - dist[0] - dist[1] - dist[2]); + setRadialDistortion(dist); + }; + }; }; }; vigra::Rect2D dbCropRect; @@ -712,6 +726,12 @@ setCropRect(dbCropRect); }; }; + // updated fov after changing projection, if not already done with value from database + if (success && oldFocal > 0) + { + const double newFov = calcHFOV(getProjection(), oldFocal, getCropFactor(), getSize()); + setHFOV(newFov); + }; }; return success; }; @@ -950,13 +970,13 @@ bool SrcPanoImage::hasMasks() const { - return m_Masks.getData().size()>0; + return !m_Masks.getData().empty(); }; bool SrcPanoImage::hasPositiveMasks() const { MaskPolygonVector masks=m_Masks.getData(); - if(masks.size()>0) + if(!masks.empty()) { for(unsigned int i=0;i0; + return !m_ActiveMasks.getData().empty(); }; void SrcPanoImage::printMaskLines(std::ostream &o, unsigned int newImgNr) const { - if(m_Masks.getData().size()>0) + if(!m_Masks.getData().empty()) for(unsigned int i=0;i m_##name; + ImageVariable m_##name {ImageVariable(default_value)}; #include "image_variables.h" #undef image_variable }; @@ -200,10 +195,15 @@ { public: /// - SrcPanoImage() + SrcPanoImage() :BaseSrcPanoImage() + {}; + + SrcPanoImage(const BaseSrcPanoImage::Projection projection, const double hfov, const vigra::Size2D size) :BaseSrcPanoImage() { - setDefaults(); - } + setProjection(projection); + setHFOV(hfov); + setSize(size); + }; virtual ~SrcPanoImage() {}; public: diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/panodata/StandardImageVariableGroups.cpp hugin-2019.0.0+dfsg/src/hugin_base/panodata/StandardImageVariableGroups.cpp --- hugin-2018.0.0+dfsg/src/hugin_base/panodata/StandardImageVariableGroups.cpp 2015-05-10 06:52:11.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/panodata/StandardImageVariableGroups.cpp 2018-07-19 14:37:32.000000000 +0000 @@ -41,10 +41,7 @@ ImageVariableGroup::IVE_HFOV, ImageVariableGroup::IVE_ResponseType, ImageVariableGroup::IVE_EMoRParams, - ImageVariableGroup::IVE_ExposureValue, ImageVariableGroup::IVE_Gamma, - ImageVariableGroup::IVE_WhiteBalanceRed, - ImageVariableGroup::IVE_WhiteBalanceBlue, ImageVariableGroup::IVE_RadialDistortion, ImageVariableGroup::IVE_RadialDistortionRed, ImageVariableGroup::IVE_RadialDistortionBlue, @@ -62,7 +59,7 @@ */ const std::set lens_variables_set = std::set(lens_variables_array, - lens_variables_array + 18); + lens_variables_array + 15); /** The image variables that are specific to stack. These are by default linked diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/photometric/ResponseTransform.h hugin-2019.0.0+dfsg/src/hugin_base/photometric/ResponseTransform.h --- hugin-2018.0.0+dfsg/src/hugin_base/photometric/ResponseTransform.h 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/photometric/ResponseTransform.h 2018-12-18 20:57:39.000000000 +0000 @@ -168,7 +168,7 @@ void setHDROutput(bool hdrMode, double destExposure); /// output lut - void setOutput(double destExposure, const LUTD & destLut, double scale); + void setOutput(double destExposure, const LUTD & destLut, double scale, double rangeCompression = 0.0); void enforceMonotonicity() { @@ -248,7 +248,8 @@ double m_destExposure; bool m_hdrMode; double m_intScale; - + double m_rangeCompression; + private: std::mt19937 Twister; }; @@ -420,12 +421,13 @@ { m_destExposure = 1.0; m_hdrMode = false; + m_rangeCompression = 0.0; m_intScale = 1; } template InvResponseTransform::InvResponseTransform(const HuginBase::SrcPanoImage & src) -: Base(src), m_hdrMode(false) +: Base(src), m_hdrMode(false), m_rangeCompression(0.0) { m_destExposure = 1.0; m_intScale = 1; @@ -440,6 +442,7 @@ { m_destExposure = 1.0; m_intScale = 1; + m_rangeCompression = 0.0; Base::init(src); if (!Base::m_lutR.empty()) { invertLUT(); @@ -454,16 +457,22 @@ m_intScale = 1; m_destExposure = destExposure; m_destLut.clear(); + m_rangeCompression = 0.0; } template -void InvResponseTransform::setOutput(double destExposure, const LUTD & destLut, double scale) +void InvResponseTransform::setOutput(double destExposure, const LUTD & destLut, double scale, double rangeCompression) { m_hdrMode = false; m_destLut = destLut; if (!m_destLut.empty()) { m_destLutFunc = vigra_ext::LUTFunctor(m_destLut); + m_rangeCompression = rangeCompression; } + else + { + m_rangeCompression = 0.0; + }; m_destExposure = destExposure; m_intScale = scale; } @@ -504,6 +513,10 @@ ret *= m_destExposure / (Base::calcVigFactor(pos) * Base::m_srcExposure); // apply output transform if required if (!m_destLut.empty()) { + if (m_rangeCompression > 0.0) + { + ret = log2(m_rangeCompression*ret + 1) / log2(m_rangeCompression + 1); + }; ret = m_destLutFunc(ret); } // dither all integer images @@ -531,6 +544,12 @@ ret.blue() /= Base::m_WhiteBalanceBlue; // apply output transform if required if (!m_destLut.empty()) { + if (m_rangeCompression > 0) + { + ret.red() = log2(m_rangeCompression*ret.red() + 1) / log2(m_rangeCompression + 1); + ret.blue() = log2(m_rangeCompression*ret.blue() + 1) / log2(m_rangeCompression + 1); + ret.green() = log2(m_rangeCompression*ret.green() + 1) / log2(m_rangeCompression + 1); + }; ret = m_destLutFunc(ret); } // dither 8 bit images. @@ -578,6 +597,14 @@ << " // whiteBalanceRed = " << Base::m_src.getWhiteBalanceRed() << endl << " // whiteBalanceBlue = " << Base::m_src.getWhiteBalanceBlue() << endl; + // alpha hdrWeight + if (m_hdrMode) + { + // hdr weight needs to be calculated from input pixel value + // so do it before the whole InvResponseTransformation is done + oss << " p.a = max(p.r, max(p.g, p.b));" << endl; + } + if (!Base::m_lutR.empty()) { oss << " p.rgb = p.rgb * " << (invLutSize - 1.0) << ";" << endl << " vec2 invR = texture2DRect(InvLutTexture, vec2(p.r, 0.0)).sq;" << endl @@ -627,6 +654,10 @@ << " p.rgb = (p.rgb * exposure_whitebalance) / vig;" << endl; if (!m_destLut.empty()) { + if (m_rangeCompression > 0) + { + oss << " p.rgb = log2(" << m_rangeCompression << " * p.rgb + 1.0) / " << log2(m_rangeCompression + 1) << ";" << endl; + }; oss << " p.rgb = p.rgb * " << (destLutSize - 1.0) << ";" << endl << " vec2 destR = texture2DRect(DestLutTexture, vec2(p.r, 0.0)).sq;" << endl << " vec2 destG = texture2DRect(DestLutTexture, vec2(p.g, 0.0)).sq;" << endl @@ -636,11 +667,6 @@ << " vec3 destA = fract(p.rgb);" << endl << " p.rgb = mix(destX, destY, destA);" << endl; } - - // alpha hdrWeight - if (m_hdrMode) { - oss << " p.a = max(p.r, max(p.g, p.b));" << endl; - } } }} // namespace diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/Correlation.h hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/Correlation.h --- hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/Correlation.h 2016-03-27 12:55:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/Correlation.h 2018-02-23 15:38:31.000000000 +0000 @@ -105,6 +105,10 @@ vigra_precondition(sw >= kw && sh >= kh, "correlateImageFFT(): kernel larger than image."); CorrelationResult res; + if (sw < kw || sh < kh) + { + return res; + }; // calculate mean and variance of kernel/template vigra::FindAverageAndVariance kMean; @@ -400,11 +404,13 @@ double a,b,c; FitPolynom(x, x + 2*interpWidth+1, zx, a,b,c); if (std::isnan(a) || std::isnan(b) || std::isnan(c)) { - exportImage(img,vigra::ImageExportInfo("test.tif")); - DEBUG_ERROR("Bad polynomial fit results"); - res.maxpos.x=max.x; - res.maxpos.y=max.y; - return res; +#ifdef DEBUG_CORRELATION + exportImage(img,vigra::ImageExportInfo("test.tif")); +#endif + DEBUG_DEBUG("Bad polynomial fit results"); + res.maxpos.x=max.x; + res.maxpos.y=max.y; + return res; } // calculate extrema of x position by setting @@ -421,6 +427,13 @@ double maxx = c*res.maxpos.x*res.maxpos.x + b*res.maxpos.x + a; FitPolynom(x, x + 2*interpWidth+1, zy, a,b,c); + if (std::isnan(a) || std::isnan(b) || std::isnan(c)) + { + DEBUG_DEBUG("Bad polynomial fit results"); + res.maxpos.x = max.x; + res.maxpos.y = max.y; + return res; + } // calculate extrema of y position if (c==0) res.maxpos.y=0; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/impexalpha.hxx hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/impexalpha.hxx --- hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/impexalpha.hxx 2016-01-27 17:31:56.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/impexalpha.hxx 2019-02-07 17:09:06.000000000 +0000 @@ -205,6 +205,35 @@ } + class threshold_alpha_transform + { + public: + threshold_alpha_transform(const range_t& source, const range_t& destination) : + threshold_((source.second - source.first)/255.0), + zero_(destination.first), + max_(destination.second) + { + } + + template + double operator()(T x) const + { + if (static_cast(x) >= threshold_) + { + return max_; + } + else + { + return zero_; + } + } + + private: + const double threshold_; + const double zero_; + const double max_; + }; + template void @@ -220,93 +249,47 @@ const range_t alpha_source_range(vigra_ext::LUTTraits::min(), vigra_ext::LUTTraits::max()); const range_t mask_destination_range(vigra_ext::LUTTraits::min(), vigra_ext::LUTTraits::max()); - if (alpha_source_range.first != mask_destination_range.first || alpha_source_range.second != mask_destination_range.second) - { - // we need to scale the alpha channel - const linear_transform alpha_rescaler(alpha_source_range, mask_destination_range); - switch (pixel_t_of_string(decoder->getPixelType())) - { - case UNSIGNED_INT_8: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case UNSIGNED_INT_16: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case UNSIGNED_INT_32: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case SIGNED_INT_16: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case SIGNED_INT_32: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case IEEE_FLOAT_32: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case IEEE_FLOAT_64: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - default: - vigra_fail("vigra::detail::importImageAlpha: not reached"); - } - } - else + // we need to scale the alpha channel, we are applying a threshold function at the same time + const threshold_alpha_transform alpha_rescaler(alpha_source_range, mask_destination_range); + switch (pixel_t_of_string(decoder->getPixelType())) { - switch (pixel_t_of_string(decoder->getPixelType())) - { - case UNSIGNED_INT_8: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case UNSIGNED_INT_16: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case UNSIGNED_INT_32: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case SIGNED_INT_16: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case SIGNED_INT_32: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case IEEE_FLOAT_32: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case IEEE_FLOAT_64: - read_image_band_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - default: - vigra_fail("vigra::detail::importImageAlpha: not reached"); - } + case UNSIGNED_INT_8: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case UNSIGNED_INT_16: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case UNSIGNED_INT_32: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case SIGNED_INT_16: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case SIGNED_INT_32: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case IEEE_FLOAT_32: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case IEEE_FLOAT_64: + read_image_band_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + default: + vigra_fail("vigra::detail::importImageAlpha: not reached"); } decoder->close(); @@ -328,93 +311,47 @@ const range_t alpha_source_range(vigra_ext::LUTTraits::min(), vigra_ext::LUTTraits::max()); const range_t mask_destination_range(vigra_ext::LUTTraits::min(), vigra_ext::LUTTraits::max()); - if (alpha_source_range.first != mask_destination_range.first || alpha_source_range.second != mask_destination_range.second) - { - // we need to scale the alpha channel - const linear_transform alpha_rescaler(alpha_source_range, mask_destination_range); - switch (pixel_t_of_string(decoder->getPixelType())) - { - case UNSIGNED_INT_8: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case UNSIGNED_INT_16: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case UNSIGNED_INT_32: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case SIGNED_INT_16: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case SIGNED_INT_32: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case IEEE_FLOAT_32: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - case IEEE_FLOAT_64: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, alpha_rescaler); - break; - default: - vigra_fail("vigra::detail::importImageAlpha: not reached"); - } - } - else + // we need to scale the alpha channel, applying threshold function at the same time + const threshold_alpha_transform alpha_rescaler(alpha_source_range, mask_destination_range); + switch (pixel_t_of_string(decoder->getPixelType())) { - switch (pixel_t_of_string(decoder->getPixelType())) - { - case UNSIGNED_INT_8: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case UNSIGNED_INT_16: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case UNSIGNED_INT_32: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case SIGNED_INT_16: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case SIGNED_INT_32: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case IEEE_FLOAT_32: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - case IEEE_FLOAT_64: - read_image_bands_and_alpha(decoder.get(), - image_iterator, image_accessor, - alpha_iterator, alpha_accessor, identity()); - break; - default: - vigra_fail("vigra::detail::importImageAlpha: not reached"); - } + case UNSIGNED_INT_8: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case UNSIGNED_INT_16: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case UNSIGNED_INT_32: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case SIGNED_INT_16: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case SIGNED_INT_32: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case IEEE_FLOAT_32: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + case IEEE_FLOAT_64: + read_image_bands_and_alpha(decoder.get(), + image_iterator, image_accessor, + alpha_iterator, alpha_accessor, alpha_rescaler); + break; + default: + vigra_fail("vigra::detail::importImageAlpha: not reached"); } decoder->close(); diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/lut.h hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/lut.h --- hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/lut.h 2015-05-10 06:52:11.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/lut.h 2018-02-03 14:34:26.000000000 +0000 @@ -149,7 +149,7 @@ lut_type applyLutInteger(VT1 v) const { // lut type. - assert(m_lut.size() > 0); + assert(!m_lut.empty()); if (m_lut.size() == LUTTraits::max()) { return m_lut[v]; } else { @@ -169,7 +169,7 @@ lut_type applyLutFloat(double v) const { - assert(m_lut.size() > 0); + assert(!m_lut.empty()); if (v > 1) return m_lut.back(); if (v < 0) return 0; double x=v*(m_lut.size()-1); @@ -197,7 +197,7 @@ // lookup vector types (the lut needs to be long enought!) vigra::RGBValue applyVector(vigra::RGBValue v, vigra::VigraTrueType) const { - assert(m_lut.size() > 0); + assert(!m_lut.empty()); vigra::RGBValue ret; for (size_t i=0; i < v.size(); i++) { ret[i] = applyLutInteger(v[i]); @@ -274,7 +274,7 @@ // assume float is scaled 0..1 lut_type applyLutFloat(lut_type v) const { - assert(m_lut.size() > 0); + assert(!m_lut.empty()); if (v >= m_lut.back()) return m_lut.back(); if (v < m_lut[0]) return 0; diff -Nru hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/ransac.h hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/ransac.h --- hugin-2018.0.0+dfsg/src/hugin_base/vigra_ext/ransac.h 2016-05-20 18:46:18.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_base/vigra_ext/ransac.h 2018-02-03 14:34:26.000000000 +0000 @@ -402,7 +402,7 @@ exactEstimateData.push_back(&(data[arr[j]])); paramEstimator.estimate(exactEstimateData,exactEstimateParameters); //singular data configuration - if(exactEstimateParameters.size()==0) + if(exactEstimateParameters.empty()) return; for(j=0; j header */ -#cmakedefine HAVE_STD_FILESYSTEM +#cmakedefine HAVE_STD_FILESYSTEM 1 + +/* if using EGL for OpenGL initialization */ +#cmakedefine HAVE_EGL 1 + +/* Build a fully self contained OSX bundle (with embedded ressources) */ +#cmakedefine UNIX_SELF_CONTAINED_BUNDLE 1 + +/* Store settings according to XDG specification, works only with wxWidgets 3.1.1 or later */ +#cmakedefine USE_XDG_DIRS 1 #endif diff -Nru hugin-2018.0.0+dfsg/src/hugin_cpfind/cpfind/main.cpp hugin-2019.0.0+dfsg/src/hugin_cpfind/cpfind/main.cpp --- hugin-2018.0.0+dfsg/src/hugin_cpfind/cpfind/main.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_cpfind/cpfind/main.cpp 2018-02-03 14:34:26.000000000 +0000 @@ -412,7 +412,7 @@ { ioPanoDetector.setMatchingStrategy(PanoDetector::PREALIGNED); }; - if(keyfilesIndex.size()>0) + if(!keyfilesIndex.empty()) { ioPanoDetector.setKeyPointsIdx(keyfilesIndex); }; diff -Nru hugin-2018.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetector.cpp hugin-2019.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetector.cpp --- hugin-2018.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetector.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetector.cpp 2018-02-03 14:34:26.000000000 +0000 @@ -161,7 +161,7 @@ std::cout << "Output file : " << _outputFile << std::endl; }; } - if(_keypath.size()>0) + if(!_keypath.empty()) { std::cout << "Path to keyfiles : " << _keypath << std::endl; }; @@ -251,7 +251,7 @@ } std::cout << "Image " << i << std::endl << " Imagefile: " << name << std::endl; bool writeKeyfileForImage=false; - if(_keyPointsIdx.size()>0) + if(!_keyPointsIdx.empty()) { for(unsigned j=0; j<_keyPointsIdx.size() && !writeKeyfileForImage; j++) { @@ -367,7 +367,7 @@ virtual void run() { //TRACE_PAIR("Matching..."); - if(_matchData._i1->_kp.size()>0 && _matchData._i2->_kp.size()>0) + if(!_matchData._i1->_kp.empty() && !_matchData._i2->_kp.empty()) { PanoDetector::FindMatchesInPair(_matchData, _panoDetector); PanoDetector::RansacMatchesInPair(_matchData, _panoDetector); @@ -598,7 +598,7 @@ }; // Detect matches if writeKeyPoints wasn't set - if(_keyPointsIdx.size() == 0) + if(_keyPointsIdx.empty()) { switch (getMatchingStrategy()) { diff -Nru hugin-2018.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp hugin-2019.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp --- hugin-2018.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp 2018-02-03 14:34:26.000000000 +0000 @@ -98,7 +98,7 @@ TRACE_IMG("Loading keypoints..."); lfeat::ImageInfo info = lfeat::loadKeypoints(ioImgInfo._keyfilename, ioImgInfo._kp); - ioImgInfo._loadFail = (info.filename.size() == 0); + ioImgInfo._loadFail = (info.filename.empty()); // update ImgData if(ioImgInfo.NeedsRemapping()) @@ -849,7 +849,7 @@ { TRACE_IMG("Build KDTree..."); - if(ioImgInfo._kp.size()==0) + if(ioImgInfo._kp.empty()) { return false; }; diff -Nru hugin-2018.0.0+dfsg/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp hugin-2019.0.0+dfsg/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp --- hugin-2018.0.0+dfsg/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp 2016-05-20 18:46:18.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp 2018-02-03 14:34:26.000000000 +0000 @@ -53,7 +53,7 @@ _ori_gridsize(ori_gridsize) { // default parameters - if (rings.size() == 0) + if (rings.empty()) { rings.push_back(1); ring_radius.push_back(0); diff -Nru hugin-2018.0.0+dfsg/src/tools/align_image_stack.cpp hugin-2019.0.0+dfsg/src/tools/align_image_stack.cpp --- hugin-2018.0.0+dfsg/src/tools/align_image_stack.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/align_image_stack.cpp 2019-01-17 17:00:11.000000000 +0000 @@ -104,6 +104,11 @@ << " --distortion Try to load distortion information from lens database" << std::endl << " --use-given-order Use the image order as given from command line" << std::endl << " (By default images will be sorted by exposure values.)" << std::endl + << " --align-to-first Align all images to the first one. By default" << std::endl + << " align_image_stack matches all image pairs" << std::endl + << " consecutive." << std::endl + << " This implies also the --use-given-order option" << std::endl + << " --dont-remap-ref Don't output the remapped reference image" << std::endl << " --gpu Use GPU for remapping" << std::endl << " -h Display help (this text)" << std::endl << std::endl; @@ -475,6 +480,8 @@ gpu = false; loadDistortion = false; sortImagesByEv = true; + alignToFirst = false; + dontRemapRef = false; } double cpErrorThreshold; @@ -497,6 +504,8 @@ bool gpu; bool loadDistortion; bool sortImagesByEv; + bool alignToFirst; + bool dontRemapRef; int pyrLevel; std::string alignedPrefix; std::string ptoFile; @@ -689,11 +698,7 @@ pano.unlinkImageVariableRadialDistortionCenterShift(0); } // All images are in the same stack: Link the stack variable. - pano.linkImageVariableStack(imgNr, 0); - // exposure value is linked, reset to value found in EXIF - pano.unlinkImageVariableExposureValue(0); - srcImg.setExposureValue(srcImg.calcExifExposureValue()); - pano.setSrcImage(i, srcImg); + pano.linkImageVariableStack(0, imgNr); images.push_back(i); // optimize yaw, roll, pitch std::set vars; @@ -769,8 +774,16 @@ { if (g_verbose > 0) { - std::cout << "Creating control points between " << pano.getSrcImage(images[i-1]).getFilename().c_str() << " and " << - pano.getSrcImage(images[i]).getFilename().c_str() << std::endl; + if (param.alignToFirst) + { + std::cout << "Creating control points between " << pano.getSrcImage(images[0]).getFilename().c_str() << " and " << + pano.getSrcImage(images[i]).getFilename().c_str() << std::endl; + } + else + { + std::cout << "Creating control points between " << pano.getSrcImage(images[i - 1]).getFilename().c_str() << " and " << + pano.getSrcImage(images[i]).getFilename().c_str() << std::endl; + }; } // load the actual image data of the next image @@ -796,15 +809,24 @@ // add control points. // work on smaller images // TODO: or use a fast interest point operator. - createCtrlPoints(pano, images[i-1], *leftImg, *leftImgOrig, images[i], *rightImg, *rightImgOrig, param.pyrLevel, 2, param.nPoints, param.grid, param.corrThresh, param.stereo); + if (param.alignToFirst) + { + createCtrlPoints(pano, 0, *leftImg, *leftImgOrig, images[i], *rightImg, *rightImgOrig, param.pyrLevel, 2, param.nPoints, param.grid, param.corrThresh, param.stereo); + vigra::initImage(vigra::destImageRange(*rightImg), vigra::NumericTraits::zero()); + vigra::initImage(vigra::destImageRange(*rightImgOrig), vigra::NumericTraits::zero()); + } + else + { + createCtrlPoints(pano, images[i - 1], *leftImg, *leftImgOrig, images[i], *rightImg, *rightImgOrig, param.pyrLevel, 2, param.nPoints, param.grid, param.corrThresh, param.stereo); - // swap images; - delete leftImg; - delete leftImgOrig; - leftImg = rightImg; - leftImgOrig = rightImgOrig; - rightImg = new ImageType(leftImg->size()); - rightImgOrig = new ImageType(leftImgOrig->size()); + // swap images; + delete leftImg; + delete leftImgOrig; + leftImg = rightImg; + leftImgOrig = rightImgOrig; + rightImg = new ImageType(leftImg->size()); + rightImgOrig = new ImageType(leftImgOrig->size()); + }; } delete leftImg; delete rightImg; @@ -844,6 +866,21 @@ { alignStereoWindow(pano, param.pop_out); } + if (param.optHFOV) + { + // check that reference image contains cp, otherwise optimizing hfov + // goes haywire + if (pano.getCtrlPointsForImage(0).empty()) + { + std::cerr << std::endl << "After control points pruning reference images has no control" << std::endl + << "points Optimizing field of view in this case results in undefined" << std::endl + << "behaviour. Increase error distance (-t parameter), tweak cp" << std::endl + << "detection parameters or don't optimize HFOV." << std::endl + << std::endl + << "Exiting..." << std::endl; + return 1; + }; + }; // reoptimize optimizeError = (HuginBase::PTools::optimize(pano) > 0); } @@ -852,11 +889,16 @@ { autoCrop(pano); } + // deactivate ref image if requested + if (param.dontRemapRef) + { + pano.activateImage(0, false); + }; HuginBase::UIntSet imgs = pano.getActiveImages(); if (optimizeError) { - if (param.ptoFile.size() > 0) + if (!param.ptoFile.empty()) { std::ofstream script(param.ptoFile.c_str()); pano.printPanoramaScript(script, optvars, pano.getOptions(), imgs, false, ""); @@ -879,7 +921,6 @@ opts.outputFormat = HuginBase::PanoramaOptions::HDR; opts.outputPixelType = "FLOAT"; opts.outputMode = HuginBase::PanoramaOptions::OUTPUT_HDR; - opts.outfile = param.hdrFile; pano.setOptions(opts); // remap all images @@ -893,8 +934,8 @@ progress = new AppBase::DummyProgressDisplay(); }; HuginBase::Nona::stitchPanorama(pano, pano.getOptions(), - progress, opts.outfile, imgs); - std::cout << "Written HDR output to " << opts.outfile << std::endl; + progress, param.hdrFile, imgs); + std::cout << "Written HDR output to " << param.hdrFile << std::endl; delete progress; } if (param.alignedPrefix.size()) @@ -904,7 +945,6 @@ opts.outputMode = HuginBase::PanoramaOptions::OUTPUT_LDR; opts.outputFormat = HuginBase::PanoramaOptions::TIFF_m; opts.outputPixelType = ""; - opts.outfile = param.alignedPrefix; opts.remapUsingGPU = param.gpu; pano.setOptions(opts); // remap all images @@ -921,13 +961,13 @@ HuginBase::Nona::AdvancedOptions advOpts; HuginBase::Nona::SetAdvancedOption(advOpts, "ignoreExposure", true); HuginBase::Nona::stitchPanorama(pano, pano.getOptions(), - progress, opts.outfile, imgs, advOpts); + progress, param.alignedPrefix, imgs, advOpts); delete progress; - std::cout << "Written aligned images to files with prefix \"" << opts.outfile << "\"" << std::endl; + std::cout << "Written aligned images to files with prefix \"" << param.alignedPrefix << "\"" << std::endl; } // At this point we have panorama options set according to the output - if (param.ptoFile.size() > 0) + if (!param.ptoFile.empty()) { std::ofstream script(param.ptoFile.c_str()); pano.printPanoramaScript(script, optvars, pano.getOptions(), imgs, false, ""); @@ -960,15 +1000,20 @@ GPU, LENSDB, USEGIVENORDER, + ALIGNTOFIRST, + DONTREMAPREF, }; static struct option longOptions[] = { {"corr", required_argument, NULL, CORRTHRESH }, + {"verbose", no_argument, NULL, 'v'}, {"threads", required_argument, NULL, THREADS }, {"gpu", no_argument, NULL, GPU }, {"distortion", no_argument, NULL, LENSDB }, {"use-given-order", no_argument, NULL, USEGIVENORDER }, + {"align-to-first", no_argument, NULL, ALIGNTOFIRST}, + {"dont-remap-ref", no_argument, NULL, DONTREMAPREF}, {"help", no_argument, NULL, 'h' }, 0 }; @@ -1090,6 +1135,13 @@ case USEGIVENORDER: param.sortImagesByEv = false; break; + case ALIGNTOFIRST: + param.alignToFirst = true; + param.sortImagesByEv = false; + break; + case DONTREMAPREF: + param.dontRemapRef = true; + break; case ':': case '?': // missing argument or invalid switch diff -Nru hugin-2018.0.0+dfsg/src/tools/autooptimiser.cpp hugin-2019.0.0+dfsg/src/tools/autooptimiser.cpp --- hugin-2018.0.0+dfsg/src/tools/autooptimiser.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/autooptimiser.cpp 2019-03-09 10:55:21.000000000 +0000 @@ -265,7 +265,7 @@ { bool hasVerticalLines=false; HuginBase::CPVector allCP=pano.getCtrlPoints(); - if(allCP.size()>0 && (doPairwise || doAutoOpt || doNormalOpt)) + if(!allCP.empty() && (doPairwise || doAutoOpt || doNormalOpt)) { for(size_t i=0; i0) + if (!CPtoRemove.empty()) for (HuginBase::UIntSet::reverse_iterator it = CPtoRemove.rbegin(); it != CPtoRemove.rend(); ++it) { pano.removeCtrlPoint(*it); @@ -235,7 +235,7 @@ std::cout << std::endl << "Skipping optimisation, current image positions will be used." << std::endl; }; CPtoRemove=getCPoutsideLimit(pano, n, skipOptimisation, includeLineCp); - if (CPtoRemove.size()>0) + if (!CPtoRemove.empty()) for (HuginBase::UIntSet::reverse_iterator it = CPtoRemove.rbegin(); it != CPtoRemove.rend(); ++it) { pano.removeCtrlPoint(*it); diff -Nru hugin-2018.0.0+dfsg/src/tools/fulla.cpp hugin-2019.0.0+dfsg/src/tools/fulla.cpp --- hugin-2018.0.0+dfsg/src/tools/fulla.cpp 2017-12-10 09:30:51.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/fulla.cpp 2018-12-06 19:10:15.000000000 +0000 @@ -788,7 +788,7 @@ vigra::ImageExportInfo outInfo(outfile); outInfo.setICCProfile(info.getICCProfile()); outInfo.setPixelType(info.getPixelType()); - if (compression.size() > 0) + if (!compression.empty()) { outInfo.setCompression(compression.c_str()); } diff -Nru hugin-2018.0.0+dfsg/src/tools/geocpset.cpp hugin-2019.0.0+dfsg/src/tools/geocpset.cpp --- hugin-2018.0.0+dfsg/src/tools/geocpset.cpp 2017-04-22 17:03:09.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/geocpset.cpp 2018-10-06 07:21:49.000000000 +0000 @@ -153,7 +153,7 @@ }; // have we found unconnected images? - if(imgsToTest.size()==0) + if(imgsToTest.empty()) { std::cout << "No unconnected images found." << std::endl << "No control point added." << std::endl; @@ -385,12 +385,6 @@ return 1; } - if(pano.getNrOfImages()==0) - { - std::cerr << "error: project file does not contains any image" << std::endl - << "aborting processing" << std::endl; - return 1; - }; if(pano.getNrOfImages()==1) { std::cerr << "error: project file contains only one image" << std::endl diff -Nru hugin-2018.0.0+dfsg/src/tools/hugin_lensdb.cpp hugin-2019.0.0+dfsg/src/tools/hugin_lensdb.cpp --- hugin-2018.0.0+dfsg/src/tools/hugin_lensdb.cpp 2017-04-22 17:03:09.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/hugin_lensdb.cpp 2018-02-21 16:22:41.000000000 +0000 @@ -29,14 +29,7 @@ #include #include #include "hugin_config.h" -#ifdef HAVE_STD_FILESYSTEM -#include -namespace fs = std::tr2::sys; -#else -#define BOOST_FILESYSTEM_VERSION 3 -#include -namespace fs = boost::filesystem; -#endif +#include #include #include #include @@ -106,7 +99,7 @@ { return false; }; - std::cout << "Checking " << filename.string(); + std::cout << "Checking " << filename.string() << "..." << std::endl; HuginBase::StandardImageVariableGroups lenses(pano); if (lenses.getLenses().getNumberOfParts()==1) { diff -Nru hugin-2018.0.0+dfsg/src/tools/linefind.cpp hugin-2019.0.0+dfsg/src/tools/linefind.cpp --- hugin-2018.0.0+dfsg/src/tools/linefind.cpp 2017-04-22 17:03:09.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/linefind.cpp 2019-03-09 09:42:52.000000000 +0000 @@ -35,6 +35,7 @@ #include #include #include +#include extern "C" { @@ -124,15 +125,14 @@ } template -vigra::BImage LoadGrayImageAndConvert(vigra::ImageImportInfo& info) +vigra::BImage LoadGrayImageAndConvert(vigra::ImageImportInfo& info, vigra::BImage& mask) { vigra::BImage image; SrcIMG imageIn(info.width(),info.height()); if(info.numExtraBands()==1) { - vigra::BImage mask(info.size()); + mask.resize(info.width(), info.height()); vigra::importImageAlpha(info,destImage(imageIn),destImage(mask)); - mask.resize(0,0); } else { @@ -144,15 +144,14 @@ }; template -vigra::UInt8RGBImage LoadImageAndConvert(vigra::ImageImportInfo& info) +vigra::UInt8RGBImage LoadImageAndConvert(vigra::ImageImportInfo& info, vigra::BImage& mask) { vigra::UInt8RGBImage image; SrcIMG imageIn(info.width(),info.height()); if(info.numExtraBands()==1) { - vigra::BImage mask(info.size()); + mask.resize(info.width(), info.height()); vigra::importImageAlpha(info,destImage(imageIn),destImage(mask)); - mask.resize(0,0); } else { @@ -167,6 +166,7 @@ HuginBase::CPVector LoadGrayImageAndFindLines(vigra::ImageImportInfo info, HuginBase::Panorama& pano, size_t imgNr, int nrLines) { vigra::BImage image; + vigra::BImage mask; HuginBase::CPVector lineCp; std::string pixelType=info.getPixelType(); if(pixelType=="UINT8") @@ -174,9 +174,8 @@ image.resize(info.width(),info.height()); if(info.numExtraBands()==1) { - vigra::BImage mask(info.size()); + mask.resize(info.width(), info.height()); vigra::importImageAlpha(info,destImage(image),destImage(mask)); - mask.resize(0,0); } else { @@ -187,19 +186,19 @@ { if(pixelType=="UINT16" || pixelType=="INT16") { - image=LoadGrayImageAndConvert(info); + image=LoadGrayImageAndConvert(info, mask); } else { if(pixelType=="INT32" || pixelType=="UINT32") { - image=LoadGrayImageAndConvert(info); + image=LoadGrayImageAndConvert(info, mask); } else { if(pixelType=="FLOAT" || pixelType=="DOUBLE") { - image=LoadGrayImageAndConvert(info); + image=LoadGrayImageAndConvert(info, mask); } else { @@ -210,7 +209,7 @@ }; if(image.width()>0 && image.height()>0) { - lineCp=HuginLines::GetVerticalLines(pano, imgNr, image, nrLines); + lineCp=HuginLines::GetVerticalLines(pano, imgNr, image, mask, nrLines); }; return lineCp; }; @@ -219,6 +218,7 @@ HuginBase::CPVector LoadImageAndFindLines(vigra::ImageImportInfo info, HuginBase::Panorama& pano, size_t imgNr, int nrLines) { vigra::UInt8RGBImage image; + vigra::BImage mask; HuginBase::CPVector lineCp; std::string pixelType=info.getPixelType(); if(pixelType=="UINT8") @@ -226,9 +226,8 @@ image.resize(info.width(),info.height()); if(info.numExtraBands()==1) { - vigra::BImage mask(info.size()); + mask.resize(info.width(), info.height()); vigra::importImageAlpha(info,destImage(image),destImage(mask)); - mask.resize(0,0); } else { @@ -239,19 +238,19 @@ { if(pixelType=="UINT16" || pixelType=="INT16") { - image=LoadImageAndConvert(info); + image=LoadImageAndConvert(info, mask); } else { if(pixelType=="INT32" || pixelType=="UINT32") { - image=LoadImageAndConvert(info); + image=LoadImageAndConvert(info, mask); } else { if(pixelType=="FLOAT" || pixelType=="DOUBLE") { - image=LoadImageAndConvert(info); + image=LoadImageAndConvert(info, mask); } else { @@ -262,7 +261,7 @@ }; if(image.width()>0 && image.height()>0) { - lineCp=HuginLines::GetVerticalLines(pano, imgNr, image, nrLines); + lineCp=HuginLines::GetVerticalLines(pano, imgNr, image, mask, nrLines); } return lineCp; }; @@ -370,12 +369,9 @@ return 1; } - if(pano.getNrOfImages()==0) - { - std::cerr << "error: project file does not contains any image" << std::endl; - std::cerr << "aborting processing" << std::endl; - return 1; - }; + // disable progress messages from libpano optimizer + PT_setProgressFcn(ptProgress); + PT_setInfoDlgFcn(ptinfoDlg); std::vector imagesToProcess; if(cmdlineImages.empty()) @@ -404,6 +400,36 @@ std::copy(stackImages.begin(), stackImages.end(), std::back_inserter(imagesToProcess)); }; }; + if (pano.getNrOfCtrlPoints()) + { + // pano has already control points, so do a pair-wise optimisation to get + // rough positions of the images, so we can decide which images are near + // the zenit/nadir and ignore these images + HuginBase::Panorama optPano = pano.duplicate(); + // reset translation parameters + HuginBase::VariableMapVector varMapVec = optPano.getVariables(); + for (size_t i = 0; i < varMapVec.size(); i++) + { + map_get(varMapVec[i], "TrX").setValue(0); + map_get(varMapVec[i], "TrY").setValue(0); + map_get(varMapVec[i], "TrZ").setValue(0); + }; + optPano.updateVariables(varMapVec); + // now do a pairwise optimisation + HuginBase::AutoOptimise(optPano).run(); + std::vector imagesToCheck; + std::swap(imagesToProcess, imagesToCheck); + for (auto& img:imagesToCheck) + { + // now remove all images from list where pitch > 50 or < -50 -> images near zenit/nadir + if (std::abs(optPano.getImage(img).getPitch()) < 50) + { + imagesToProcess.push_back(img); + std::cout << "line"; + }; + std::cout << std::endl; + }; + } } else { @@ -423,9 +449,6 @@ return 1; }; - PT_setProgressFcn(ptProgress); - PT_setInfoDlgFcn(ptinfoDlg); - std::cout << hugin_utils::stripPath(argv[0]) << " is searching for vertical lines" << std::endl; #if _WIN32 //multi threading of image loading results sometime in a race condition @@ -434,11 +457,11 @@ std::string s=vigra::impexListExtensions(); #endif - size_t nrCPS=pano.getNrOfCtrlPoints(); - #pragma omp parallel for schedule(dynamic) + const size_t nrCPS=pano.getNrOfCtrlPoints(); +#pragma omp parallel for schedule(dynamic) for(int i=0; i < imagesToProcess.size(); ++i) { - unsigned int imgNr=imagesToProcess[i]; + const size_t imgNr = imagesToProcess[i]; std::ostringstream buf; buf << "Working on image " << pano.getImage(imgNr).getFilename() << std::endl; std::cout << buf.str(); diff -Nru hugin-2018.0.0+dfsg/src/tools/nona.cpp hugin-2019.0.0+dfsg/src/tools/nona.cpp --- hugin-2018.0.0+dfsg/src/tools/nona.cpp 2017-12-10 09:30:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/nona.cpp 2019-01-05 15:48:46.000000000 +0000 @@ -66,7 +66,7 @@ << " Options: " << std::endl << " -c create coordinate images (only TIFF_m output)" << std::endl << " -v verbose output" << std::endl - << " -d print detailed output for gpu processing" << std::endl + << " -d|--debug print detailed output for gpu processing" << std::endl << " -g|--gpu perform image remapping on the GPU" << std::endl << std::endl << " The following options can be used to override settings in the project file:" << std::endl @@ -95,6 +95,8 @@ << " --bigtiff Use BigTIFF format for TIFF images" << std::endl << " --ignore-exposure don't correct exposure" << std::endl << " (this does not work with -e switch together)" << std::endl + << " --output-range-compression=value set range compression" << std::endl + << " value should be a real in range 0..20" << std::endl << " --save-intermediate-images saves also the intermediate" << std::endl << " images (only when output is TIFF, PNG or JPEG)" << std::endl << " --intermediate-suffix=SUFFIX suffix for intermediate images" << std::endl @@ -125,6 +127,7 @@ HuginBase::PanoramaOptions::OutputMode outputMode = HuginBase::PanoramaOptions::OUTPUT_LDR; bool overrideExposure = false; double exposure=0; + double rangeCompression = -1; HuginBase::Nona::AdvancedOptions advOptions; int verbose = 0; bool useGPU = false; @@ -139,7 +142,8 @@ EXPOSURELAYERS, MASKCLIPEXPOSURE, SEAMMODE, - USE_BIGTIFF + USE_BIGTIFF, + RANGECOMPRESSION }; static struct option longOptions[] = { @@ -152,7 +156,10 @@ { "seam", required_argument, NULL, SEAMMODE}, { "gpu", no_argument, NULL, 'g'}, { "bigtiff", no_argument, NULL, USE_BIGTIFF }, + { "output-range-compression", required_argument, NULL, RANGECOMPRESSION }, { "help", no_argument, NULL, 'h'}, + { "debug", no_argument, NULL, 'd'}, + { "output", required_argument, NULL, 'o'}, 0 }; @@ -299,6 +306,18 @@ case USE_BIGTIFF: HuginBase::Nona::SetAdvancedOption(advOptions, "useBigTIFF", true); break; + case RANGECOMPRESSION: + if (!hugin_utils::stringToDouble(std::string(optarg), rangeCompression)) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": Could not parse output range compression (" << optarg << ")." << std::endl; + return 1; + }; + if (rangeCompression < 0.0 || rangeCompression > 20.0) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": range compression must be a real between 0 and 20." << std::endl; + return 1; + }; + break; case ':': case '?': // missing argument or invalid switch @@ -453,7 +472,7 @@ }; }; - if (outputPixelType.size() > 0) + if (!outputPixelType.empty()) { opts.outputPixelType = outputPixelType; } @@ -466,13 +485,25 @@ if (overrideExposure) { opts.outputExposureValue = exposure; - if (HuginBase::Nona::GetAdvancedOption(advOptions, "ignoreExosure", false)) + if (HuginBase::Nona::GetAdvancedOption(advOptions, "ignoreExposure", false)) { HuginBase::Nona::SetAdvancedOption(advOptions, "ignoreExposure", false); std::cout << "WARNING: Switches --ignore-exposure and -e can't to used together." << std::endl << " Ignore switch --ignore-exposure." << std::endl; } } + if (rangeCompression >= 0.0) + { + if (HuginBase::Nona::GetAdvancedOption(advOptions, "ignoreExposure", false)) + { + std::cout << "WARNING: Switch --ignore-exposure disables range compression." << std::endl + << " --output-range-compression is therefore ignored." << std::endl; + } + else + { + opts.outputRangeCompression = rangeCompression; + }; + }; if (outputImages.empty()) { @@ -532,6 +563,10 @@ if (useGPU) { useGPU = hugin_utils::initGPU(&argc, argv); + if (!useGPU) + { + std::cout << "Could not initialize GPU. Switching back to CPU calculation." << std::endl; + }; } opts.remapUsingGPU = useGPU; pano.setOptions(opts); diff -Nru hugin-2018.0.0+dfsg/src/tools/pano_modify.cpp hugin-2019.0.0+dfsg/src/tools/pano_modify.cpp --- hugin-2018.0.0+dfsg/src/tools/pano_modify.cpp 2017-04-22 17:03:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/pano_modify.cpp 2019-01-26 14:47:09.000000000 +0000 @@ -52,6 +52,9 @@ << " Options:" << std::endl << " -o, --output=file.pto Output Hugin PTO file. Default: _mod.pto" << std::endl << " -p, --projection=x Sets the output projection to number x" << std::endl + << " --projection-parameter=x Sets the parameter of the projection" << std::endl + << " (Several parameters are separated by"< projParameter; double newHFOV=-1; double newVFOV=-1; int scale=100; @@ -168,6 +191,8 @@ double y = 0; double z = 0; double outputExposure = -1000; + double outputRangeCompression = -1; + bool relativeExposure = false; bool calcMeanExposure = false; std::string outputType; std::string ldrfiletype; @@ -177,6 +202,11 @@ std::string output; std::string param; std::string blender; +#define EMPTYARG "(empty)" + std::string blenderArgs(EMPTYARG); + std::string fusionArgs(EMPTYARG); + std::string hdrMergeArgs(EMPTYARG); + int interpolation = -1; while ((c = getopt_long (argc, argv, optstring, longOptions,nullptr)) != -1) { switch (c) @@ -201,6 +231,26 @@ return 1; }; break; + case SWITCH_PROJECTION_PARAMETER: + // projection parameters + { + // split at space or comma + std::vector parameter = hugin_utils::SplitString(optarg, ", "); + for(const auto& p: parameter) + { + double d; + if (hugin_utils::stringToDouble(p, d)) + { + projParameter.push_back(d); + } + else + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": Could not parse projection parameters \"" << optarg << "\"." << std::endl; + return 1; + }; + }; + } + break; case SWITCH_FOV: //field of view param=optarg; @@ -352,14 +402,40 @@ } else { - int n = sscanf(optarg, "%lf", &outputExposure); - if (n != 1) + if (!param.empty()) + { + // if first character is r assume relative exposure values + relativeExposure = (param[0] == 'R'); + if (relativeExposure) + { + param.erase(0, 1); + }; + int n = sscanf(param.c_str(), "%lf", &outputExposure); + if (n != 1) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": Could not parse output exposure value." << std::endl; + return 1; + }; + } + else { std::cerr << hugin_utils::stripPath(argv[0]) << ": Could not parse output exposure value." << std::endl; return 1; }; }; break; + case SWITCH_RANGE_COMPRESSION: + if(!hugin_utils::stringToDouble(std::string(optarg), outputRangeCompression)) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": Could not parse output range compression (" << optarg << ")." << std::endl; + return 1; + }; + if (outputRangeCompression < 0.0 || outputRangeCompression > 20.0) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": range compression must be a real between 0 and 20." << std::endl; + return 1; + }; + break; case SWITCH_OUTPUT_TYPE: if (!outputType.empty()) { @@ -382,6 +458,15 @@ case SWITCH_HDRCOMPRESSION: hdrcompression = hugin_utils::toupper(hugin_utils::StrTrim(optarg)); break; + case SWITCH_BLENDER_ARGS: + blenderArgs = optarg; + break; + case SWITCH_FUSION_ARGS: + fusionArgs = optarg; + break; + case SWITCH_HDRMERGE_ARGS: + hdrMergeArgs = optarg; + break; case SWITCH_ROTATE: { int n=sscanf(optarg, "%lf,%lf,%lf", &yaw, &pitch, &roll); @@ -402,6 +487,18 @@ }; }; break; + case SWITCH_INTERPOLATION: + if (!hugin_utils::stringToInt(optarg, interpolation)) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": Could not parse interpolation value. Given: \"" << optarg << "\"" << std::endl; + return 1; + }; + if (interpolation<0 || interpolation>vigra_ext::INTERP_SINC_1024) + { + std::cerr << hugin_utils::stripPath(argv[0]) << ": Interpolator " << interpolation << " is not valid." << std::endl; + return 1; + } + break; case ':': case '?': // missing argument or invalid switch @@ -468,6 +565,42 @@ } pano.setOptions(opt); }; + // set projection parameters + if (!projParameter.empty()) + { + HuginBase::PanoramaOptions opt = pano.getOptions(); + if (projParameter.size() > opt.m_projFeatures.numberOfParameters) + { + std::cout << "Warning: Given " << projParameter.size() << " projection parameters, but projection supports" << std::endl + << " only " << opt.m_projFeatures.numberOfParameters << ". Ignoring surplus parameters." << std::endl; + while (projParameter.size() > opt.m_projFeatures.numberOfParameters) + { + projParameter.pop_back(); + } + } + if (!projParameter.empty()) + { + std::vector newProjParameters = opt.getProjectionParameters(); + std::copy(projParameter.begin(), projParameter.end(), newProjParameters.begin()); + opt.setProjectionParameters(newProjParameters); + // read back, new the limits have been applied + newProjParameters = opt.getProjectionParameters(); + auto it = newProjParameters.begin(); + std::cout << "Setting projection parameters to: " << *it; + ++it; + while (it != newProjParameters.end()) + { + std::cout << ", " << *it; + ++it; + } + std::cout << std::endl; + pano.setOptions(opt); + } + else + { + std::cout << "Warning: Current projection does not support projection parameters." << std::endl; + } + } // output exposure value if (outputExposure > -1000 || calcMeanExposure) { @@ -478,11 +611,26 @@ } else { - opt.outputExposureValue = outputExposure; + if (relativeExposure) + { + opt.outputExposureValue += outputExposure; + } + else + { + opt.outputExposureValue = outputExposure; + }; }; std::cout << "Setting output exposure value to " << opt.outputExposureValue << std::endl; pano.setOptions(opt); }; + // output range compression + if (outputRangeCompression >= 0.0) + { + HuginBase::PanoramaOptions opt = pano.getOptions(); + opt.outputRangeCompression = outputRangeCompression; + std::cout << "Setting output range compression to " << opt.outputRangeCompression << std::endl; + pano.setOptions(opt); + }; // output type: normal, fused, hdr pano.. if (!outputType.empty()) { @@ -625,6 +773,39 @@ }; pano.setOptions(opt); } + if (blenderArgs != EMPTYARG) + { + HuginBase::PanoramaOptions opt = pano.getOptions(); + switch (opt.blendMode) + { + case HuginBase::PanoramaOptions::ENBLEND_BLEND: + opt.enblendOptions = blenderArgs; + std::cout << "Setting enblend arguments to " << blenderArgs << std::endl; + break; + case HuginBase::PanoramaOptions::INTERNAL_BLEND: + opt.verdandiOptions = blenderArgs; + std::cout << "Setting verdandi arguments to " << blenderArgs << std::endl; + break; + default: + std::cout << "Unknown blender in pto file." << std::endl; + break; + }; + pano.setOptions(opt); + }; + if (fusionArgs != EMPTYARG) + { + HuginBase::PanoramaOptions opt = pano.getOptions(); + opt.enfuseOptions = fusionArgs; + std::cout << "Setting enfuse arguments to " << fusionArgs << std::endl; + pano.setOptions(opt); + }; + if (hdrMergeArgs != EMPTYARG) + { + HuginBase::PanoramaOptions opt = pano.getOptions(); + opt.hdrmergeOptions = hdrMergeArgs; + std::cout << "Setting hugin_hdrdmerge arguments to " << hdrMergeArgs << std::endl; + pano.setOptions(opt); + }; // ldr output file type if (!ldrfiletype.empty()) { @@ -848,6 +1029,14 @@ std::cout << "Set crop size to " << newROI.left() << "," << newROI.right() << "," << newROI.top() << "," << newROI.bottom() << std::endl; pano.setOptions(opt); }; + //setting interpolation method + if (interpolation>=0) + { + HuginBase::PanoramaOptions opt = pano.getOptions(); + opt.interpolator = static_cast(interpolation); + std::cout << "Set interpolation method to " << interpolation << std::endl; + pano.setOptions(opt); + }; //write output HuginBase::OptimizeVector optvec = pano.getOptimizeVector(); diff -Nru hugin-2018.0.0+dfsg/src/tools/pto_gen.cpp hugin-2019.0.0+dfsg/src/tools/pto_gen.cpp --- hugin-2018.0.0+dfsg/src/tools/pto_gen.cpp 2017-12-10 09:30:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/pto_gen.cpp 2019-01-16 21:38:21.000000000 +0000 @@ -253,6 +253,8 @@ sort(filelist.begin(),filelist.end(),doj::alphanum_less()); HuginBase::Panorama pano; + double redBalanceAnchor = 1.0; + double blueBalanceAnchor = 1.0; for(size_t i=0; i1) { - double redBalanceAnchor=pano.getImage(pano.getOptions().colorReferenceImage).getExifRedBalance(); - double blueBalanceAnchor=pano.getImage(pano.getOptions().colorReferenceImage).getExifBlueBalance(); - if(fabs(redBalanceAnchor)<1e-2) - { - redBalanceAnchor=1; - }; - if(fabs(blueBalanceAnchor)<1e-2) - { - blueBalanceAnchor=1; - }; HuginBase::StandardImageVariableGroups variable_groups(pano); HuginBase::ImageVariableGroup& lenses = variable_groups.getLenses(); @@ -404,16 +413,7 @@ }; if(image!=-1) { - HuginBase::SrcPanoImage img=pano.getSrcImage(i); - double ev=img.getExposureValue(); lenses.switchParts(i,lenses.getPartNumber(image)); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_ExposureValue, i); - img.setExposureValue(ev); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceRed, i); - lenses.unlinkVariableImage(HuginBase::ImageVariableGroup::IVE_WhiteBalanceBlue, i); - img.setWhiteBalanceRed(img.getExifRedBalance()/redBalanceAnchor); - img.setWhiteBalanceBlue(img.getExifBlueBalance()/blueBalanceAnchor); - pano.setSrcImage(i, img); }; }; std::cout << std::endl << "Assigned " << lenses.getNumberOfParts() << " lenses." << std::endl; @@ -458,6 +458,11 @@ pano.linkImageVariableYaw(firstImgStack, firstImgStack + i); pano.linkImageVariablePitch(firstImgStack, firstImgStack + i); pano.linkImageVariableRoll(firstImgStack, firstImgStack + i); + pano.linkImageVariableX(firstImgStack, firstImgStack + i); + pano.linkImageVariableY(firstImgStack, firstImgStack + i); + pano.linkImageVariableZ(firstImgStack, firstImgStack + i); + pano.linkImageVariableTranslationPlaneYaw(firstImgStack, firstImgStack + i); + pano.linkImageVariableTranslationPlanePitch(firstImgStack, firstImgStack + i); }; }; }; diff -Nru hugin-2018.0.0+dfsg/src/tools/pto_lensstack.cpp hugin-2019.0.0+dfsg/src/tools/pto_lensstack.cpp --- hugin-2018.0.0+dfsg/src/tools/pto_lensstack.cpp 2017-04-22 17:03:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/pto_lensstack.cpp 2019-01-26 14:47:09.000000000 +0000 @@ -234,15 +234,8 @@ return 1; } - if(pano.getNrOfImages()==0) - { - std::cerr << "error: project file does not contains any image" << std::endl; - std::cerr << "aborting processing" << std::endl; - return 1; - }; - // new lenses - if(newLensImgs.size()>0) + if(!newLensImgs.empty()) { HuginBase::StandardImageVariableGroups variable_groups(pano); if(variable_groups.getLenses().getNumberOfParts()0) + if(!newStackImgs.empty()) { HuginBase::StandardImageVariableGroups variable_groups(pano); if(variable_groups.getStacks().getNumberOfParts()0) + if(!changeLensImgs.empty()) { HuginBase::StandardImageVariableGroups variable_groups(pano); size_t lensCount=variable_groups.getLenses().getNumberOfParts(); @@ -312,12 +305,12 @@ else { std::cout << "Warning: Pto project contains only one lens." << std::endl - << " Therefor the lens can not be changed. Use --new-lens instead." << std::endl; + << " Therefore the lens can not be changed. Use --new-lens instead." << std::endl; }; }; // change stacks - if(changeStackImgs.size()>0) + if(!changeStackImgs.empty()) { HuginBase::StandardImageVariableGroups variable_groups(pano); size_t stackCount=variable_groups.getStacks().getNumberOfParts(); diff -Nru hugin-2018.0.0+dfsg/src/tools/pto_mask.cpp hugin-2019.0.0+dfsg/src/tools/pto_mask.cpp --- hugin-2018.0.0+dfsg/src/tools/pto_mask.cpp 2017-04-22 17:03:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/pto_mask.cpp 2018-10-06 07:21:48.000000000 +0000 @@ -222,12 +222,6 @@ return 1; } - if(pano.getNrOfImages()==0) - { - std::cerr << "Error: project file does not contains any image" << std::endl; - return 1; - }; - //read masks and apply for(size_t i=0; i #include #include -#ifdef HAVE_STD_FILESYSTEM -#include -namespace fs = std::tr2::sys; -#define OVERWRITE_EXISTING std::tr2::sys::copy_options::overwrite_existing -#else -#define BOOST_FILESYSTEM_VERSION 3 -#ifdef __GNUC__ - #include "hugin_config.h" - #include - #if BOOST_VERSION<105700 - #if BOOST_VERSION>=105100 - // workaround a bug in boost filesystem - // boost filesystem is probably compiled with C++03 - // but Hugin is compiled with C++11, this results in - // conflicts in boost::filesystems at a enum - // see https://svn.boost.org/trac/boost/ticket/6779 - #define BOOST_NO_CXX11_SCOPED_ENUMS - #else - #define BOOST_NO_SCOPED_ENUMS - #endif - #endif -#endif -#include -namespace fs = boost::filesystem; -#define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists -#endif +#include #include #include #include @@ -152,11 +127,6 @@ return false; }; prjfile.close(); - if(pano.getNrOfImages()==0) - { - std::cerr << "ERROR: project " << input << " does not contain any images." << std::endl; - return false; - }; pathVec imagesFrom, imagesTo; // check if all images exists for(size_t i=0; i0) + if(!imagesFrom.empty()) { if(imagesFrom.size()==imagesTo.size()) { @@ -440,7 +410,7 @@ pathVec projectFiles; std::cout << "Searching project files in " << p << std::endl; SearchPTOFilesInDirectory(projectFiles, p.string(), recursive); - if(projectFiles.size()==0) + if(projectFiles.empty()) { std::cout << "No project files found in given directory " << p.string() << std::endl; return 0; diff -Nru hugin-2018.0.0+dfsg/src/tools/pto_template.cpp hugin-2019.0.0+dfsg/src/tools/pto_template.cpp --- hugin-2018.0.0+dfsg/src/tools/pto_template.cpp 2017-04-22 17:03:10.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/pto_template.cpp 2018-10-06 07:21:41.000000000 +0000 @@ -129,13 +129,6 @@ return 1; } - if(pano.getNrOfImages()==0) - { - std::cerr << "Error: project file does not contains any image" << std::endl; - std::cerr << "aborting processing" << std::endl; - return 1; - }; - HuginBase::Panorama newPano; std::ifstream templateStream(templateFile.c_str()); if (!templateStream.good()) diff -Nru hugin-2018.0.0+dfsg/src/tools/pto_var.cpp hugin-2019.0.0+dfsg/src/tools/pto_var.cpp --- hugin-2018.0.0+dfsg/src/tools/pto_var.cpp 2017-12-10 09:30:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/pto_var.cpp 2018-10-06 07:21:12.000000000 +0000 @@ -592,13 +592,6 @@ return 1; } - if(pano.getNrOfImages()==0) - { - std::cerr << "error: project file does not contains any image" << std::endl; - std::cerr << "aborting processing" << std::endl; - return 1; - }; - //link/unlink variables if(!linkVars.empty()) { diff -Nru hugin-2018.0.0+dfsg/src/tools/stacker.cpp hugin-2019.0.0+dfsg/src/tools/stacker.cpp --- hugin-2018.0.0+dfsg/src/tools/stacker.cpp 2017-12-10 09:30:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/stacker.cpp 2018-05-01 13:56:25.000000000 +0000 @@ -160,7 +160,7 @@ << " Only pixel which differ more than" << std::endl << " mask-sigma * standard deviation" << std::endl << " are visible in output" << std::endl - << " available for modes median|winsor|clip" << std::endl + << " available for modes median, winsor or sigma" << std::endl << " --mask-suffix=STRING Suffix for the masked input images" << std::endl << " (default: _mask)" << std::endl << " --mask-sigma=NUMBER Sigma parameter for input images masking" << std::endl @@ -1254,6 +1254,18 @@ { success = main_stacker>(images); } + else if (pixeltype == "UINT32") + { + success = main_stacker>(images); + } + else if (pixeltype == "FLOAT") + { + success = main_stacker>(images); + } + else if (pixeltype == "DOUBLE") + { + success = main_stacker>(images); + } else { std::cerr << " ERROR: unsupported pixel type: " << pixeltype << std::endl; @@ -1270,6 +1282,18 @@ { success = main_stacker(images); } + else if (pixeltype == "UINT32") + { + success = main_stacker(images); + } + else if (pixeltype == "FLOAT") + { + success = main_stacker(images); + } + else if (pixeltype == "DOUBLE") + { + success = main_stacker(images); + } else { std::cerr << " ERROR: unsupported pixel type: " << pixeltype << std::endl; diff -Nru hugin-2018.0.0+dfsg/src/tools/vig_optimize.cpp hugin-2019.0.0+dfsg/src/tools/vig_optimize.cpp --- hugin-2018.0.0+dfsg/src/tools/vig_optimize.cpp 2017-12-10 09:30:52.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/tools/vig_optimize.cpp 2018-02-03 14:34:27.000000000 +0000 @@ -268,13 +268,13 @@ { std::cout << "\rSelected " << points.size() << " points" << std::endl; } - if (points.size() == 0) + if (points.empty()) { std::cerr << "Error: no overlapping points found, exiting" << std::endl; return 1; } - if (outputPointsFile.size() > 0) + if (!outputPointsFile.empty()) { std::ofstream of(outputPointsFile.c_str()); for (std::vector::iterator it = points.begin(); it != points.end(); ++it) diff -Nru hugin-2018.0.0+dfsg/src/translations/ca_ES.po hugin-2019.0.0+dfsg/src/translations/ca_ES.po --- hugin-2018.0.0+dfsg/src/translations/ca_ES.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/ca_ES.po 2019-02-17 15:24:33.000000000 +0000 @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: Hugin 0.5\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2015-07-14 16:44+0200\n" "Last-Translator: Carles Ferrando Garcia \n" "Language-Team: Catalan >\n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: Catalan\n" "X-Poedit-Country: SPAIN\n" @@ -48,14 +48,14 @@ msgid "Searching for best crop..." msgstr "S'està cercant el millor escapçat..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "Programa extern %s no trobat en el paquet, tornant al camí del sistema" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -81,9 +81,9 @@ msgstr "Mapa de bits (*.bmp)|*.bmp | fitxer PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "El fitxer %s existeix. El voleu sobreescriure?" @@ -121,7 +121,7 @@ msgstr "El factor d'escapçat cal que sigui positiu." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -135,24 +135,28 @@ "Encara voleu utilitzar aquest valor alt?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -173,8 +177,8 @@ msgstr "Gran angular d'abast total" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirectangular" @@ -205,11 +209,13 @@ msgid "builtin" msgstr "Integració" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "Acceptable (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineal" @@ -234,16 +240,16 @@ msgid "Error loading lens parameters" msgstr "Error en carregar els paràmetres de lents" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Desa el fitxer dels paràmetres de la lent" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Fitxer Projecte de lents (*.ini)|*.ini|tots els fitxers (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Desa el projecte" @@ -279,22 +285,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Error en fer una pausa al procés %ld, codi 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Cancel·la" @@ -328,12 +335,12 @@ msgid "Panorama Tools" msgstr "Eines Panorama" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "No es pot obrir el fitxer del projecte:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "No es pot obrir el script: %s" @@ -343,8 +350,8 @@ msgid "Project %s does not contain any active images." msgstr "El projecte %s no conté cap imatge activa." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "Error mentre s'analitzava el script panotools: %s" @@ -358,17 +365,17 @@ msgid "Could not create temporary file" msgstr "No es pot crear el fitxer temporal" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "La cua és buida. Això no hauria de passar mai." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Error durant l'assemblatge" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -376,11 +383,11 @@ "Es sobreescriuen les imatges que existeixen? \n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Sobreescriu les imatges que existeixin" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -389,12 +396,12 @@ "Error durant l'assemblatge del projecte\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Error durant l'execució de l'assistent" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -403,273 +410,283 @@ "Error durant l'execució de l'assistent\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Assemblatge del Panorama..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Plataforma:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Versió:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Directori de treball:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Prefix de sortida:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Mesclador:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "mesclador desconegut (enblend --versió fallada)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "intern" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Fusió d'exposició:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Fusió d'exposició desconeguda (enfuse --versió fallada)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Versió d'ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "FALLADA" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Nombre d'imatges actives:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Valor d'exposició de sortida: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Mida del llenç: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projecció:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "S'està usant GPU per remapejar:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "cert" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "fals" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Sortides de panorama:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Exposició corregida, baix rang dinàmic" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Exposició fusionada des d'apilaments" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Exposició fusionada des de qualsevol disposició" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Alt rang dinàmic" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Imatges remapejades:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Sense correcció de l'exposició, baix rang dinàmic" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Apilaments combinats:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Exposició d'apilaments fusionats" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Capes:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Capes fusionades d'exposició semblant, sense correcció d'exposició" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Primera entrada d'imatge" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Número:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Nom de fitxer:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Mida: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Tipus de resposta:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Valor d'exposició: : %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "S'està tornant a mapejar i fusionar les imatges LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "S'estan remapejant les imatges LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "S'estan fusionant imatges..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" "S'estan tornant a mapejar les imatges LDR i fusionar les capes d'exposició..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "S'estan remapejant les imatges LDR sense correcció d'exposició..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "S'està fusionant la capa d'exposició %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "S'estan fusionant totes les capes d'exposició..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "S'està fusionant l'apilament número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "S'estan fusionant tots els apilaments..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "S'estan remapejant les imatges HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "S'està barrejant l'apilament HDR número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "S'estan fusionant totes els apilaments HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "S'estan actualitzant les metadades..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Assemblatge %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "Primera imatge" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "Darrera imatge" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "Directori" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Fabricant de la càmera" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Model de la càmera" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -677,35 +694,69 @@ msgid "Lens" msgstr "Lent" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "Projecció desconeguda" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Fitxer d'imatge no trobat" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "S'està carregant el fitxer %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Error" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -716,26 +767,11 @@ "Hugin no pot treballar amb aquests noms de fitxer. Canvieu el nom del fitxer " "i torneu-ho a provar de nou." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Informe de depuració generat en «%s»." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Tots els fitxers d'imatge|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" -"*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." -"exr;*.EXR|fitxers JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg; *.JPEG|fitxers " -"TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|fitxers PNG (*.png)|*.png;*." -"PNG|fitxers HDR (*.hdr)|*.hdr;*.HDR|fitxers EXR(*.exr)|*.exr;*.EXR|Tots els " -"fitxers (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -747,27 +783,27 @@ msgstr "L'entrada «%s» no és un nombre vàlid." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Avís" @@ -784,7 +820,7 @@ msgid "Could not save information into database." msgstr "No s'ha pogut desar la informació a la base de dades." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -795,11 +831,11 @@ "%s \n" "Avorta" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Format d'imatge no suportat" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -812,7 +848,7 @@ "imatge.\n" "Convertiu la imatge a escala de grisos i torneu a provar de nou." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, fuzzy, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -827,26 +863,26 @@ "imatge.\n" "Convertiu la imatge a escala de grisos i torneu a provar de nou." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 #, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" @@ -858,34 +894,34 @@ "imatge.\n" "Convertiu la imatge a escala de grisos i torneu a provar de nou." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -893,7 +929,7 @@ "Hugin té piles d'imatges detectades en les imatges afegides i assignarà " "números de pila corresponents a les imatges." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -903,11 +939,11 @@ "seran reassignats a la base d'aquesta detecció. Les assignacions de pila " "existents es sobreescriuran." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Hauria de vincular-se la posició de les imatges en cada pila?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -919,41 +955,41 @@ "panorama. Però si les imatges en cada pila requereixen un ajust fi de la " "posició (per exemple, quan es dispara de mà), llavors no vincular la posició." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Enllaça posició" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "No enllacis la posició" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "No assignis apilaments" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Mantinguis els apilaments existents" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Fitxer d'imatge no trobat" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "parella d'imatge següent" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -964,16 +1000,17 @@ "\n" "Prem «D'acord» per suprimir-les." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Error detectat" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Afegeix imatges" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -982,32 +1019,32 @@ "Error, la plantilla esperava %d imatges, \n" "el projecte actual sols té %d imatges.\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "No es pot aplicar la plantilla" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Error durant l'obertura del projecte" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultat" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "No s'ha trobat el directori xrc al paquet" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Error fatal" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1041,7 +1078,7 @@ "imatges ja afegides. \n" "Comproveu la imatge de nou, si heu seleccionat les imatges correctes." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Afegeix imatges : cancel·la" @@ -1054,9 +1091,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1073,7 +1110,7 @@ msgstr "S'estan trobant línies ..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Acabat" @@ -1087,156 +1124,156 @@ "Executeu «Troba línies» primer. Si no es troba cap línia, canvieu els " "paràmetres." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "S'estan optimitzant els paràmetres de distorsió de lents ..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " "there are no lines found, change the parameters." msgstr "" "No hi ha cap línia detectada. \n" -"Executeu «Troba línies» i «Optimitza» abans de desar les dades de la lent. " -"Si no hi ha cap línia que es trobi, canvia els paràmetres." +"Executeu «Troba línies» i «Optimitza» abans de desar les dades de la lent. Si " +"no hi ha cap línia que es trobi, canvia els paràmetres." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Desa els paràmetres de la lent a un fitxer ini" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Desa els paràmetres de la lent a la base de dades de lents" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "S'estan desant les dades de la lent" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Desa lents" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Desa el fitxer de projecte" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Fitxers de projectes (*.pto)|*.pto|Tots els fitxers (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "S'està netejant els fitxers temporals..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "Mostra aquest missatge d'ajuda" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Executa l'assistent" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Executa l'assemblatge amb el projecte entrat" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Nombre de fils usats" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "Prefix usat per l'assemblatge" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "Sols imprimeix ordres" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Sistema operatiu: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bits" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bits" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arquitectura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Memòria lliure: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Taula de codis activa: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Versió: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Camí als recursos: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Camí a les dades: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Base de dades de lents i càmeres Hugins: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi fils usant C++11 std::thread i OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "No es pot llegir el fitxer projecte %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Biblioteques" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano de http://autopano.kolor.com no està disponible per Mac OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Voleu utilitzar Autopano-Sift en el seu lloc?" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1244,87 +1281,92 @@ "Almenys un camp d'entrada està buit. \n" "Comproveu les entrades." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Intenta connectar totes les imatges superposades." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Només es pot treballar amb parells d'imatges sense punts de control." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Selecciona el programa de detecció de punts de control" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x esquerra" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y esquerra" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x dreta" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y dreta" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Alineament" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distància" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Afegit nou punt de control" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "S'estan cercant punts similars..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Error durant el càlcul de precisió" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Punt calculat amb precisió , angle : %.0f graus, coeficient de correlació : " -"%0.3f, curvatura %0.3f %0.3f" +"Punt calculat amb precisió , angle : %.0f graus, coeficient de correlació : %" +"0.3f, curvatura %0.3f %0.3f" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" "Canvieu els punts, o premeu el botó dret del ratolí per afegir un parell de " "punts" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "El punt calculat és fora de la imatge" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "No s'ha trobat cap punt similar" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1332,7 +1374,7 @@ "Una transformació interna ha sortit malament. \n" "Comproveu que el punt està dins de la imatge." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1343,31 +1385,37 @@ "El coeficient de correlació (%.3f) és menor que el llindar fixat en les " "preferències." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Afegeix una línia nova" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Línia %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Llindar de correlació:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "Normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "Línia vertical" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "Línia horitzontal" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1377,38 +1425,38 @@ "Per crear menys punts, \n" "introdueix un nombre més gran." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Llindar de detecció del cantó" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Crea punts de control" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Escala de detecció del cantó" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Error durant la creació de punts de control: \n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Seleccioneu un punt en la imatge de la dreta" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Seleccioneu un punt en la imatge de l'esquerra" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1416,55 +1464,56 @@ "No es pot executar celeste sense almenys un punt de control que connecti les " "dues imatges" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "S'està executant Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "S'està carregant el fitxer model" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Trets %lu punts de control" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Resultats de Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "S'està netejant" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Centrar" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Tracta d'esborrar els punts de control dels núvols" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Neteja lot" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Elimina punts de control perifèrics amb un mètode estadístic" @@ -1476,23 +1525,23 @@ msgid "Could not process event!" msgstr "No es pot processar l'esdeveniment !" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Imatge de l'esquerra" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Imatge de la dreta" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1500,7 +1549,7 @@ "Entreu l'error mínim pels punts de control.\n" "Quedaran seleccionats tot els punts amb un error superior" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Selecciona els punts de control" @@ -1578,60 +1627,60 @@ "restringir), o balancegeu amb arrossegament dret o premeu Ctrl i " "arrossegament." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Vista prèvia panorama" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fitxer" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Imatges mostrades" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Tot" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Cap" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Amaga" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "Arrossega per canviar el camp de visió vertical" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "Arrossega per canviar el camp de visió horitzontal" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Vista prèvia" @@ -1639,84 +1688,89 @@ msgid "Overview" msgstr "Visió de conjunt" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Restableix els paràmetres de la projecció als valors per defecte." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "Paràmetres:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "No s'han carregat imatges." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu imatges carregades." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Les imatges es connecten mitjançant %lu punts de control.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "trobats %d grups d'imatges sense connectar:" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Les imatges o punts de control han canviat, es necessita una nova alineació." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Mitjana de l'error després de l'optimització: %.1f pixel, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectilini" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cilíndric" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "L'angle de guinyada ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "L'angle de capcineig ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "L'angle de balanceig ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "El valor X ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "El valor Y ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "El valor Z ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "El valor ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1728,57 +1782,57 @@ "Però el seu projecte té paràmetres diferents de zero Tpy i Tpp. \n" "S'haurien de reinicialitzar els paràmetres TPY i TPP a zero?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "Diferència" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autoescapça" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "S'està calculant l'escapçat òptim" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "La mida superior ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "La mida esquerra ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "La mida dreta ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "La mida inferior ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "El límit esquerre ha de ser menor que el de la dreta" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "El límit superior ha de ser menor que la part inferior" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" "El valor HFOV no és vàlid. El màxim HFOV per a aquesta projecció és %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" "El valor VFOV no és vàlid. El màxim VFOV per a aquesta projecció és %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1786,7 +1840,7 @@ "Amb un ampli camp de visió, un panorama amb projecció rectilínia s'estira " "molt cap a les vores. \n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1794,15 +1848,15 @@ "Des que el camp de visió és molt ampli en la direcció horitzontal, proveu " "una projecció cilíndrica." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Per a un panorama molt ampli, proveu projecció equirectangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Podeu provar també la projecció Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1814,7 +1868,7 @@ "Una projecció equirectangular encaixaria el mateix contingut en menys espai " "vertical." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1825,7 +1879,7 @@ "La projecció cilíndrica conserva les línies verticals, a diferència de la " "equirectangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1837,7 +1891,7 @@ "Una projecció conforme conserva els angles al voltant d'un punt, que sovint " "ho fa fàcil per la vista." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1849,7 +1903,7 @@ "La projecció panorama gran angular ho comprimeix, pel que pot adaptar-se a " "un ampli camp de visió i encara té una cobertura raonable al centre." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1857,7 +1911,7 @@ "Configurar el panorama a una projecció rectilínia mantindria les línies " "rectes." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1867,27 +1921,27 @@ "projeccions. \n" "Si desitgeu veure la barra de nou, activeu la barra a les preferències." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaic " -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaic, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfera" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Pla mosaic" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1898,12 +1952,12 @@ "\n" "Hauria de tornar-se a optimitzar el panorama ara?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "L'estratègia de l'optimitzador actual seleccionada és «%s»." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1911,7 +1965,7 @@ "La regió seleccionada no conté cap imatge activa. \n" "Seleccioneu una regió que estigui coberta per almenys 2 imatges." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1919,7 +1973,7 @@ "La regió seleccionada només està coberta per una sola imatge. \n" "No es poden crear punts de control per a una sola imatge." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1933,27 +1987,27 @@ "\n" "Voleu continuar igualment?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "S'estan cercant els punts de control" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "S'està processant" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Refés la imatge a una projecció panorama... " -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "S'estan cercant punts d'interès..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "S'estan comprovant els resultats..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1964,7 +2018,7 @@ "\n" "Hauria de tornar-se a optimitzar el panorama ara?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1972,7 +2026,7 @@ "Error en inicialitzar GLEW\n" "La finestra de vista prèvia no es pot obrir." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2019,7 +2073,7 @@ msgstr "Nombre de màscares" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Escapça" @@ -2052,7 +2106,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "La diferència Ev màxima ha de ser més gran que 0" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Apilaments" @@ -2229,7 +2283,7 @@ msgid "Shutter speed" msgstr "Temps d'exposició" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2376,97 +2430,97 @@ msgid "Camera response parameter" msgstr "Paràmetres de resposta de la càmera" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "No activa" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "Activa" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Lent %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Apilament %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Apilament de sortida %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Capa d'exposició de sortida %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Enllaça" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Trenca l'enllaç" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Selecciona-ho tot per les lents actuals" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Treu tot el seleccionat per les lents actuals" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Selecciona-ho tot per l'apilament actual" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Treu tot el seleccionat per l'apilament actual" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Selecciona tot" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Treu tot el seleccionat" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Edita les variables de les imatges..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Desa imatge" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Desa imatge" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "Imatges mostrades" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Nombre d'imatges actives:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Punts de Control" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2499,12 +2553,24 @@ msgid "Did you know..." msgstr "Sabíeu ..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versió %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2512,76 +2578,76 @@ "Error d'instal·lació fatal\n" "El fitxer de dades / splash.png no ha sigut trobat a:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "A&juda" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Accions" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Sortida" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Edita" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Executa l'assistent" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Iniciat" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimitzador" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Exposició" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Deseu els canvis al panorama abans de tancar?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Deseu els canvis al panorama abans de tancar?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Deseu els canvis al panorama abans de tancar?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2589,7 +2655,7 @@ msgstr "" "Si tanqueu sense desar, els canvis des de la darrera desada seran descartats" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2597,7 +2663,7 @@ msgstr "" "Si tanqueu sense desar, els canvis des de la darrera desada seran descartats" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " @@ -2605,40 +2671,40 @@ msgstr "" "Si tanqueu sense desar, els canvis des de la darrera desada seran descartats" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "No desis" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Tanca sense desar" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Tancament forçat" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "Projecte %s desat" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Assemblador panorama" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Editor panorama" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2651,36 +2717,36 @@ "\n" "(Codi d'error: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Desa el fitxer guió PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Fitxer PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Obre el projecte:" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projecte obert" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "S'estan carregant la imatge:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Error durant l'obertura del projecte:" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Obre el fitxer de projecte" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2691,11 +2757,11 @@ "Aquest fitxer no pot ser obert amb Fitxer, Obre.\n" "Voleu afegir aquesta imatge al projecte actual?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Obre el projecte : cancel·la" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2703,7 +2769,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2711,34 +2777,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "No es pot llegir el fitxer projecte %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Obre un fitxer de projecte" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Fitxers mascara (*.msk)|*.msk | Tots els fitxers (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Tria plantilla per al projecte" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Ajustament precís a tots els punts" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Ajustament precís" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2767,23 +2833,23 @@ "Utilitzeu la llista de punts de control (F3) per veure tots els punts del " "projecte actual.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Resultat de l'ajustament precís" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "S'estan suprimint els punts de control a les mascares" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Selecciona guió python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Guió python (*.py)|*.py | Tots els fitxers (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2792,13 +2858,13 @@ "El fitxer «%s» no ha sigut trobat.\n" "Tal vegada el fitxer ha canviat de nom, de lloc, o s'ha suprimit." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Error!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2806,12 +2872,12 @@ "El model Celeste esperat en %s no ha sigut trobat, Hugin necessita ser " "instal·lat de forma correcta." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "No es pot carregar el fitxer %s del model Celesta" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2821,7 +2887,7 @@ "apilaments i/o desplaçament central de vinyetejat.\n" "Aquesta característica no està suportada en la interfície senzilla." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2831,7 +2897,7 @@ "translacions o paràmetres tallats.\n" "Aquests paràmetres no estan suportats en la interfície senzilla." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2841,28 +2907,28 @@ "translacions o paràmetres tallats.\n" "Aquests paràmetres no estan suportats en la interfície avançada." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "S'està executant l'assistent." -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Atenció s'han trobat %d grups d'imatges no connectades:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2875,7 +2941,7 @@ "\n" "Després d'afegir els punts, premeu el botó «Alinea» de nou." -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2883,23 +2949,23 @@ "L'assistent no s'ha completat amb èxit. Comproveu el fitxer del projecte " "resultant." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "No s'ha trobat el fitxer de projecte" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "No es pot llançar PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Llançat programa incorrecte" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Tipus de mascara" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2907,29 +2973,29 @@ "Creeu una mascara poligonal prement el botó esquerre del ratolí sobre la " "imatge, ajusteu el darrer punt amb el botó dret del ratolí." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Deseu mascara" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Fitxers mascara (*.msk)|*.msk | Tots els fitxers (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Carrega la mascara" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Carrega mascara : cancel·la" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "No es pot depurar la mascara del fitxer %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Introduïu un nombre vàlid" @@ -3071,7 +3137,7 @@ msgstr "Alineament fotomètric" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "S'estan carregant imatges" @@ -3116,64 +3182,68 @@ msgid "Photometric optimization finished" msgstr "Optimització fotomètrica acabada" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Afegeix imatges individuals..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Afegeix imatges de sèries temporals..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "No s'han trobat imatges concordants." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Edita les variables de les imatges..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Treu la imatge(s) seleccionada" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ancorar aquesta imatge per la posició" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ancorar aquesta imatge per l'exposició" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Lent nova" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Canvia la lent..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Introdueix el nou número de la lent" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Lent número" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Canvia el número de la lent" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Carrega els paràmetres de la lent des de la base de dades de lents" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Carrega els paràmetres de la lent des d'un fitxer ini" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3182,12 +3252,12 @@ "S'haurien d'aplicar els paràmetres de la lent carregada a totes les imatges " "amb la mateixa lent?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Pregunta" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3197,100 +3267,100 @@ "Aplicar els paràmetres de la lent pot produir resultats inesperats.\n" "Voleu aplicar els paràmetres de tota forma ?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Desa els paràmetres de la lent a un fitxer ini" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Treu els punts de control" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Les imatges seleccionades no tenen punts de control" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Segur que voleu suprimir %lu punts de control ?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Suprimeix punts de control" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Neteja els punts de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "S'està netejant els punts de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "S'estan comprovant els parells" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "S'està comprovant el projecte complet" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "S'ha acabat la neteja" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Treu punts de control o núvols" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Reinicialitza posicions" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Reinicialitza paràmetres de translació" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Reinicialitza els paràmetres de la lent" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Reinicialitza els paràmetres fotomètrics" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Apilament nou" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Canvia l'apilament..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Introdueix el nou número de l'apilament" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Apilament número" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Canvia el número de l'apilament" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Configura la mida de l'apilament..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Qualitat:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3360,47 +3430,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Àrea equal de Hammer-Aitoff" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "L'amplada cal que sigui un enter més gran que 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "L'alçada cal que sigui un enter més gran que 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "El límit esquerre cal que sigui més petit que el dret" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "El límit superior cal que sigui més petit que l'inferior." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "Les opcions PTmender no estan implementades" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Les opcions PTblender no estan implementades" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Les opcions per al programa HDRMerge no estan implementades" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "No es pot crear el fitxer de projecte temporal" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Especifica el prefix de sortida" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3409,16 +3479,16 @@ "No teniu permisos per escriure a la carpeta «%s».\n" "Seleccioneu una altra carpeta per la sortida final." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3428,7 +3498,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3441,7 +3511,7 @@ "assembleu-ho a la pestanya d'assemblament. Assemblar un panorama d'aquesta " "mida ocuparà molt de temps i una gran quantitat de memòria." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3454,19 +3524,19 @@ "És massa gran, reduïu la mida del llenç del panorama i les regions " "escapçades." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Esteu segurs de voler assemblar un panorama tan gran?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Assembleu de totes formes" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Deixeu-me fixar" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3476,7 +3546,7 @@ "Comproveu els vostres paràmetres, de forma que almenys una imatge estigui en " "la regió de sortida." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3511,121 +3581,139 @@ msgid "Miscellaneous" msgstr "Miscel·lània" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Llengua per defecte al sistema" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Eusquera" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Català" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Xinès (Simplificat)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Xinès (Tradicional)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Txec" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Danès" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holandès" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Anglès" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francès" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Alemany" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Hongarès" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italià" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japonès" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polonès" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portuguès (Brasiler)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Rus" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Eslovac" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Castellà" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Suec" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finès" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valencià (Català meridional)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Seleccioneu Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Executables (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Seleccioneu Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Selecciona tot" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Seleccioneu PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Selecciona tot" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Seleccioneu argfile ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool Argfiles (*.arg)|*.arg|Tots els fitxers(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3634,14 +3722,14 @@ "El fitxer %s no existeix. \n" "Hauria de crear-se argfile amb les etiquetes per defecte?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool argfile" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3649,18 +3737,18 @@ "No hi ha cap fitxer seleccionat.\n" "Hauria de crear-se argfile amb les etiquetes per defecte ?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Selecciona ExifTool argfile nou" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "No es pot desar el fitxer «%s»." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, fuzzy, c-format msgid "" "File %s does not exist.\n" @@ -3669,7 +3757,7 @@ "El fitxer %s no existeix. \n" "Hauria de crear-se un argfile buit ?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 #, fuzzy msgid "" "No file selected.\n" @@ -3678,24 +3766,25 @@ "No hi ha cap fitxer seleccionat. \n" "Hauria de crear-se un argfile buit ?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "Voleu realment substituir les preferències mostrades pels valors per defecte?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Carrega els valors per defecte" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Seleccioneu una entrada primer" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Selecciona entrada" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3703,30 +3792,30 @@ "No podeu suprimir la darrera configuració. \n" "Almenys cal una configuració." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Realment voleu suprimir els ajustos del detector de punts de control \"%s\" ?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Suprimeix l'ajust del detector de punts de control." -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Carrega els ajustos del detector de punts de control" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Ajustos detecció de punts de control (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Desa els ajustos de detecció de punts de control" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3755,50 +3844,55 @@ msgid "Remove %lu control points" msgstr "Suprimeix %lu punts de control" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Vista prèvia panorama" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opcions de la vista prèvia" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Projecció (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Mode de barreja:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Sortida:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Compressió:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Paràmetres de projecció" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Premeu el botó esquerre per definir un nou punt central, premeu el botó dret " "per moure el punt a l'horitzó." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centreu el panorama amb el botó esquerre del ratolí, establiu l'horitzó amb " @@ -3818,7 +3912,7 @@ msgid "Click a connection to edit control points." msgstr "Prem una connexió per editar els punts de control." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3826,30 +3920,116 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "S'està detectant: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Tanca" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +#, fuzzy +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"L'«argfile» següent s'utilitza per copiar les etiquetes de la primera imatge " +"a totes les imatges intermèdies. \n" +"No seran reemplaçats els marcadors de posició." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "El directori '%s' no existeix" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "No es pot establir la variable d'entorn PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Obre processador per lots" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" "Obre PTBatcher, el processador per lots de fitxers de projecte de Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Obre l'eina de calibratge de lents" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "Obre Calibrate_lens_gui, una simple GUI per calibratge de lents" @@ -3864,11 +4044,11 @@ "Tal vegada no l'heu instal·lat de forma correcta o s'ha donat un camí " "incorrecte als paràmetres." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "S'està netejant els fitxers temporals de punts clau" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3877,15 +4057,15 @@ "Utilitza %namefile, %i o %s per especificar els fitxers d'entrada del " "detector de punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Error a l'ordre de detecció de punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3897,14 +4077,14 @@ "Seleccioneu menys imatges o poseu les imatges\n" "dins una carpeta amb un camí més curt." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Massa imatges seleccionades" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3916,38 +4096,38 @@ "\n" "No es pot executar l'ordre: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Error wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Mostra els punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "No es pot d'executar l'ordre : %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3956,9 +4136,9 @@ "Ordre: %s\n" "fallada amb el codi d'error : %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3973,13 +4153,13 @@ "\n" "Ordre executada: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Error en la detecció de punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3987,7 +4167,7 @@ "Useu %i per especificar els fitxers d'entrada i %k per especificar els " "fitxers de punts clau per generar els passos clau" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3995,11 +4175,11 @@ "Useu %k per especificar els fitxers de punts clau i %o per especificar el " "fitxer projectes de sortida per al pas de cerca" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "S'està generant el fitxer clau" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4012,265 +4192,265 @@ "\n" "No es pot executar l'ordre: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Per defecte" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" msgstr "No es pot netejar el lot en procés. Realment voleu cancel·lar-lo ?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Lot netejat." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Error: No es pot obtenir l'estat, el projecte amb índex %d no està llest." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Error: No es pot carregar l'arxiu per lots" -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Lot completat amb èxit." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Lot completat amb errors." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "S'està inicialitzant la tancada..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "S'està tancant..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Prepara per hivernar ..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "S'està inicialitzant la hibernació ..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Prepara per suspendre ..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "S'està inicialitzant el mode de suspensió ..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Desa el fitxer de projecte" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "No hi ha especificat el prefix de sortida" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "No hi ha especificats els fitxers de projecte" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "Assemblatge - %s" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "Assistent - %s" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Error removent, el projecte amb id %d no és a la llista." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Error: No es pot esborrar el fitxer del projecte" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Execució per lots ..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI iniciat" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Lot realment en progrés." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "S'està executant l'ordre «%s»" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "S'està fent l'assemblatge: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "S'està detectant: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Error: No es configura l'estat, el projecte amb índex %d no és a la llista." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "No fent molt ..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Heu premut la tecla de l'ordre." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Heu premut la tecla CTRL." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Hauria d'ometre's la càrrega de la cua per lots?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "No facis res" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Tanca PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Atura ordinador" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Suspen ordinador" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Hiverna ordinador" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Entreu l'aplicació de línia d'ordres a executar:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Entreu l'aplicació" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Especifiqueu el directori per cercar projectes" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Especifiqueu fitxer(s) de font de projecte(s)" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Afegits els projectes des del directori %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Afegeix projecte %s a la cua d'assemblament." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Afegeix projecte %s a la cua de l'assistent." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Lots aturats" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Processador de lots de Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Especifica el prefix de sortida per al projecte" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "El prefix d'un objectiu auxiliar no es pot canviar." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Seleccioneu un projecte" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Seleccioneu un projecte" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Especifica l'arxiu per lots a obrir" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Arxiu per lots (*.ptb)|*.ptb|Tots els fitxers (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "No es pot obrir l'aplicació amb Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "No hi ha cap projecte seleccionat. Obriu Hugin sense projecte?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Lots aturats en pausa" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Estan continuant els lots ..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4278,7 +4458,7 @@ "Hi ha projectes fallats a la llista. \n" "Els esborrem també ?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4286,16 +4466,16 @@ "No es poden esborrar projectes en progrés. \n" "Voleu cancel·lar-los ?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Projecte esborrat %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Selecciona un projecte per esborrar" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4303,16 +4483,16 @@ "No es poden reinicialitzar projectes en progrés. \n" "Voleu cancel·lar-lo ?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Reinicialitza projecte %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Selecciona un projecte per a reinicialitzar" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4320,31 +4500,31 @@ "No es poden reinicialitzar projectes en progrés. \n" "Voleu cancel·lar el lot?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Especifica l'arxiu de lots a desar" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Arxiu de lots (*.ptb)|*.ptb|Tots els fitxers (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Neteja lot" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "S'estan iniciant els lots" @@ -4380,7 +4560,7 @@ msgid "E&xit" msgstr "S&urt" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4390,11 +4570,11 @@ "Si tanqueu el quadre de diàleg, els perdreu. \n" "Voleu continuar igualment?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Acceptat" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4404,11 +4584,11 @@ "Si continueu, no es tindran en compte. \n" "Encara voleu continuar?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Atura" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4417,7 +4597,7 @@ "El directori %s no existeix. \n" "Doneu un directori que existeixi." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4425,7 +4605,7 @@ "Heu seleccionat un panorama que no és possible. \n" "Seleccioneu com a mínim un panorama i torneu-ho a intentar." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4435,141 +4615,143 @@ "Potser no teniu permís d'escriptura per a aquests directoris o el disc és " "complet." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "suprimir aquesta imatge del projecte" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "S'estan cercant panorames" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "S'està carregant el fitxer %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Inicia" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "S'han trobat %d panorames possibles." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "No s'han pogut trobar panorames." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d imatges: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Detectats errors sintàctics en paràmetres, s'està avortant." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI iniciat" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "S'està esperant" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "En progrés" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Complet" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Fracàs" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fitxer perdut" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pausat" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projecte" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefix de sortida" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Estat" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Darrera modificació" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Format de sortida" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projecció" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Mida" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Error, no es pot convertir id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Canvia prefix" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Reinicialitza projecte" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Edita amb Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Esborra" @@ -4606,16 +4788,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Fitxers registre (*.log)|*.log|Tots els fitxers (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "No es pot llegir el fitxer projecte %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Especifica el fitxer de projecte de la font del projecte" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4626,7 +4808,7 @@ "vàlid." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Quant al Hugin" @@ -4659,19 +4841,19 @@ msgstr "Sistema" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "D'acord" @@ -4751,8 +4933,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Tria..." @@ -4844,7 +5029,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opcions" @@ -4876,10 +5061,6 @@ msgid "Send selected panoramas to queue" msgstr "Envia panorames seleccionats a la cua" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Tanca" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "S'estan cercant panorames" @@ -4983,12 +5164,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "S&urt" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Surt del programa" @@ -5093,40 +5274,149 @@ msgid "adddir" msgstr "Afegeixdirectori" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "Parella d'imatges prèvies" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Descripció:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "Parella d'imatges següent" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Tipus:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "Mode:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Totes les imatges alhora" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "Línia vertical" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama amb apilaments" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "Línia horitzontal" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Panorama multi-fila" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom :" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Panorama multi-fila amb apilaments" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "Ajusta a la finestra" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Panorama prealineada" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Ajustament precís" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detector" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Detector d'un pas" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programa:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Arguments:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Neteja arguments:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Detector de dos passos" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Descripció de característiques:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Característica del programa:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detector d'apilaments" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Deixeu buit quan no hi hagi detector de punts de control funcionant en " +"apilaments." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Opcions avançades" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Aquest paràmetre no té opcions avançades." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Els següents patrons seran substituïts abans de l'execució :\n" +"%o -- sortida del projecte (0.oto serà adjuntat quan s'utilitzi Autopano)\n" +"%p -- nombre de punts de control entre cada parell d'imatges\n" +"%v -- HFOV de la primera imatge\n" +"%f -- projecció de la primera imatge (0-4, com en panotools)\n" +"%i -- fitxers d'imatge\n" +"%namefile -- fitxer que conté els noms de fitxers d'imatge \n" +"%s -- script d'entrada de panotools \n" +"%k -- fitxer(s) clau intermedi(s) " + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Paràmetres per la detecció de punts de control" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "Parella d'imatges prèvies" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "Parella d'imatges següent" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "Mode:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "Línia vertical" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "Línia horitzontal" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom :" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "Ajusta a la finestra" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Ajustament precís" #: hugin1/hugin/xrc/cp_editor_panel.xrc:241 msgid "Tries to optimize the currently active point" @@ -5189,7 +5479,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Suprimeix" @@ -5197,156 +5487,188 @@ msgid "Select by Distance" msgstr "Selecciona per la Distància" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Descripció:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Nom de fitxer no vàlids" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Tipus:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (per A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Sí" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Totes les imatges alhora" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "No" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama amb apilaments" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Editeu els scripts d'eines de Panorama" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Panorama multi-fila" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Aquest és la seqüència de comandes (script) que serà enviada al motor " +"d'eines de Panorama (« Eines Panorama »). L'edició d'aquestes línies és per a " +"usuaris avançats." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Panorama multi-fila amb apilaments" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Continua amb aquests canvis" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Panorama prealineada" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Ignora els canvis i cancel·la" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Grup de:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Detector d'un pas" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Superposició mínima:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programa:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Superposició mínima per a detecció d'apilaments de sortida" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Màxima diferència Ev:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Neteja arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Màxima diferència EV per a la detecció de capes de sortida" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Detector de dos passos" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Mostra" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Descripció de característiques:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "General" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Característica del programa:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Dades EXIF" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detector d'apilaments" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Posicions" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Deixeu buit quan no hi hagi detector de punts de control funcionant en " -"apilaments." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Paràmetres de la lent" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Opcions avançades" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Paràmetres fotomètrics" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Aquest paràmetre no té opcions avançades." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Tipus de lent" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Afegeix imatges..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Tipus de lent:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Multiplicador de distància focal:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Característica cercada" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Paràmetres:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -"Els següents patrons seran substituïts abans de l'execució :\n" -"%o -- sortida del projecte (0.oto serà adjuntat quan s'utilitzi Autopano)\n" -"%p -- nombre de punts de control entre cada parell d'imatges\n" -"%v -- HFOV de la primera imatge\n" -"%f -- projecció de la primera imatge (0-4, com en panotools)\n" -"%i -- fitxers d'imatge\n" -"%namefile -- fitxer que conté els noms de fitxers d'imatge \n" -"%s -- script d'entrada de panotools \n" -"%k -- fitxer(s) clau intermedi(s) " +"Executeu detector de punt de control marcat en les imatges seleccionades" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Paràmetres per la detecció de punts de control" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimitza" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Nom de fitxer no vàlids" +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geomètric:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Editeu els scripts d'eines de Panorama" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Calcula" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotomètric:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Imatge seleccionada" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Carrega dades de la lent..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Aquest és la seqüència de comandes (script) que serà enviada al motor " -"d'eines de Panorama (« Eines Panorama »). L'edició d'aquestes línies és per " -"a usuaris avançats." +"Introduïu camp de visió horitzontal (HFOV) o distància focal i factor " +"d'escapçat:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Continua amb aquests canvis" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Ignora els canvis i cancel·la" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "Graus" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Càmera i dades lent" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Guinyada:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Capcineig:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Balanceig:" @@ -5354,34 +5676,11 @@ msgid "Translation parameter" msgstr "Paràmetres de translació" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Posicions" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "Graus del camp de visió (v):" @@ -5481,7 +5780,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Ajuda" @@ -5524,8 +5823,8 @@ msgstr "Carregar" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Desa" @@ -5538,122 +5837,47 @@ msgid "Manipulate image variables" msgstr "Edita les variables de les imatges..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Grup de:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Superposició mínima:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Superposició mínima per a detecció d'apilaments de sortida" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Màxima diferència Ev:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Màxima diferència EV per a la detecció de capes de sortida" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Mostra" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "General" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Dades EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Paràmetres de la lent" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Paràmetres fotomètrics" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Tipus de lent" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Afegeix imatges..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Tipus de lent:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Multiplicador de distància focal:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Característica cercada" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Paràmetres:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "&Preferències" -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -"Executeu detector de punt de control marcat en les imatges seleccionades" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimitza" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geomètric:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Calcula" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotomètric:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Arguments addicionals :" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Imatge seleccionada" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Carrega dades de la lent..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Processant:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Introduïu camp de visió horitzontal (HFOV) o distància focal i factor " -"d'escapçat:" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "Graus" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Càmera i dades lent" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importa" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5798,14 +6022,6 @@ msgid "Don't ask again" msgstr "No ho preguntis de nou" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Sí" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "No" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5871,21 +6087,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Desfés" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Desfés la darrera acció" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "To&rna a fer" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Torna a fer la darrera acció" @@ -5930,12 +6146,12 @@ msgid "Use only normal control points in optimization." msgstr "Nombre de punts de control en aquesta imatge" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimitza" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Reexecuta l'optimitzador amb els paràmetres actuals" @@ -5966,16 +6182,16 @@ msgid "Run a python script" msgstr "Executa un script de Python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Visualitza" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Pantalla completa" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Mostra la finestra principal de Hugin a pantalla completa" @@ -6057,22 +6273,22 @@ msgid "Show the Stitcher panel" msgstr "Mostra el panell d'assemblatge" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Simple" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Avançat" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Expert" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Interfície" @@ -6095,86 +6311,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Part de la informació en els diferents botons i així successivament." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Consell del dia" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Mostra un dels consells del dia." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Dreceres del teclat" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "Dreceres del teclat" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&PMF" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Preguntes més freqüents" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "Quant &a" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Preferències" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nou" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Projecte nou" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Obre" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Obre un projecte" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "De&sa" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Desa el fitxer del projecte actual" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "&Anomena i Desa" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Desa l'actual projecte en un fitxer nou" @@ -6190,19 +6406,19 @@ "Escriu l'actual projecte en un fitxer script compatible amb PTStitcher, útil " "per a un processament per lots" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Projectes utilitzats recentment" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Llista dels fitxers de projectes utilitzats més recentment" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Executa el processado&r per lots" @@ -6288,7 +6504,7 @@ msgid "Show the OpenGL preview image" msgstr "Mostra la visualització OpenGL de la imatge" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Vista prèvia del panorama" @@ -6345,15 +6561,10 @@ msgstr "Exclou la regió de totes de les imatges amb aquesta lent" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exporta" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importa" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Còpia" @@ -6398,8 +6609,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6507,7 +6718,8 @@ msgid "execute the PTOptimizer engine" msgstr "Executa el motor PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientació de la imatge" @@ -6553,39 +6765,39 @@ msgid "Interpolator (i):" msgstr "Interpolador (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicúbic)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineal" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Veí més proper" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Aproximació dels valors entre els píxels font" @@ -6614,7 +6826,7 @@ msgid "Enfuse options" msgstr "Opcions d'Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Camp de visió:" @@ -6779,10 +6991,6 @@ msgid "Image fusion:" msgstr "Fusió d'imatge:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "Enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Fusió HDR:" @@ -6886,16 +7094,16 @@ msgid "Output parameters" msgstr "Paràmetres de sortida" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Mode de barreja:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "Error d'Enblend" @@ -6968,27 +7176,43 @@ msgstr "" "Suprimeix tots els punts de control a l'interior de les àrees emmascarades" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Executable Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(deixa en blanc per a utilitzar un valor per defecte del S.O.)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Executable Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Executable Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Opcions de fitxer" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Directori temporal:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(deixa en blanc per a utilitzar un valor per defecte del S.O.)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Nom de fitxer de projecte per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Prefix de sortida per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7019,43 +7243,43 @@ "%lens - lent (de la primera imatge)\n" "%projectname - nom del fitxer projecte (sols per al prefix de sortida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Nom de fitxer per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Nom de fitxer" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "S'està carregant imatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Alinea les imatges de forma automàtica després de carregar-les" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Detecta línies verticals" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Detecta línies verticals en les imatges per anivellar el «pano»" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Elimina punts de control en el núvol (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Passos opcionals de l'assistent" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Auto alinea" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7063,67 +7287,67 @@ "Nombre de punts de control \n" "per cada superposició" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Escala baixa final de «pano»" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "Percentatge de l'amplada màxima" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor de punts de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Mostra HDR i 16 bits" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Corba" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "Lineal" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "Logarítmic" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "Gamma 2,2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "Utilitzat per mostrar en la interfície gràfica" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Amplada del pegat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "Píxels" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Amplada de l'àrea de cerca:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "Percentatge de l'amplada de la imatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Amplada de la zona de cerca local:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Llindar de correlació:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7131,11 +7355,11 @@ "0 : no similitud\n" "1 : màxima similitud" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Llindar de curvatura dels pics:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7143,116 +7367,112 @@ "0 : no pic\n" "0.2 : pic diferenciat" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Cerca per rotació" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Habilita la cerca per rotació (més lenta però més precisa)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Angle d'inici:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Angle final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Passos:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Detectors de punts de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programes detectors de punts de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nou..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Edita..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Puja" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Baixa" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Configura per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "L'assistent està utilitzant la configuració per defecte." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Format de sortida" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Format del fitxer per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "Format de sortida per defecte per al panorama final" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Compressió TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "Compressió TIFF per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Qualitat JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "Paràmetre de compressió JPEG per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Mesclador" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Nom del mesclador per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "El mesclador per defecte que s'usa als projectes nous." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processador" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Assemblador&projectes&Hugin" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "El motor que executarà l'assemblament" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Inicia l'assemblament de treballs ara mateix" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7262,19 +7482,19 @@ "treballs de la cua. En cas contrari, el processador s'iniciarà en estat " "suspès i l'usuari haurà d'iniciar el processament manualment." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Sobreescriu fitxers que existeixin" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "ADVERTÈNCIA: els fitxers existents es sobreescriuran sense més avisos." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Sortida detallada" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7282,19 +7502,19 @@ "Habilita per obtenir els detalls, útil quan s'informa d'un error o " "simplement per veure el progrés del projecte." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Assemblatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Copia les metadades dins de fitxers finals emprant ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Opcions d'ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7303,7 +7523,7 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 #, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " @@ -7313,52 +7533,52 @@ "a totes les imatges intermèdies. \n" "No seran reemplaçats els marcadors de posició." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "ExifTool argfile intermedi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Deixa en blanc per emprar valor per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Edita l' ExifTool argfile seleccionat" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 #, 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 "" -"La «argfile» següent s'utilitza per copiar les etiquetes de la primera " -"imatge al panorama final.\n" +"La «argfile» següent s'utilitza per copiar les etiquetes de la primera imatge " +"al panorama final.\n" "Si s'aplica a més a més «argfile» per a les imatges intermèdies.\n" "Els marcadors de posició en aquest «argfile» seran reemplaçats abans " "d'executar «exiftool»." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "ExifTool argfile final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Crea dades de foto esfera XMP" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Això només es farà per imatges de sortida equirectangulars." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Opcions avançades" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Nombre de fils:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7370,82 +7590,84 @@ "Configura aquest nombre màxim amb el nombre de processadors o de nuclis de " "processament disponibles al seu sistema." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 per a detecció automàtica" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Assemblatge (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Interpolador per defecte (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Crea les imatges retallades per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Utilitza GPU per remapejar (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" +msgstr "S'està usant GPU per remapejar:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Utilitza la targeta de vídeo GPU per accelerar el remapejat" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Utilitza un programa alternatiu a Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Executable Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Arguments per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Aquests són els arguments per defecte per als nous projectes. \n" "Es poden canviar per a projectes individuals en la pestanya Assemblatge. \n" "No estableixi -w, -o i --arguments de compressió, que estan establerts per " "Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Utilitza un programa alternatiu a Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Executable Enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programes" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Paràmetres de Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Llindar SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7453,19 +7675,19 @@ "més gran que 0,5: menys sensible\n" "menor que 0,5: més sensible" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Mida del filtre Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "petit" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "gran" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7473,7 +7695,7 @@ "Gran és més precís \n" "Petit permet examinar els punts de control prop de la vora de la imatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7483,73 +7705,73 @@ "l'anàlisi del valor del color en les àrees de superposició. \n" "Per accelerar el càlcul, s'utilitza només un subconjunt aleatori de punts." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Nombre de punts per cada imatge:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Optimitzador fotomètric" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Avisos" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" "Mostra el missatge sobre el desat del fitxer del projecte i prefix de sortida" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Mostra l'avís sobre la diferència d'exposició gran quan s'afegeixen imatges" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Després de l'eina «edita cp»" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Pregunta a l'usuari" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Reoptimització del Panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "No optimitzis el panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Edita l'eina cp (a la finestra de previsualització rapida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Divers" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Preferències - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Edita ExifTool argfile" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 #, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" @@ -7586,11 +7808,11 @@ "\n" "Els marcadors de posició distingeixen entre majúscules i minúscules." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centra la vista prèvia horitzontalment" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centra" @@ -7598,13 +7820,15 @@ msgid "Show the whole panorama" msgstr "Mostra l'assemblatge del panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estima el camp de visió" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Encaixa" @@ -7612,7 +7836,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Ajusta automàticament un horitzó ondulat" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Redreça" @@ -7711,32 +7936,32 @@ "Estableix el valor de l'exposició del panorama de l'exposició mitjana de " "totes les imatges." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Selector de grisos" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corregeix el balanç global de blancs amb la selecció d'una àrea grisa neutra" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Edita CP" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Crea o suprimeix punts de control al rectangle seleccionat." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Fons:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Escala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7750,161 +7975,149 @@ "* Premeu a una línia per editar les imatges associades a la pestanya Punts " "de Control." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Disposició" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guies:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Regla dels terços" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Proporció àuria" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Mètode diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Triangle d'or (inferior)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Triangle d'or (superior)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Ajusta automàticament un horitzó ondulat." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Mode d'arrossegament:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Aplica" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Mou el panorama o arrossega les imatges a la posició" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Mou/Arrossega" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Estableix la regió escapçada al rectangle més gran cobert per imatges" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR autoescapça" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Estableix la regió escapçada al rectangle més gran cobert per apilaments " "d'imatges" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "Esquerra:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "Superior:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "Dreta:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "Inferior:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Reinicialitza l'escapçada a la màxima àrea possible" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Canvia la regió a escapçar pel panorama" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Editor Panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Resum" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Mostra la visió general en l'esfera panorama." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Graella" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Mostra la graella." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Afegeix imatges" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Posició de l'enllaç de les imatges en cada apilament" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Introduïu nombre d'imatges per apilament" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Posició de l'enllaç de les imatges en cada apilament" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Canviar la lent de les imatges seleccionades" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Reinicialitza posicions" @@ -8116,8 +8329,8 @@ "The PanoTools wiki at http://wiki.panotools.org offers comprehensive " "information about creating panoramas and other images with panotools." msgstr "" -"El wiki de «Panotools», que es troba en la direcció http://wiki.panotools." -"org ofereix informació interessant sobre la creació de panorames i altres " +"El wiki de «Panotools», que es troba en la direcció http://wiki.panotools.org " +"ofereix informació interessant sobre la creació de panorames i altres " "imatges amb « Panotools »." #: hugin1/hugin/xrc/data/tips.txt:25 @@ -8215,6 +8428,85 @@ "imatges amb un grau elevat de superposició i molts punts de control " "distribuïts correctament." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Preferències" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Imatges" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Afegeix imatges..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Afegeix una altra imatge al projecte actual" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Suprimir aquesta imatge" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Treu la imatge(s) seleccionada" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Escala de detecció del cantó" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "Nou projecte" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Mou el panorama o arrossega les imatges a la posició" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Canvia la regió a escapçar pel panorama" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Utilitza GPU per remapejar (EXPERIMENTAL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Tots els fitxers d'imatge|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." +#~ "TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." +#~ "HDR;*.exr;*.EXR|fitxers JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg; *.JPEG|" +#~ "fitxers TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|fitxers PNG (*.png)|" +#~ "*.png;*.PNG|fitxers HDR (*.hdr)|*.hdr;*.HDR|fitxers EXR(*.exr)|*.exr;*." +#~ "EXR|Tots els fitxers (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (per A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "Enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Assemblador&projectes&Hugin" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Interfície" @@ -9045,10 +9337,6 @@ #~ msgstr "&Fitxer" #, fuzzy -#~ msgid "Image file:" -#~ msgstr "Fitxer d'imatge no trobat" - -#, fuzzy #~ msgid "Polynomial" #~ msgstr "normal" @@ -9259,10 +9547,6 @@ #~ msgstr "25%" #, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "Nou projecte" - -#, fuzzy #~ msgid "Nona" #~ msgstr "Cap" @@ -9394,9 +9678,6 @@ #~ msgid "PTStitcher note" #~ msgstr "Nota de PTStitcher" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Seleccioneu PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "PTStitcher.exe no ha estat seleccionat" @@ -9556,9 +9837,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "Error durant l'assemblatge" -#~ msgid "Remove this image" -#~ msgstr "Suprimir aquesta imatge" - #~ msgid "Stitching Options" #~ msgstr "Opcions d'assemblatge" @@ -9659,9 +9937,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend :" -#~ msgid "Additional Arguments:" -#~ msgstr "Arguments addicionals :" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "No indiqueu els arguments -w i -o, ho farà hugin" diff -Nru hugin-2018.0.0+dfsg/src/translations/ca_ES@valencia.po hugin-2019.0.0+dfsg/src/translations/ca_ES@valencia.po --- hugin-2018.0.0+dfsg/src/translations/ca_ES@valencia.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/ca_ES@valencia.po 2019-02-17 15:24:33.000000000 +0000 @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: Hugin 0.5\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2015-07-14 16:44+0200\n" "Last-Translator: Carles Ferrando Garcia \n" "Language-Team: Catalan >\n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: Catalan\n" "X-Poedit-Country: SPAIN\n" @@ -48,14 +48,14 @@ msgid "Searching for best crop..." msgstr "S'està cercant el millor escapçat..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "Programa extern %s no trobat en el paquet, tornant al camí del sistema" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -81,9 +81,9 @@ msgstr "Mapa de bits (*.bmp)|*.bmp | fitxer PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "El fitxer %s existeix. El voleu sobreescriure?" @@ -121,7 +121,7 @@ msgstr "El factor d'escapçat cal que siga positiu." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -135,24 +135,28 @@ "Encara voleu utilitzar este valor alt?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -173,8 +177,8 @@ msgstr "Gran angular d'abast total" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirectangular" @@ -205,11 +209,13 @@ msgid "builtin" msgstr "Integració" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "Acceptable (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineal" @@ -234,16 +240,16 @@ msgid "Error loading lens parameters" msgstr "Error en carregar els paràmetres de lents" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Alça el fitxer dels paràmetres de la lent" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Fitxer Projecte de lents (*.ini)|*.ini|tots els fitxers (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Alça el projecte" @@ -279,22 +285,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Error en fer una pausa al procés %ld, codi 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Cancel·la" @@ -328,12 +335,12 @@ msgid "Panorama Tools" msgstr "Eines Panorama" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "No es pot obrir el fitxer del projecte:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "No es pot obrir el script: %s" @@ -343,8 +350,8 @@ msgid "Project %s does not contain any active images." msgstr "El projecte %s no conté cap imatge activa." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "Error mentre s'analitzava el script panotools: %s" @@ -358,17 +365,17 @@ msgid "Could not create temporary file" msgstr "No es pot crear el fitxer temporal" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "La cua és buida. Això no hauria de passar mai." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Error durant l'assemblatge" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -376,11 +383,11 @@ "Es sobreescriuen les imatges que existeixen? \n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Sobreescriu les imatges que existisquen" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -389,12 +396,12 @@ "Error durant l'assemblatge del projecte\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Error durant l'execució de l'assistent" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -403,273 +410,283 @@ "Error durant l'execució de l'assistent\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Assemblatge del Panorama..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Plataforma:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Versió:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Directori de treball:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Prefix d'eixida:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Mesclador:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "mesclador desconegut (enblend --versió fallada)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "intern" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Fusió d'exposició:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Fusió d'exposició desconeguda (enfuse --versió fallada)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Versió d'ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "FALLADA" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Nombre d'imatges actives:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Valor d'exposició d'eixida: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Mida del llenç: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projecció:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "S'està usant GPU per remapejar:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "cert" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "fals" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Eixides de panorama:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Exposició corregida, baix rang dinàmic" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Exposició fusionada des d'apilaments" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Exposició fusionada des de qualsevol disposició" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Alt rang dinàmic" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Imatges remapejades:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Sense correcció de l'exposició, baix rang dinàmic" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Apilaments combinats:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Exposició d'apilaments fusionats" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Capes:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Capes fusionades d'exposició paregut, sense correcció d'exposició" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Primera entrada d'imatge" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Número:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Nom de fitxer:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Mida: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Tipus de resposta:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Valor d'exposició: : %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "S'està tornant a mapejar i fusionar les imatges LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "S'estan remapejant les imatges LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "S'estan fusionant imatges..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" "S'estan tornant a mapejar les imatges LDR i fusionar les capes d'exposició..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "S'estan remapejant les imatges LDR sense correcció d'exposició..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "S'està fusionant la capa d'exposició %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "S'estan fusionant totes les capes d'exposició..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "S'està fusionant l'apilament número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "S'estan fusionant tots els apilaments..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "S'estan remapejant les imatges HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "S'està barrejant l'apilament HDR número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "S'estan fusionant totes els apilaments HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "S'estan actualitzant les metadades..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Assemblatge %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "Primera imatge" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "Darrera imatge" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "Directori" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Fabricant de la càmera" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Model de la càmera" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -677,35 +694,69 @@ msgid "Lens" msgstr "Lent" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "Projecció desconeguda" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Fitxer d'imatge no trobat" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "S'està carregant el fitxer %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Error" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -716,26 +767,11 @@ "Hugin no pot treballar amb estos noms de fitxer. Canvieu el nom del fitxer i " "torneu-ho a provar de nou." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Informe de depuració generat en «%s»." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Tots els fitxers d'imatge|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" -"*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." -"exr;*.EXR|fitxers JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg; *.JPEG|fitxers " -"TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|fitxers PNG (*.png)|*.png;*." -"PNG|fitxers HDR (*.hdr)|*.hdr;*.HDR|fitxers EXR(*.exr)|*.exr;*.EXR|Tots els " -"fitxers (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -747,27 +783,27 @@ msgstr "L'entrada «%s» no és un nombre vàlid." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Avís" @@ -784,7 +820,7 @@ msgid "Could not save information into database." msgstr "No s'ha pogut alçar la informació a la base de dades." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -795,11 +831,11 @@ "%s \n" "Avorta" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Format d'imatge no suportat" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -811,7 +847,7 @@ "Hugin no dona suport a este tipus d'imatge. S'està ometent esta imatge.\n" "Convertiu la imatge a escala de grisos i torneu a provar de nou." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, fuzzy, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -825,26 +861,26 @@ "Hugin no dona suport a este tipus d'imatge. S'està ometent esta imatge.\n" "Convertiu la imatge a escala de grisos i torneu a provar de nou." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 #, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" @@ -855,34 +891,34 @@ "Hugin no dona suport a este tipus d'imatge. S'està ometent esta imatge.\n" "Convertiu la imatge a escala de grisos i torneu a provar de nou." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -890,7 +926,7 @@ "Hugin té piles d'imatges detectades en les imatges afegides i assignarà " "números de pila corresponents a les imatges." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -900,11 +936,11 @@ "seran reassignats a la base d'esta detecció. Les assignacions de pila " "existents es sobreescriuran." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Hauria de vincular-se la posició de les imatges en cada pila?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -916,41 +952,41 @@ "panorama. Però si les imatges en cada pila requereixen un ajust fi de la " "posició (per exemple, quan es dispara de mà), llavors no vincular la posició." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Enllaça posició" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "No enllaces la posició" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "No assignes apilaments" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Mantingues els apilaments existents" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Fitxer d'imatge no trobat" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "parella d'imatge següent" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -961,16 +997,17 @@ "\n" "Prem «D'acord» per suprimir-les." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Error detectat" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Afig imatges" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -979,32 +1016,32 @@ "Error, la plantilla esperava %d imatges, \n" "el projecte actual sols té %d imatges.\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "No es pot aplicar la plantilla" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Error durant l'obertura del projecte" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultat" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "No s'ha trobat el directori xrc al paquet" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Error fatal" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1038,7 +1075,7 @@ "imatges ja afegides. \n" "Comproveu la imatge de nou, si heu seleccionat les imatges correctes." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Afig imatges : cancel·la" @@ -1051,9 +1088,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1070,7 +1107,7 @@ msgstr "S'estan trobant línies ..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Acabat" @@ -1084,11 +1121,11 @@ "Executeu «Troba línies» primer. Si no es troba cap línia, canvieu els " "paràmetres." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "S'estan optimitzant els paràmetres de distorsió de lents ..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1098,142 +1135,142 @@ "Executeu «Troba línies» i «Optimitza» abans d'alçar les dades de la lent. Si " "no hi ha cap línia que es trobe, canvia els paràmetres." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Alça els paràmetres de la lent a un fitxer ini" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Alça els paràmetres de la lent a la base de dades de lents" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "S'estan alçant les dades de la lent" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Alça lents" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Alça el fitxer de projecte" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Fitxers de projectes (*.pto)|*.pto|Tots els fitxers (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "S'està netejant els fitxers temporals..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "Mostra este missatge d'ajuda" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Executa l'assistent" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Executa l'assemblatge amb el projecte entrat" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Nombre de fils usats" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "Prefix usat per l'assemblatge" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "Sols imprimeix ordes" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Sistema operatiu: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bits" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bits" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arquitectura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Memòria lliure: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Taula de codis activa: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Versió: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Camí als recursos: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Camí a les dades: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Base de dades de lents i càmeres Hugins: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi fils usant C++11 std::thread i OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "No es pot llegir el fitxer projecte %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Biblioteques" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano de http://autopano.kolor.com no està disponible per Mac OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Voleu utilitzar Autopano-Sift en el seu lloc?" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1241,87 +1278,92 @@ "Almenys un camp d'entrada està buit. \n" "Comproveu les entrades." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Intenta connectar totes les imatges superposades." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Només es pot treballar amb parells d'imatges sense punts de control." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Selecciona el programa de detecció de punts de control" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x esquerra" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y esquerra" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x dreta" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y dreta" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Alineament" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distància" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Afegit nou punt de control" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "S'estan cercant punts similars..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Error durant el càlcul de precisió" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Punt calculat amb precisió , angle : %.0f graus, coeficient de correlació : " -"%0.3f, curvatura %0.3f %0.3f" +"Punt calculat amb precisió , angle : %.0f graus, coeficient de correlació : %" +"0.3f, curvatura %0.3f %0.3f" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" "Canvieu els punts, o premeu el botó dret del ratolí per afegir un parell de " "punts" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "El punt calculat és fora de la imatge" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "No s'ha trobat cap punt similar" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1329,7 +1371,7 @@ "Una transformació interna ha eixit malament. \n" "Comproveu que el punt està dins de la imatge." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1340,31 +1382,37 @@ "El coeficient de correlació (%.3f) és menor que el llindar fixat en les " "preferències." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Afig una línia nova" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Línia %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Llindar de correlació:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "Normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "Línia vertical" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "Línia horitzontal" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1374,38 +1422,38 @@ "Per crear menys punts, \n" "introdueix un nombre més gran." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Llindar de detecció del cantó" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Crea punts de control" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Escala de detecció del cantó" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Error durant la creació de punts de control: \n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Seleccioneu un punt en la imatge de la dreta" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Seleccioneu un punt en la imatge de l'esquerra" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1413,55 +1461,56 @@ "No es pot executar celeste sense almenys un punt de control que connecte les " "dues imatges" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "S'està executant Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "S'està carregant el fitxer model" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Trets %lu punts de control" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Resultats de Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "S'està netejant" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Centrar" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Tracta d'esborrar els punts de control dels núvols" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Neteja lot" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Elimina punts de control perifèrics amb un mètode estadístic" @@ -1473,23 +1522,23 @@ msgid "Could not process event!" msgstr "No es pot processar l'esdeveniment !" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Imatge de l'esquerra" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Imatge de la dreta" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1497,7 +1546,7 @@ "Entreu l'error mínim pels punts de control.\n" "Quedaran seleccionats tot els punts amb un error superior" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Selecciona els punts de control" @@ -1575,60 +1624,60 @@ "restringir), o balancegeu amb arrossegament dret o premeu Ctrl i " "arrossegament." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Vista prèvia panorama" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fitxer" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Imatges mostrades" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Tot" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Cap" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Amaga" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "Arrossega per canviar el camp de visió vertical" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "Arrossega per canviar el camp de visió horitzontal" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Vista prèvia" @@ -1636,84 +1685,89 @@ msgid "Overview" msgstr "Visió de conjunt" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Restableix els paràmetres de la projecció als valors per defecte." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "Paràmetres:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "No s'han carregat imatges." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu imatges carregades." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Les imatges es connecten mitjançant %lu punts de control.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "trobats %d grups d'imatges sense connectar:" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Les imatges o punts de control han canviat, es necessita una nova alineació." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Mitjana de l'error després de l'optimització: %.1f pixel, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectilini" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cilíndric" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "L'angle de guinyada ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "L'angle de capcineig ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "L'angle de balanceig ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "El valor X ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "El valor Y ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "El valor Z ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "El valor ha de ser numèric." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1725,55 +1779,55 @@ "Però el seu projecte té paràmetres diferents de zero Tpy i Tpp. \n" "S'haurien de reinicialitzar els paràmetres TPY i TPP a zero?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "Diferència" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autoescapça" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "S'està calculant l'escapçat òptim" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "La mida superior ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "La mida esquerra ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "La mida dreta ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "La mida inferior ha de ser un enter més gran que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "El límit esquerre ha de ser menor que el de la dreta" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "El límit superior ha de ser menor que la part inferior" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "El valor HFOV no és vàlid. El màxim HFOV per a esta projecció és %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "El valor VFOV no és vàlid. El màxim VFOV per a esta projecció és %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1781,7 +1835,7 @@ "Amb un ampli camp de visió, un panorama amb projecció rectilínia s'estira " "molt cap a les vores.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1789,15 +1843,15 @@ "Des que el camp de visió és molt ampli en la direcció horitzontal, proveu " "una projecció cilíndrica." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Per a un panorama molt ampli, proveu projecció equirectangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Podeu provar també la projecció Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1809,7 +1863,7 @@ "Una projecció equirectangular encaixaria el mateix contingut en menys espai " "vertical." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1820,7 +1874,7 @@ "La projecció cilíndrica conserva les línies verticals, a diferència de la " "equirectangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1832,7 +1886,7 @@ "Una projecció conforme conserva els angles al voltant d'un punt, que sovint " "ho fa fàcil per la vista." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1844,7 +1898,7 @@ "La projecció panorama gran angular ho comprimeix, pel que pot adaptar-se a " "un ampli camp de visió i encara té una cobertura raonable al centre." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1852,7 +1906,7 @@ "Configurar el panorama a una projecció rectilínia mantindria les línies " "rectes." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1862,27 +1916,27 @@ "projeccions. \n" "Si desitgeu veure la barra de nou, activeu la barra a les preferències." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaic " -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaic, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfera" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Pla mosaic" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1893,12 +1947,12 @@ "\n" "Hauria de tornar-se a optimitzar el panorama ara?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "L'estratègia de l'optimitzador actual seleccionada és «%s»." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1906,7 +1960,7 @@ "La regió seleccionada no conté cap imatge activa. \n" "Seleccioneu una regió que estiga coberta per almenys 2 imatges." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1914,7 +1968,7 @@ "La regió seleccionada només està coberta per una sola imatge. \n" "No es poden crear punts de control per a una sola imatge." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1928,27 +1982,27 @@ "\n" "Voleu continuar igualment?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "S'estan cercant els punts de control" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "S'està processant" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Refés la imatge a una projecció panorama... " -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "S'estan cercant punts d'interés..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "S'estan comprovant els resultats..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1959,7 +2013,7 @@ "\n" "Hauria de tornar-se a optimitzar el panorama ara?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1967,7 +2021,7 @@ "Error en inicialitzar GLEW\n" "La finestra de vista prèvia no es pot obrir." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2014,7 +2068,7 @@ msgstr "Nombre de màscares" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Escapça" @@ -2047,7 +2101,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "La diferència Ev màxima ha de ser més gran que 0" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Apilaments" @@ -2224,7 +2278,7 @@ msgid "Shutter speed" msgstr "Temps d'exposició" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2371,97 +2425,97 @@ msgid "Camera response parameter" msgstr "Paràmetres de resposta de la càmera" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "No activa" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "Activa" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Lent %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Apilament %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Apilament d'eixida %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Capa d'exposició d'eixida %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Enllaça" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Trenca l'enllaç" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Selecciona-ho tot per les lents actuals" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Treu tot el seleccionat per les lents actuals" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Selecciona-ho tot per l'apilament actual" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Treu tot el seleccionat per l'apilament actual" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Selecciona tot" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Treu tot el seleccionat" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Edita les variables de les imatges..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Alça imatge" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Alça imatge" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "Imatges mostrades" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Nombre d'imatges actives:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Punts de Control" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2494,12 +2548,24 @@ msgid "Did you know..." msgstr "Sabíeu ..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versió %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2507,76 +2573,76 @@ "Error d'instal·lació fatal\n" "El fitxer de dades / splash.png no ha sigut trobat a:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "A&juda" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Accions" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Eixida" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Edita" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Executa l'assistent" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Iniciat" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimitzador" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Exposició" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Alceu els canvis al panorama abans de tancar?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Alceu els canvis al panorama abans de tancar?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Alceu els canvis al panorama abans de tancar?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2584,7 +2650,7 @@ msgstr "" "Si tanqueu sense alçar, els canvis des de la darrera alçada seran descartats" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2592,7 +2658,7 @@ msgstr "" "Si tanqueu sense alçar, els canvis des de la darrera alçada seran descartats" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " @@ -2600,40 +2666,40 @@ msgstr "" "Si tanqueu sense alçar, els canvis des de la darrera alçada seran descartats" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "No alces" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Tanca sense alçar" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Tancament forçat" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "Projecte %s alçat" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Assemblador panorama" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Editor panorama" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2646,36 +2712,36 @@ "\n" "(Codi d'error: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Alça el fitxer guió PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Fitxer PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Obri el projecte:" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projecte obert" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "S'estan carregant la imatge:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Error durant l'obertura del projecte:" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Obri el fitxer de projecte" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2686,11 +2752,11 @@ "Este fitxer no pot ser obert amb Fitxer, Obri.\n" "Voleu afegir esta imatge al projecte actual?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Obri el projecte : cancel·la" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2698,7 +2764,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2706,34 +2772,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "No es pot llegir el fitxer projecte %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Obri un fitxer de projecte" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Fitxers mascara (*.msk)|*.msk | Tots els fitxers (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Tria plantilla per al projecte" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Ajustament precís a tots els punts" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Ajustament precís" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2762,23 +2828,23 @@ "Utilitzeu la llista de punts de control (F3) per veure tots els punts del " "projecte actual.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Resultat de l'ajustament precís" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "S'estan suprimint els punts de control a les mascares" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Selecciona guió python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Guió python (*.py)|*.py | Tots els fitxers (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2787,13 +2853,13 @@ "El fitxer «%s» no ha sigut trobat.\n" "Tal vegada el fitxer ha canviat de nom, de lloc, o s'ha suprimit." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Error!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2801,12 +2867,12 @@ "El model Celeste esperat en %s no ha sigut trobat, Hugin necessita ser " "instal·lat de forma correcta." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "No es pot carregar el fitxer %s del model Celesta" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2816,7 +2882,7 @@ "apilaments i/o desplaçament central de vinyetejat.\n" "Esta característica no està suportada en la interfície senzilla." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2826,7 +2892,7 @@ "translacions o paràmetres tallats.\n" "Estos paràmetres no estan suportats en la interfície senzilla." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2836,28 +2902,28 @@ "translacions o paràmetres tallats.\n" "Estos paràmetres no estan suportats en la interfície avançada." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "S'està executant l'assistent." -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Atenció s'han trobat %d grups d'imatges no connectades:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2870,7 +2936,7 @@ "\n" "Després d'afegir els punts, premeu el botó «Alinea» de nou." -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2878,23 +2944,23 @@ "L'assistent no s'ha completat amb èxit. Comproveu el fitxer del projecte " "resultant." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "No s'ha trobat el fitxer de projecte" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "No es pot llançar PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Llançat programa incorrecte" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Tipus de mascara" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2902,29 +2968,29 @@ "Creeu una mascara poligonal prement el botó esquerre del ratolí sobre la " "imatge, ajusteu el darrer punt amb el botó dret del ratolí." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Alceu mascara" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Fitxers mascara (*.msk)|*.msk | Tots els fitxers (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Carrega la mascara" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Carrega mascara : cancel·la" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "No es pot depurar la mascara del fitxer %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Introduïu un nombre vàlid" @@ -3066,7 +3132,7 @@ msgstr "Alineament fotomètric" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "S'estan carregant imatges" @@ -3111,64 +3177,68 @@ msgid "Photometric optimization finished" msgstr "Optimització fotomètrica acabada" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Afig imatges individuals..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Afig imatges de sèries temporals..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "No s'han trobat imatges concordants." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Edita les variables de les imatges..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Treu la imatge(s) seleccionada" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ancorar esta imatge per la posició" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ancorar esta imatge per l'exposició" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Lent nova" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Canvia la lent..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Introdueix el nou número de la lent" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Lent número" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Canvia el número de la lent" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Carrega els paràmetres de la lent des de la base de dades de lents" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Carrega els paràmetres de la lent des d'un fitxer ini" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3177,12 +3247,12 @@ "S'haurien d'aplicar els paràmetres de la lent carregada a totes les imatges " "amb la mateixa lent?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Pregunta" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3192,100 +3262,100 @@ "Aplicar els paràmetres de la lent pot produir resultats inesperats.\n" "Voleu aplicar els paràmetres de tota forma ?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Alça els paràmetres de la lent a un fitxer ini" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Treu els punts de control" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Les imatges seleccionades no tenen punts de control" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Segur que voleu suprimir %lu punts de control ?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Suprimeix punts de control" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Neteja els punts de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "S'està netejant els punts de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "S'estan comprovant els parells" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "S'està comprovant el projecte complet" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "S'ha acabat la neteja" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Treu punts de control o núvols" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Reinicialitza posicions" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Reinicialitza paràmetres de translació" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Reinicialitza els paràmetres de la lent" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Reinicialitza els paràmetres fotomètrics" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Apilament nou" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Canvia l'apilament..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Introdueix el nou número de l'apilament" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Apilament número" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Canvia el número de l'apilament" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Configura la mida de l'apilament..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Qualitat:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3355,47 +3425,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Àrea equal de Hammer-Aitoff" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "L'amplada cal que siga un enter més gran que 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "L'alçada cal que siga un enter més gran que 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "El límit esquerre cal que siga més petit que el dret" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "El límit superior cal que siga més petit que l'inferior." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "Les opcions PTmender no estan implementades" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Les opcions PTblender no estan implementades" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Les opcions per al programa HDRMerge no estan implementades" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "No es pot crear el fitxer de projecte temporal" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Especifica el prefix d'eixida" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3404,16 +3474,16 @@ "No teniu permisos per escriure a la carpeta «%s».\n" "Seleccioneu una altra carpeta per la eixida final." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "Reinicialitza l'usuari definit..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3423,7 +3493,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3436,7 +3506,7 @@ "assembleu-ho a la pestanya d'assemblament. Assemblar un panorama d'esta mida " "ocuparà molt de temps i una gran quantitat de memòria." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3449,19 +3519,19 @@ "És massa gran, reduïu la mida del llenç del panorama i les regions " "escapçades." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Esteu segurs de voler assemblar un panorama tan gran?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Assembleu de totes formes" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Deixeu-me fixar" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3471,7 +3541,7 @@ "Comproveu els vostres paràmetres, de forma que almenys una imatge estiga en " "la regió d'eixida." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3506,121 +3576,139 @@ msgid "Miscellaneous" msgstr "Miscel·lània" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Llengua per defecte al sistema" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Eusquera" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Català" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Xinés (Simplificat)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Xinés (Tradicional)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Txec" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Danés" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holandés" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Anglés" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francés" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Alemany" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Hongarés" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italià" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japonés" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polonés" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasiler)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Rus" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Eslovac" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Castellà" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Suec" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finés" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valencià (Català meridional)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Seleccioneu Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Executables (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Seleccioneu Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Selecciona tot" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Seleccioneu PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Selecciona tot" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Seleccioneu argfile ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool Argfiles (*.arg)|*.arg|Tots els fitxers(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3629,14 +3717,14 @@ "El fitxer %s no existeix. \n" "Hauria de crear-se argfile amb les etiquetes per defecte?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool argfile" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3644,18 +3732,18 @@ "No hi ha cap fitxer seleccionat.\n" "Hauria de crear-se argfile amb les etiquetes per defecte ?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Selecciona ExifTool argfile nou" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "No es pot alçar el fitxer «%s»." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, fuzzy, c-format msgid "" "File %s does not exist.\n" @@ -3664,7 +3752,7 @@ "El fitxer %s no existeix. \n" "Hauria de crear-se un argfile buit ?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 #, fuzzy msgid "" "No file selected.\n" @@ -3673,24 +3761,25 @@ "No hi ha cap fitxer seleccionat. \n" "Hauria de crear-se un argfile buit ?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "Voleu realment substituir les preferències mostrades pels valors per defecte?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Carrega els valors per defecte" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Seleccioneu una entrada primer" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Selecciona entrada" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3698,30 +3787,30 @@ "No podeu suprimir la darrera configuració. \n" "Almenys cal una configuració." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Realment voleu suprimir els ajustos del detector de punts de control \"%s\" ?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Suprimeix l'ajust del detector de punts de control." -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Carrega els ajustos del detector de punts de control" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Ajustos detecció de punts de control (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Alça els ajustos de detecció de punts de control" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3750,50 +3839,55 @@ msgid "Remove %lu control points" msgstr "Suprimeix %lu punts de control" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Vista prèvia panorama" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opcions de la vista prèvia" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Projecció (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Mode de barreja:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Eixida:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Compressió:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Paràmetres de projecció" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Premeu el botó esquerre per definir un nou punt central, premeu el botó dret " "per moure el punt a l'horitzó." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centreu el panorama amb el botó esquerre del ratolí, establiu l'horitzó amb " @@ -3813,7 +3907,7 @@ msgid "Click a connection to edit control points." msgstr "Prem una connexió per editar els punts de control." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3821,30 +3915,116 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "S'està detectant: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Tanca" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +#, fuzzy +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"L'«argfile» següent s'utilitza per copiar les etiquetes de la primera imatge " +"a totes les imatges intermèdies. \n" +"No seran reemplaçats els marcadors de posició." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "El directori '%s' no existeix" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "No es pot establir la variable d'entorn PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Obri processador per lots" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" "Obri PTBatcher, el processador per lots de fitxers de projecte de Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Obri l'eina de calibratge de lents" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "Obri Calibrate_lens_gui, una simple GUI per calibratge de lents" @@ -3859,11 +4039,11 @@ "Tal vegada no l'heu instal·lat de forma correcta o s'ha donat un camí " "incorrecte als paràmetres." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "S'està netejant els fitxers temporals de punts clau" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3872,15 +4052,15 @@ "Utilitza %namefile, %i o %s per especificar els fitxers d'entrada del " "detector de punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Error a l'orde de detecció de punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3892,14 +4072,14 @@ "Seleccioneu menys imatges o poseu les imatges\n" "dins una carpeta amb un camí més curt." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Massa imatges seleccionades" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3911,38 +4091,38 @@ "\n" "No es pot executar l'orde: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Error wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Mostra els punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "No es pot d'executar l'orde : %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3951,9 +4131,9 @@ "Orde: %s\n" "fallada amb el codi d'error : %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3968,13 +4148,13 @@ "\n" "Orde executada: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Error en la detecció de punts de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3982,7 +4162,7 @@ "Useu %i per especificar els fitxers d'entrada i %k per especificar els " "fitxers de punts clau per generar els passos clau" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3990,11 +4170,11 @@ "Useu %k per especificar els fitxers de punts clau i %o per especificar el " "fitxer projectes d'eixida per al pas de cerca" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "S'està generant el fitxer clau" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4007,265 +4187,265 @@ "\n" "No es pot executar l'orde: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Per defecte" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" msgstr "No es pot netejar el lot en procés. Realment voleu cancel·lar-lo ?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Lot netejat." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Error: No es pot obtindre l'estat, el projecte amb índex %d no està llest." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Error: No es pot carregar l'arxiu per lots" -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Lot completat amb èxit." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Lot completat amb errors." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "S'està inicialitzant la tancada..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "S'està tancant..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Prepara per hivernar ..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "S'està inicialitzant la hibernació ..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Prepara per suspendre ..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "S'està inicialitzant el mode de suspensió ..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Alça el fitxer de projecte" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "No hi ha especificat el prefix d'eixida" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "No hi ha especificats els fitxers de projecte" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "Assemblatge - %s" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "Assistent - %s" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Error removent, el projecte amb id %d no és a la llista." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Error: No es pot esborrar el fitxer del projecte" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Execució per lots ..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI iniciat" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Lot realment en progrés." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "S'està executant l'orde «%s»" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "S'està fent l'assemblatge: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "S'està detectant: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Error: No es configura l'estat, el projecte amb índex %d no és a la llista." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "No fent molt ..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Heu premut la tecla de l'orde." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Heu premut la tecla CTRL." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Hauria d'ometre's la càrrega de la cua per lots?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "No faces res" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Tanca PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Atura ordinador" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Suspen ordinador" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Hiverna ordinador" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Entreu l'aplicació de línia d'ordes a executar:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Entreu l'aplicació" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Especifiqueu el directori per cercar projectes" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Especifiqueu fitxer(s) de font de projecte(s)" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Afegits els projectes des del directori %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Afig projecte %s a la cua d'assemblament." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Afig projecte %s a la cua de l'assistent." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Lots aturats" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Processador de lots de Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Especifica el prefix d'eixida per al projecte" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "El prefix d'un objectiu auxiliar no es pot canviar." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Seleccioneu un projecte" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Seleccioneu un projecte" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Especifica l'arxiu per lots a obrir" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Arxiu per lots (*.ptb)|*.ptb|Tots els fitxers (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "No es pot obrir l'aplicació amb Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "No hi ha cap projecte seleccionat. Obriu Hugin sense projecte?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Lots aturats en pausa" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Estan continuant els lots ..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4273,7 +4453,7 @@ "Hi ha projectes fallats a la llista. \n" "Els esborrem també ?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4281,16 +4461,16 @@ "No es poden esborrar projectes en progrés. \n" "Voleu cancel·lar-los ?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Projecte esborrat %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Selecciona un projecte per esborrar" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4298,16 +4478,16 @@ "No es poden reinicialitzar projectes en progrés. \n" "Voleu cancel·lar-lo ?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Reinicialitza projecte %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Selecciona un projecte per a reinicialitzar" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4315,31 +4495,31 @@ "No es poden reinicialitzar projectes en progrés. \n" "Voleu cancel·lar el lot?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Especifica l'arxiu de lots a alçar" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Arxiu de lots (*.ptb)|*.ptb|Tots els fitxers (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Neteja lot" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "S'estan iniciant els lots" @@ -4375,7 +4555,7 @@ msgid "E&xit" msgstr "I&x" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4385,11 +4565,11 @@ "Si tanqueu el quadre de diàleg, els perdreu. \n" "Voleu continuar igualment?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Acceptat" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4399,11 +4579,11 @@ "Si continueu, no es tindran en compte. \n" "Encara voleu continuar?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Atura" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4412,7 +4592,7 @@ "El directori %s no existeix. \n" "Doneu un directori que existisca." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4420,7 +4600,7 @@ "Heu seleccionat un panorama que no és possible. \n" "Seleccioneu com a mínim un panorama i torneu-ho a intentar." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4430,141 +4610,143 @@ "Potser no teniu permís d'escriptura per a estos directoris o el disc és " "complet." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "suprimir aquesta imatge del projecte" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "S'estan cercant panorames" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "S'està carregant el fitxer %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Inicia" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "S'han trobat %d panorames possibles." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "No s'han pogut trobar panorames." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d imatges: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Detectats errors sintàctics en paràmetres, s'està avortant." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI iniciat" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "S'està esperant" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "En progrés" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Complet" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Fracàs" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fitxer perdut" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pausat" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projecte" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefix d'eixida" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Estat" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Darrera modificació" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Format d'eixida" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projecció" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Mida" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Error, no es pot convertir id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Canvia prefix" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Reinicialitza projecte" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Edita amb Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Esborra" @@ -4601,16 +4783,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Fitxers registre (*.log)|*.log|Tots els fitxers (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "No es pot llegir el fitxer projecte %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Especifica el fitxer de projecte de la font del projecte" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4621,7 +4803,7 @@ "vàlid." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Quant al Hugin" @@ -4654,19 +4836,19 @@ msgstr "Sistema" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "D'acord" @@ -4746,8 +4928,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Tria..." @@ -4839,7 +5024,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opcions" @@ -4871,10 +5056,6 @@ msgid "Send selected panoramas to queue" msgstr "Envia panorames seleccionats a la cua" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Tanca" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "S'estan cercant panorames" @@ -4977,12 +5158,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "I&x" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Ix del programa" @@ -5087,40 +5268,149 @@ msgid "adddir" msgstr "Afegeixdirectori" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "Parella d'imatges prèvies" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Descripció:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "Parella d'imatges següent" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Tipus:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "Mode:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Totes les imatges alhora" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "Línia vertical" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama amb apilaments" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "Línia horitzontal" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Panorama multi-fila" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom :" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Panorama multi-fila amb apilaments" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "Ajusta a la finestra" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Panorama prealineada" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Ajustament precís" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detector" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Detector d'un pas" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programa:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Arguments:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Neteja arguments:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Detector de dos passos" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Descripció de característiques:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Característica del programa:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detector d'apilaments" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Deixeu buit quan no hi haja detector de punts de control funcionant en " +"apilaments." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Opcions avançades" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Este paràmetre no té opcions avançades." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Els següents patrons seran substituïts abans de l'execució :\n" +"%o -- eixida del projecte (0.oto serà adjuntat quan s'utilitze Autopano)\n" +"%p -- nombre de punts de control entre cada parell d'imatges\n" +"%v -- HFOV de la primera imatge\n" +"%f -- projecció de la primera imatge (0-4, com en panotools)\n" +"%i -- fitxers d'imatge\n" +"%namefile -- fitxer que conté els noms de fitxers d'imatge \n" +"%s -- script d'entrada de panotools \n" +"%k -- fitxer(s) clau intermedi(s) " + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Paràmetres per la detecció de punts de control" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "Parella d'imatges prèvies" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "Parella d'imatges següent" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "Mode:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "Línia vertical" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "Línia horitzontal" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom :" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "Ajusta a la finestra" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Ajustament precís" #: hugin1/hugin/xrc/cp_editor_panel.xrc:241 msgid "Tries to optimize the currently active point" @@ -5183,7 +5473,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Suprimeix" @@ -5191,156 +5481,188 @@ msgid "Select by Distance" msgstr "Selecciona per la Distància" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Descripció:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Nom de fitxer no vàlids" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Tipus:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (per A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Sí" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Totes les imatges alhora" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "No" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama amb apilaments" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Editeu els scripts d'eines de Panorama" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Panorama multi-fila" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Este és la seqüència de comandes (script) que serà enviada al motor d'eines " +"de Panorama (« Eines Panorama »). L'edició d'estes línies és per a usuaris " +"avançats." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Panorama multi-fila amb apilaments" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Continua amb estos canvis" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Panorama prealineada" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Ignora els canvis i cancel·la" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Grup de:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Detector d'un pas" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Superposició mínima:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programa:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Superposició mínima per a detecció d'apilaments d'eixida" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Màxima diferència Ev:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Neteja arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Màxima diferència EV per a la detecció de capes d'eixida" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Detector de dos passos" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Mostra" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Descripció de característiques:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "General" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Característica del programa:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Dades EXIF" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detector d'apilaments" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Posicions" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Deixeu buit quan no hi haja detector de punts de control funcionant en " -"apilaments." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Paràmetres de la lent" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Opcions avançades" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Paràmetres fotomètrics" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Este paràmetre no té opcions avançades." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Tipus de lent" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Afig imatges..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Tipus de lent:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Multiplicador de distància focal:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Característica cercada" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Paràmetres:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -"Els següents patrons seran substituïts abans de l'execució :\n" -"%o -- eixida del projecte (0.oto serà adjuntat quan s'utilitze Autopano)\n" -"%p -- nombre de punts de control entre cada parell d'imatges\n" -"%v -- HFOV de la primera imatge\n" -"%f -- projecció de la primera imatge (0-4, com en panotools)\n" -"%i -- fitxers d'imatge\n" -"%namefile -- fitxer que conté els noms de fitxers d'imatge \n" -"%s -- script d'entrada de panotools \n" -"%k -- fitxer(s) clau intermedi(s) " +"Executeu detector de punt de control marcat en les imatges seleccionades" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Paràmetres per la detecció de punts de control" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimitza" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Nom de fitxer no vàlids" +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geomètric:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Editeu els scripts d'eines de Panorama" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Calcula" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotomètric:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Imatge seleccionada" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Carrega dades de la lent..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Este és la seqüència de comandes (script) que serà enviada al motor d'eines " -"de Panorama (« Eines Panorama »). L'edició d'estes línies és per a usuaris " -"avançats." +"Introduïu camp de visió horitzontal (HFOV) o distància focal i factor " +"d'escapçat:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Continua amb estos canvis" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Ignora els canvis i cancel·la" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "Graus" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Càmera i dades lent" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Guinyada:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Capcineig:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Balanceig:" @@ -5348,34 +5670,11 @@ msgid "Translation parameter" msgstr "Paràmetres de translació" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Posicions" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "Graus del camp de visió (v):" @@ -5475,7 +5774,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Ajuda" @@ -5518,8 +5817,8 @@ msgstr "Carregar" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Alça" @@ -5532,122 +5831,47 @@ msgid "Manipulate image variables" msgstr "Edita les variables de les imatges..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Grup de:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Superposició mínima:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Superposició mínima per a detecció d'apilaments d'eixida" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Màxima diferència Ev:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Màxima diferència EV per a la detecció de capes d'eixida" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Mostra" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "General" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Dades EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Paràmetres de la lent" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Paràmetres fotomètrics" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Tipus de lent" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Afig imatges..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Tipus de lent:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Multiplicador de distància focal:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Característica cercada" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Paràmetres:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "&Preferències" -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -"Executeu detector de punt de control marcat en les imatges seleccionades" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimitza" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geomètric:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Calcula" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotomètric:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Arguments addicionals :" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Imatge seleccionada" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Carrega dades de la lent..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Processant:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Introduïu camp de visió horitzontal (HFOV) o distància focal i factor " -"d'escapçat:" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "Graus" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Càmera i dades lent" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importa" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5792,14 +6016,6 @@ msgid "Don't ask again" msgstr "No ho preguntes de nou" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Sí" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "No" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5865,21 +6081,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Desfés" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Desfés la darrera acció" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "To&rna a fer" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Torna a fer la darrera acció" @@ -5924,12 +6140,12 @@ msgid "Use only normal control points in optimization." msgstr "Nombre de punts de control en esta imatge" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimitza" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Reexecuta l'optimitzador amb els paràmetres actuals" @@ -5960,16 +6176,16 @@ msgid "Run a python script" msgstr "Executa un script de Python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Visualitza" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Pantalla completa" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Mostra la finestra principal de Hugin a pantalla completa" @@ -6051,22 +6267,22 @@ msgid "Show the Stitcher panel" msgstr "Mostra el panell d'assemblatge" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Simple" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Avançat" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Expert" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Interfície" @@ -6089,86 +6305,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Part de la informació en els diferents botons i així successivament." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Consell del dia" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Mostra un dels consells del dia." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Dreceres del teclat" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "Dreceres del teclat" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&PMF" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Preguntes més freqüents" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "Quant &a" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Preferències" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nou" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Projecte nou" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Obri" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Obri un projecte" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "Al&ça" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Alça el fitxer del projecte actual" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "&Anomena i Alça" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Alça l'actual projecte en un fitxer nou" @@ -6184,19 +6400,19 @@ "Escriu l'actual projecte en un fitxer script compatible amb PTStitcher, útil " "per a un processament per lots" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Projectes utilitzats recentment" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Llista dels fitxers de projectes utilitzats més recentment" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Executa el processado&r per lots" @@ -6282,7 +6498,7 @@ msgid "Show the OpenGL preview image" msgstr "Mostra la visualització OpenGL de la imatge" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Vista prèvia del panorama" @@ -6339,15 +6555,10 @@ msgstr "Exclou la regió de totes de les imatges amb esta lent" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exporta" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importa" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Còpia" @@ -6392,8 +6603,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6501,7 +6712,8 @@ msgid "execute the PTOptimizer engine" msgstr "Executa el motor PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientació de la imatge" @@ -6547,39 +6759,39 @@ msgid "Interpolator (i):" msgstr "Interpolador (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicúbic)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineal" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Veí més proper" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Aproximació dels valors entre els píxels font" @@ -6608,7 +6820,7 @@ msgid "Enfuse options" msgstr "Opcions d'Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Camp de visió:" @@ -6773,10 +6985,6 @@ msgid "Image fusion:" msgstr "Fusió d'imatge:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "Enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Fusió HDR:" @@ -6880,16 +7088,16 @@ msgid "Output parameters" msgstr "Paràmetres d'eixida" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Mode de barreja:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "Error d'Enblend" @@ -6962,27 +7170,43 @@ msgstr "" "Suprimeix tots els punts de control a l'interior de les àrees emmascarades" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Executable Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(deixa en blanc per a utilitzar un valor per defecte del S.O.)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Executable Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Executable Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Opcions de fitxer" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Directori temporal:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(deixa en blanc per a utilitzar un valor per defecte del S.O.)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Nom de fitxer de projecte per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Prefix d'eixida per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7013,43 +7237,43 @@ "%lens - lent (de la primera imatge)\n" "%projectname - nom del fitxer projecte (sols per al prefix d'eixida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Nom de fitxer per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Nom de fitxer" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "S'està carregant imatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Alinea les imatges de forma automàtica després de carregar-les" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Detecta línies verticals" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Detecta línies verticals en les imatges per anivellar el «pano»" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Elimina punts de control en el núvol (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Passos opcionals de l'assistent" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Auto alinea" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7057,67 +7281,67 @@ "Nombre de punts de control \n" "per cada superposició" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Escala baixa final de «pano»" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "Percentatge de l'amplada màxima" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor de punts de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Mostra HDR i 16 bits" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Corba" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "Lineal" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "Logarítmic" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "Gamma 2,2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "Utilitzat per mostrar en la interfície gràfica" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Amplada del pegat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "Píxels" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Amplada de l'àrea de cerca:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "Percentatge de l'amplada de la imatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Amplada de la zona de cerca local:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Llindar de correlació:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7125,11 +7349,11 @@ "0 : no similitud\n" "1 : màxima similitud" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Llindar de curvatura dels pics:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7137,116 +7361,112 @@ "0 : no pic\n" "0.2 : pic diferenciat" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Cerca per rotació" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Habilita la cerca per rotació (més lenta però més precisa)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Angle d'inici:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Angle final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Passos:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Detectors de punts de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programes detectors de punts de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nou..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Edita..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Puja" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Baixa" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Configura per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "L'assistent està utilitzant la configuració per defecte." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Format d'eixida" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Format del fitxer per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "Format d'eixida per defecte per al panorama final" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Compressió TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "Compressió TIFF per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Qualitat JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "Paràmetre de compressió JPEG per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Mesclador" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Nom del mesclador per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "El mesclador per defecte que s'usa als projectes nous." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processador" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Assemblador&projectes&Hugin" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "El motor que executarà l'assemblament" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Inicia l'assemblament de treballs ara mateix" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7256,19 +7476,19 @@ "treballs de la cua. En cas contrari, el processador s'iniciarà en estat " "suspès i l'usuari haurà d'iniciar el processament manualment." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Sobreescriu fitxers que existisquen" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "ADVERTÈNCIA: els fitxers existents es sobreescriuran sense més avisos." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Eixida detallada" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7276,19 +7496,19 @@ "Habilita per obtindre els detalls, útil quan s'informa d'un error o " "simplement per veure el progrés del projecte." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Assemblatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Copia les metadades dins de fitxers finals emprant ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Opcions d'ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7297,7 +7517,7 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 #, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " @@ -7307,52 +7527,52 @@ "a totes les imatges intermèdies. \n" "No seran reemplaçats els marcadors de posició." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "ExifTool argfile intermedi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Deixa en blanc per emprar valor per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Edita l' ExifTool argfile seleccionat" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 #, 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 "" -"La «argfile» següent s'utilitza per copiar les etiquetes de la primera " -"imatge al panorama final.\n" +"La «argfile» següent s'utilitza per copiar les etiquetes de la primera imatge " +"al panorama final.\n" "Si s'aplica a més a més «argfile» per a les imatges intermèdies.\n" -"Els marcadors de posició en este «argfile» seran reemplaçats abans " -"d'executar «exiftool»." +"Els marcadors de posició en este «argfile» seran reemplaçats abans d'executar " +"«exiftool»." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "ExifTool argfile final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Crea dades de foto esfera XMP" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Això només es farà per imatges d'eixida equirectangulars." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Opcions avançades" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Nombre de fils:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7364,82 +7584,84 @@ "Configura este nombre màxim amb el nombre de processadors o de nuclis de " "processament disponibles al seu sistema." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 per a detecció automàtica" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Assemblatge (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Interpolador per defecte (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Crea les imatges retallades per defecte" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Utilitza GPU per remapejar (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" +msgstr "S'està usant GPU per remapejar:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Utilitza la targeta de vídeo GPU per accelerar el remapejat" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Utilitza un programa alternatiu a Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Executable Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Arguments per defecte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Estos són els arguments per defecte per als nous projectes. \n" "Es poden canviar per a projectes individuals en la pestanya Assemblatge. \n" "No establisca -w, -o i --arguments de compressió, que estan establerts per " "Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Utilitza un programa alternatiu a Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Executable Enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programes" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Paràmetres de Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Llindar SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7447,19 +7669,19 @@ "més gran que 0,5: menys sensible\n" "menor que 0,5: més sensible" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Mida del filtre Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "petit" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "gran" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7467,7 +7689,7 @@ "Gran és més precís \n" "Petit permet examinar els punts de control prop de la vora de la imatge" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7477,73 +7699,73 @@ "l'anàlisi del valor del color en les àrees de superposició. \n" "Per accelerar el càlcul, s'utilitza només un subconjunt aleatori de punts." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Nombre de punts per cada imatge:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Optimitzador fotomètric" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Avisos" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" "Mostra el missatge sobre l'alçat del fitxer del projecte i prefix d'eixida" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Mostra l'avís sobre la diferència d'exposició gran quan s'afigen imatges" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Després de l'eina «edita cp»" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Pregunta a l'usuari" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Reoptimització del Panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "No optimitzes el panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Edita l'eina cp (a la finestra de previsualització rapida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Divers" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Preferències - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Edita ExifTool argfile" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 #, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" @@ -7580,11 +7802,11 @@ "\n" "Els marcadors de posició distingeixen entre majúscules i minúscules." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centra la vista prèvia horitzontalment" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centra" @@ -7592,13 +7814,15 @@ msgid "Show the whole panorama" msgstr "Mostra l'assemblatge del panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estima el camp de visió" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Encaixa" @@ -7606,7 +7830,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Ajusta automàticament un horitzó ondulat" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Redreça" @@ -7705,32 +7930,32 @@ "Estableix el valor de l'exposició del panorama de l'exposició mitjana de " "totes les imatges." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Selector de grisos" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corregeix el balanç global de blancs amb la selecció d'una àrea grisa neutra" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Edita CP" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Crea o suprimeix punts de control al rectangle seleccionat." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Fons:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Escala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7744,161 +7969,149 @@ "* Premeu a una línia per editar les imatges associades a la pestanya Punts " "de Control." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Disposició" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guies:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Regla dels terços" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Proporció àuria" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Mètode diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Triangle d'or (inferior)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Triangle d'or (superior)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Ajusta automàticament un horitzó ondulat." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Mode d'arrossegament:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Aplica" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Mou el panorama o arrossega les imatges a la posició" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Mou/Arrossega" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Estableix la regió escapçada al rectangle més gran cobert per imatges" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR autoescapça" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Estableix la regió escapçada al rectangle més gran cobert per apilaments " "d'imatges" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "Esquerra:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "Superior:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "Dreta:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "Inferior:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Reinicialitza l'escapçada a la màxima àrea possible" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Canvia la regió a escapçar pel panorama" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Editor Panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Resum" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Mostra la visió general en l'esfera panorama." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Graella" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Mostra la graella." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Afig imatges" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Posició de l'enllaç de les imatges en cada apilament" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Introduïu nombre d'imatges per apilament" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Posició de l'enllaç de les imatges en cada apilament" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Canviar la lent de les imatges seleccionades" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Reinicialitza posicions" @@ -8110,8 +8323,8 @@ "The PanoTools wiki at http://wiki.panotools.org offers comprehensive " "information about creating panoramas and other images with panotools." msgstr "" -"El wiki de «Panotools», que es troba en la direcció http://wiki.panotools." -"org ofereix informació interessant sobre la creació de panorames i altres " +"El wiki de «Panotools», que es troba en la direcció http://wiki.panotools.org " +"ofereix informació interessant sobre la creació de panorames i altres " "imatges amb « Panotools »." #: hugin1/hugin/xrc/data/tips.txt:25 @@ -8209,6 +8422,85 @@ "imatges amb un grau elevat de superposició i molts punts de control " "distribuïts correctament." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Preferències" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Imatges" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Afig imatges..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Afig una altra imatge al projecte actual" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Suprimir aquesta imatge" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Treu la imatge(s) seleccionada" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Escala de detecció del cantó" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "Nou projecte" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Mou el panorama o arrossega les imatges a la posició" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Canvia la regió a escapçar pel panorama" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Utilitza GPU per remapejar (EXPERIMENTAL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Tots els fitxers d'imatge|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." +#~ "TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." +#~ "HDR;*.exr;*.EXR|fitxers JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg; *.JPEG|" +#~ "fitxers TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|fitxers PNG (*.png)|" +#~ "*.png;*.PNG|fitxers HDR (*.hdr)|*.hdr;*.HDR|fitxers EXR(*.exr)|*.exr;*." +#~ "EXR|Tots els fitxers (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (per A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "Enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Assemblador&projectes&Hugin" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Interfície" @@ -9039,10 +9331,6 @@ #~ msgstr "&Fitxer" #, fuzzy -#~ msgid "Image file:" -#~ msgstr "Fitxer d'imatge no trobat" - -#, fuzzy #~ msgid "Polynomial" #~ msgstr "normal" @@ -9253,10 +9541,6 @@ #~ msgstr "25%" #, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "Nou projecte" - -#, fuzzy #~ msgid "Nona" #~ msgstr "Cap" @@ -9388,9 +9672,6 @@ #~ msgid "PTStitcher note" #~ msgstr "Nota de PTStitcher" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Seleccioneu PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "PTStitcher.exe no ha estat seleccionat" @@ -9550,9 +9831,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "Error durant l'assemblatge" -#~ msgid "Remove this image" -#~ msgstr "Suprimir aquesta imatge" - #~ msgid "Stitching Options" #~ msgstr "Opcions d'assemblatge" @@ -9653,9 +9931,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend :" -#~ msgid "Additional Arguments:" -#~ msgstr "Arguments addicionals :" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "No indiqueu els arguments -w i -o, ho farà hugin" diff -Nru hugin-2018.0.0+dfsg/src/translations/cs_CZ.po hugin-2019.0.0+dfsg/src/translations/cs_CZ.po --- hugin-2018.0.0+dfsg/src/translations/cs_CZ.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/cs_CZ.po 2019-02-17 15:24:33.000000000 +0000 @@ -27,14 +27,14 @@ msgstr "" "Project-Id-Version: cs_CZ\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2016-06-25 09:50+0100\n" "Last-Translator: Václav Černý \n" "Language-Team: Čeština\n" -"Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs_CZ\n" "X-Generator: Poedit 1.5.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" @@ -64,14 +64,14 @@ msgid "Searching for best crop..." msgstr "Hledám nejlepší ořez..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "Externí program %s nenalezen v balíku, vracím se k systémové cestě" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -97,9 +97,9 @@ msgstr "Bitmapa (*.bmp)|*.bmp|PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Soubor %s existuje. Mám ho přepsat?" @@ -136,7 +136,7 @@ msgstr "Hodnota ořezu musí být kladná." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -149,24 +149,28 @@ "Opravdu chcete použít takhle vysokou hodnotu?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -187,8 +191,8 @@ msgstr "Plnosnímkové rybí oko" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirectangular" @@ -219,11 +223,13 @@ msgid "builtin" msgstr "zabudovaný" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "vlastní (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineární" @@ -247,16 +253,16 @@ msgid "Error loading lens parameters" msgstr "Chyba při nahrávání parametrů objektivu." -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Uložit soubor s parametry objektivu" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Soubory s vlastnostmi objektivu (*.ini)|*.ini|Všechny soubory (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Uložit projekt" @@ -292,22 +298,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Chyba při pozastavování procesu %ld, návratový kód 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Zrušit" @@ -341,12 +348,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Nelze otevřít projektový soubor:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "nelze otevřít skript: %s" @@ -356,8 +363,8 @@ msgid "Project %s does not contain any active images." msgstr "Projekt %s neobsahuje žádné aktivní obrázky." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "chyba při parsování panotools skriptu: %s" @@ -371,17 +378,17 @@ msgid "Could not create temporary file" msgstr "Nelze vytvořit dočasný soubor" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "Fronta je prázdná. To by se nikdy nemělo stát." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Chyba během slepování" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -389,11 +396,11 @@ "Přepsat existující obrázky?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Přepsat existující obrázky" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -402,12 +409,12 @@ "Chyba při slepování projektu\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Chyba při běhu pomocníka" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -416,273 +423,283 @@ "Chyba při běhu pomocníka\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Slepuji panorama..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Platforma:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Verze:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Pracovní adresář:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Výstupní prefix:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Prolínač:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Neznámý blender (enblend --version selhalo)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "vestavěný" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Expoziční fůze:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Neznámý expoziční fůzor (enfuse --version selhalo)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "ExifTool verze:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "SELHALO" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Počet aktivních obrázků:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Výstupní expozice: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Velikost plátna: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projekce:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Použít GPU pro přemapování:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "pravda" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "nepravda" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panoramatický výstup:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Expozične vyrovnané, nízký dynamický rozsah" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Expoziční fúze ze štosů" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Expozičně zfůzované z jakéhokoli rozložení" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Vysoký dynamický rozsah" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Přemapované obrázky:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Bez korekce expozice, nízký dynamický rozsah" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Kombinované štosy:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Expoziční zfúzované štosy" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Vrstvy:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" "Prolnuté jednotlivé vrstvy s podobnými expozicemi, bez korekce expozice." -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "První vstupní obrázek" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Číslo:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Název souboru:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Velikost: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Typ odezvy:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Expozice: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Přemapovávám a slučuji LDR obrázky..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Přemapované LDR obrázky:" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Slučuji obrázky..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Přemapování LDR obrázků a sloučení expozičních vrstev..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Přemapovat LDR obrázky bez expoziční korekce..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Slučuji expoziční vrstvu %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fůzování všech expozičních vrstev..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Slučuji štos %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Slučování všech štosů..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Přemapovávám HDR obrázky..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Slučuji hdr štos č. %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Slučování hdr štosů..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Aktualizuji metadata..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Slepuji pomocí \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "první obrázek" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "poslední obrázek" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "adresář" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Výrobce fotoaparátu" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Model fotoaparátu" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -690,35 +707,69 @@ msgid "Lens" msgstr "Objektiv" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "neznámá projekce" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Soubor obrázku:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Nahrávám soubor %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Chyba" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -728,25 +779,11 @@ "Jméno souboru obsahuje některý z neplatných znaků: %s\n" "Hugin nemůže pracovat s takovými názvy. Přejmenujte soubor a zkuste to znova." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Podrobné debugovací zprávy generovány do \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"všechny obrázky|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPG obrázky (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF obrázky (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG obrázky (*.png)|*.png;*.PNG|HDR obrázky " -"(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Všechny soubory (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -758,27 +795,27 @@ msgstr "Vstup \"%s\" není platné číslo." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Varování" @@ -795,7 +832,7 @@ msgid "Could not save information into database." msgstr "Nepodařilo se uložit informace do databáze." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -806,11 +843,11 @@ "%s\n" "Zrušit" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Nepodporovaný obrazový formát" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -822,7 +859,7 @@ "Hugin tento typ obrázků nepodporuje. Přeskakuji obrázek.\n" "Převeďte obrázek do stupňů šedi a zkuste to znovu. " -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -838,14 +875,14 @@ "Hugin takovéto soubory nepodporuje. Přeskakuji obrázek.\n" "Převeďte ho do stupňů šedi či do barvy a zkuste přidat znovu." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin podporuje obrázky jen v úrovních šedi či barevné (s průhledností či " "bez)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -853,14 +890,14 @@ msgstr "" "Soubor \"%s\" je v úrovních šedi, ostatní v projektu jsou plnobarevné." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "Soubor \"%s\" je barevný, ale ostatní jsou jen v úrovních šedi." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -869,7 +906,7 @@ "Hugin nepodporuje takovéto míchání. Přeskakuji obrázek.\n" "Převeďte obrázek do stupňů šedi či RGB a zkuste to znovu. " -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -878,7 +915,7 @@ "Soubor \"%s\" nemá vložený icc profil, ale ostatní v projektu mají profil " "\"%s\" obsažený." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -887,7 +924,7 @@ "Soubor \"%s\" má vložený icc profil \"%s\" , ale ostatní obrázky v projektu " "nemají profil obsažený." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -896,7 +933,7 @@ "Soubor \"%s\" obsahuje profil \"%s\", ostatní obrázky jsou však s profilem " "\"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -904,14 +941,14 @@ "Hugin očekává u všech obrázků stejný barevný profil.\n" "Zkonvertujte obrázky do stejného profilu a zkuste znova." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" "V dodaných obrázcích Hugin rozpoznal štosy a přiřadil patřičná čísla štosů." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -920,11 +957,11 @@ "Hugin rozpoznal v projektu štosy. Čísla štosů budou znovu přidělena na " "základě této detekce. Existující čísla štosů budou znovupřidělena." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Mají být pozice obrázků ve štosu propojeny?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -936,41 +973,41 @@ "pozice snímků musí být doladěny(např při snímání z ruky), nepropojujte " "pozice." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Propojit pozice" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Nepropojovat pozice" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Nepřiřazovat štosy" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Zachovat existující štosy" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Obrázek nenalezen" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Vyberte obrazový editor" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -981,16 +1018,17 @@ "\n" "Stiskněte OK pro jejich odebrání." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Rozpoznána chyba" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Přidat obrázky" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -999,32 +1037,32 @@ "Chyba, šablona očekává %d obrázků,\n" "projekt obsahuje %d obrázků\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Nelze použít šablonu" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Chyba při otevírání projektu" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Výsledek" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "Adresář xrc nebyl v balíčku nalezen." -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Kritická chyba" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1056,7 +1094,7 @@ "EXIF informace přidaných obrázků (%s) nesouhlasí s již přidanými obrázky.\n" " Zkontrolujte. zda jste přidali správné obrázky." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Přidat obrázek: zrušit" @@ -1069,9 +1107,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1088,7 +1126,7 @@ msgstr "Hledám přímky...." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Dokončeno" @@ -1102,11 +1140,11 @@ "Spusťte nejprve \"Najít přímky\". Pokud nebudou žádné nalezeny, zkuste " "změnit parametry." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimalizuji parametry zkreslení objektivu..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1116,143 +1154,143 @@ "Spusťte \"najít přímky\" a \"Optimalizovat\" před ukldáním dat objektivu. " "Pokud nejsou nalezeny žádné přímky, změňte nastavení." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Uložit parametry objektivu do ini souboru" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Uložit parametry objektivu do databáze " -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Ukládám parametry objektivu" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Uložit objektiv" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Uložit projekt" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Soubory projektu (*.pto)|*.pto|Všechny soubory (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Mažu dočasné soubory..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "zobrazit tyto nápovědné zprávy" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "spustit pomocníka" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "spustit slepování s daným projektem" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "počet užitých vláken" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "prefix pro slepování" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "použít uživatelem definované příkazy v zadaném souboru" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 #, fuzzy msgid "use user defined assistant commands in given file" msgstr "použít uživatelem definované příkazy v zadaném souboru" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "pouze vypsat příkazy" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Operační systém: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architektura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Volná paměť: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktivní znaková sada: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Verze: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Cesta ke zdrojům: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Cesta k datům: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Databáze fotoaparátů a objektivů Hugin: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Vícevláknové s použitím C++11 std::thread a OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Profil monitoru: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Knihovny" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano z http://autopano.kolor.com není podporován na OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Přejete si místo toho používat Autopano-Sift?" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1260,85 +1298,90 @@ "Alespoň jedno vstupní pole je prázdné.\n" "Zkontrolujte vaše zadání." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Pokouším se propojit všechny překrývající obrázky." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Pracuje pouze na dvojicích obrázků bez kontrolních bodů." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Vyberte detektor kontrolních bodů" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Spustitelné (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "levá x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "levá y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "pravá x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "pravá y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "zarovnání" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "vzdálenost" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Přidán nový kontrolní bod" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "hledám podobné body..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Chyba během dolaďování" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Bod doladěn, úhel: %.0f st., korelační koeficient: %0.3f, zakřivení: %0.3f " -"%0.3f " +"Bod doladěn, úhel: %.0f st., korelační koeficient: %0.3f, zakřivení: %0.3f %" +"0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "Změňte body nebo stiskněte pravé tlačítko myši přidání páru" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Odhadovaný bod je mimo obrázek" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Nenalezen podobný bod." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1346,7 +1389,7 @@ "Interní transformace skončila špatně.\n" "Ověřte, zda jsou body uvnitř obrázku." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1356,31 +1399,37 @@ "Zkontrolujte podobnost osobně.\n" "Korelační koeficient (%.3f) je nižší, než odchylka vybraná v nastavení." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Přidat novou přímku" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Přímka %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Korelační práh:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normální " -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "svislá čára" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "vodorovná čára" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1390,38 +1439,38 @@ "Pro vytvoření menšího počtu bodů\n" "zadejte větší číslo." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Detekce prahu rohu" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Vytvořit kontrolní body" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Detekce měřítka rohu" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Chyba během vytváření kontrolních bodů:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Vybrat bod v pravém obrázku" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Vybrat bod v levém obrázku" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Vytvoří kontrolní body (Současné nastavení: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1429,35 +1478,35 @@ "Nelze spustit celeste bez alespoň jedné dvojice obrázků propojených " "kontrolními body." -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Spouštím Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Nahrávám soubor modelu" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Odebráno %lu kontrolních bodů" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Výsledky Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Čištění" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Vytvořit bodyVytvořit" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1465,19 +1514,20 @@ "Detektorem zvoleným na záložce fotografie vytvoří kontrolní body pro " "vybranou dvojici obrázků." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Pokusí se odebrat kontrolní body z mraků" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Promazat body" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Odebere nezapadající kontrolní body pomocí statistických metod" @@ -1489,23 +1539,23 @@ msgid "Could not process event!" msgstr "Nelze provést událost!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G bodu#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "levý obr." -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "pravý obr." -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P bodu#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1513,7 +1563,7 @@ "Vložte minimální chybu kontrolního bodu.\n" "Všechny body s větší chybou budou vybrány" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Vyberte kontrolní body" @@ -1589,60 +1639,60 @@ "Přetáhněte pro přesun obrázků( případně pomocí shiftu pro přesun jen po " "jedné ose) , nebo otáčejte pomocí tažení pravým tlačítkem (či tažení s Ctrl)" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Rychlý náhled panoramatu" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Soubor" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "zobrazené obrázky" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Všechny" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "žádná" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Skrýt" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "táhněte myší pro změnu svislého zorného pole" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "táhněte myší pro změnu horizontálního zorného pole" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Náhled" @@ -1650,83 +1700,88 @@ msgid "Overview" msgstr "Přehled" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Obnoví parametry projekcí na výchozí hodnoty." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "parametr:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Nejsou nahrány obrázky." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "Nahráno %lu obrázků." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Obrázky propojuje %lu kontrolních bodů.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "nalezeno %lu nepropojených skupin obrázků: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "Obrázky či kontrolní body se změnily. Je nutné nové zarovnání." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Střední chyba po optimalizaci: %.1f pixelů, maximální: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectilineární" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindrická" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Hodnota yaw musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Hodnota pitch musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Hodnota roll musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "Hodnota X musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Hodnota Y musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Hodnota Z musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Hodnota musí být číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1738,55 +1793,55 @@ "V projektu jsou nenulové Tpy a Tpp.\n" "Mohu Tpy a Tpp vynulovat?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "rozdíl" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autoořez" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Vypočítat optimální ořez" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Vrchní okraj musí být číslo větší než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "Levý okraj musí být číslo větší než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "Pravý okraj musí být číslo větší než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "Spodní okraj musí být číslo větší než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "levý okraj musí být menší než pravý" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "horní okraj musí být větší než spodní" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Neplatné HFOV. Maximální HFOV pro vybranou projekci je %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Neplatné VFOV. Maximální VFOV pro vybranou projekci je %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1794,7 +1849,7 @@ "S širokým úhlem záběru je panorama při rektilineární projekci protažené k " "okrajům.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1802,15 +1857,15 @@ "Zorné pole je široké pouze ve vodorovném směru. Co takhle vyzkoušet válcovou " "projekci." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Pro velmi širokoúhlá panoramata použijte ekvirektangulární projekci." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Také můžete zkusit projekci Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1820,7 +1875,7 @@ "U velmi vysokých válcových panoramat je silně roztažený vršek a spodek.\n" "S ekvirektangulární projekcí dostanete více obsahu na stejnou plochu. " -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1830,7 +1885,7 @@ "válcovou.\n" "Válcová projekce (narozdíl od ekvirektangulární) zachovává svislice." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1840,7 +1895,7 @@ "Stereografická projekce je (narozdíl od rybího oka) konformální.\n" "Proto jsou zachovány úhly v blízkém okolí , což může vypadat dobře." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1852,13 +1907,13 @@ "Projekce rybím okem tyto oblasti zúží, díky tomu můžete mít jak široký " "záběr, tak mnoho detailů ve středu." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "V rektilineární projekci zůstanou přímky přímkami." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1867,27 +1922,27 @@ "Ukryli jste lištu zobrazující doporučení k vybrané projekci.\n" "Pokud ji budete chtít opět zobrazit, můžete tak učinit v nastavení." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "běžné, individuální" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mozaika" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaika, individuální" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosphere" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mosaiková plocha" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1898,12 +1953,12 @@ "\n" "Má být panorama reoptimizováno?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "Pro optimalizaci se používá strategie \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1911,7 +1966,7 @@ "Vybraná oblast neobsahuje žádné aktivní obrázky.\n" "Vyberte oblast, na které jsou alespoň 2 obrázky." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1919,7 +1974,7 @@ "Vybraná oblast obsahuje jen jeden obrázek.\n" "Na jediném obrázku není možno vytvářet kontrolní body." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1933,27 +1988,27 @@ "\n" "Chcete pokračovat?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Vyhledávám kontrolní body" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Zpracovávání" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Přemapovat obrázek do panoramatické projekce..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Hledám podobné body..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Kontroluji výsledky..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1964,7 +2019,7 @@ "\n" "Má být panorama reoptimizováno?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1972,7 +2027,7 @@ "Chyba při inicializaci GLEW\n" "Okno rychlého náhledu nemůže být otevřeno." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2018,7 +2073,7 @@ msgstr "Počet masek" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Výřez" @@ -2051,7 +2106,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Maximální rozdíl Ev musí být větší než 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Štosy" @@ -2228,7 +2283,7 @@ msgid "Shutter speed" msgstr "Čas závěrky" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2375,97 +2430,97 @@ msgid "Camera response parameter" msgstr "Parametry odezva fotoaparátu" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "neaktivní" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "aktivní" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Objektiv %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Štos %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Výstupní štos %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Výstupní expoziční vrstva %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Propojení" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Odpojit" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Vybrat vše pro aktuální objektiv" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Zrušit výběr pro aktuální objektiv" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Vybrat vše pro aktivní štos" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Zrušit výběr pro aktivní štos" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Vybrat vše" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Zrušit výběr" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Upravit proměnné obrázku..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Uloží obrázek" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Uloží obrázek" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "zobrazené obrázky" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Počet aktivních obrázků:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Kontrolní body" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2498,12 +2553,24 @@ msgid "Did you know..." msgstr "Víte, že ..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Verze %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2511,130 +2578,130 @@ "Kritická chyba při instalaci\n" "Soubor data/splash.png nebyl nalezen v:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Nápověda" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Akce" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Výstup" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, fuzzy, c-format msgid "User defined sequence: %s" msgstr "Nepodařilo se otevřít uživatelem definovanou sekvenci \"%s\"." -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "Nepodařilo se otevřít uživatelem definovanou sekvenci \"%s\"." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Editovat" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Nepodařilo se otevřít uživatelem definovanou sekvenci \"%s\"." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "spustit pomocníka" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Spuštěn" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimalizátor" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Expozice" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Chcete před ukončením uložit změny?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Chcete před ukončením uložit změny?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Chcete před ukončením uložit změny?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "Pokud uzavřete bez uložení, ztratíte všechny změny." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "Pokud uzavřete bez uložení, ztratíte všechny změny." -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "Pokud uzavřete bez uložení, ztratíte všechny změny." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Neukládat" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Zavřít bez ukládání" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "nucené zavření" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "projekt %s uložen" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - slepuje panorama" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Panorama editor" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2647,36 +2714,36 @@ "\n" "(Chyba: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Uložit PTmender skriptový soubor" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender soubory (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Otevřít projekt: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekt otevřen" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Nahrávám obrázky:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Chyba při otevírání projektu: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Otevřít projekt" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2687,11 +2754,11 @@ "Proto nemůže být otevřen pomocí nabídky Soubor -> Otevřít.\n" "Chcete tento obrázek namísto toho přidat do aktuálního projektu?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Otevírání projektu: zrušit" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2699,7 +2766,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2707,32 +2774,32 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Nelze otevřít projektový soubor %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Otevřít soubor Papywizard xml" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Papywizard xml (*.xml)|*.xml|Všechyn soubory (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Vyberte šablonu" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Dolaďování všech bodů" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Dolaďování" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2759,23 +2826,23 @@ "Použijte Seznam kontrolních bodů (F3), abyste zobrazili všechny body " "aktuálního projektu\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Doladěný výsledek" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Odebere kontrolní body v maskách" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Zvolte python skript" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python skript (*.py)|*.py|Všechny soubory (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2784,13 +2851,13 @@ "Soubor \"%s\" nebyl nalezen.\n" "Možná byl přejmenován, přesunut či smazán." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Chyba!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2798,12 +2865,12 @@ "Soubor s modelem pro Celeste nenalezen v %s, Hugin musí být patřičně " "nainstalován." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Nelze otevřít soubor modelu pro Celeste %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2813,7 +2880,7 @@ "posun středu vinětace.\n" "Tyto funkce nejsou podporované v jednoduchém rozhraní." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2823,7 +2890,7 @@ "smyku či posunu.\n" "Tyto funkce nejsou podporované v jednoduchém rozhraní." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2833,28 +2900,28 @@ "smyku či posunu.\n" "Tyto funkce nejsou podporované v pokročilém rozhraní." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Spouštím pomocníka" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Pozor. Nalezeno %d nepropojených skupin obrázků:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2866,29 +2933,29 @@ "\n" "Po přidání bodů stiskněte tlačítko \"Zarovnat\"" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "Pomocník neskončil úspěšně. Zkontrolujte výsledný projekt." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Projekt nenalezen" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Nelze spustit PTBatcherGUI" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Spuštěn nesprávný program" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Typ masky" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2896,29 +2963,29 @@ "Vytvořte mnohaúhelníkovou masku klikáním levým tlačítkem myši, poslední bod " "klikněte pravým tlačítkem myši." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Uloží masku" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Masky (*.msk)|*.msk|Všechny soubory (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Nahrávat masku" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Nahrávání masky: zrušit" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Nelze rozpoznat masku ze souboru %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Vložte, prosím, číslo." @@ -3061,7 +3128,7 @@ msgstr "Fotometrické zarovnání" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Nahrávám obrázky" @@ -3106,64 +3173,68 @@ msgid "Photometric optimization finished" msgstr "Fotometrická optimalizace skončila" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Přidat jednotlivé obrázky..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Přidat časové série..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Nebyl nalezen žádný vyhovující obrázek. " -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Upravit proměnné obrázku..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Odebrat vybrané obrázky" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ukotvit tento obrázek pro pozici" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ukotvit tento obrázek pro expozici" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "New lens" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Změnit objektiv..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Vložte nové číslo objektivu" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Číslo objektivu" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Změnit číslo objektivu" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Nahrát objektiv z databáze " -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Nahrát parametry objektivu ze souboru" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3171,12 +3242,12 @@ "Máte vybraný pouze jeden obrázek.\n" "Mají se vybrané parametry aplikovat na všechny obrázky se stejným objektivem?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Dotaz" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3186,100 +3257,100 @@ "Použití parametrů objektivů může vést k nechtěným důsledkkům.\n" "Opravdu je chcete použít?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Uložit parametry objektivu do ini souboru" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Odebrat kontrolní body" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Vybrané obrázky neobsahují žádné kontrolní body." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Opravdu odebrat %lu kontrolních bodů?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Smazat kontrolní body" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Promazat kontrolní body" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Čistím kontrolní body" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Kontroluji po párech" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Kontroluji celý projekt" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Čištění dokončeno" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Odebere kontrolní body v mracích" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Obnovit dle nastavení uživatelem..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Obnovit pozice" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Obnovit parametry posunu" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Obnovit parametry objektivu" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Obnovit fotometrické parametry" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nový štos" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Změnit štos..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Zadejte nové číslo štosu" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "číslo štosu" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Změnit číslo štosu" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Nastavit velikost štosu..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Kvalita:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3349,47 +3420,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff totožné plochy" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "šířka musí být číslo větší než 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "výška musí být číslo větší než 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "Levý okraj musí být menší než pravý." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Horní okraj musí být menší než spodní" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "ZNastavení pro PTMender zatím nejsou dostupná" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Nastavení pro PTBlender zatím nejsou dostupná" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Nastavení pro tento HDRMerge program ještě nebyly napsány" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Nelze vytvořit dočasný projektový soubor" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Nastavte výstupní prefix" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3398,15 +3469,15 @@ "Do složky \"%s\" nemáte oprávnění zapisovat.\n" "Pro výsledný výstup vyberte jinou složku." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Vyberte uživatelem definovaný výstup" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Uživatelem definovaný výstup|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3420,7 +3491,7 @@ "Toto jpeg nepodporuje.\n" "Snižte velikost plátna či zvolte formát TIF či PNG." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3433,7 +3504,7 @@ "výsledného plátna, či jej oříznout.Slepování velkého panoramata zabere " "hodně času a operační paměti." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3445,19 +3516,19 @@ "\n" "Chcete li, můžete zmenšit velikost plátna či ořez oblasti." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Opravdu chcete složit takhle rozsáhlé panorama?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Přesto slepit" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Mohu to spravit" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3467,7 +3538,7 @@ "Zkontrolujte prosím nastavení, tak aby alespoň jeden obrázek ležel ve " "výstupní oblasti." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3503,121 +3574,139 @@ msgid "Miscellaneous" msgstr "Pomocné" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Systémové nastavení" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baskyčtina" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Katalánština" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Čínština(zjednodušená)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Čínština(tradiční)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Čeština" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Dánština" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Dánština" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Angličtina" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francouzština" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Němčina" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Maďarština" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italština" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japonština" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polština" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugalština (brazilská)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Ruština" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovenština" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Španělština" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Švédština" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finština" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valencian (Southern Catalan)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Vybrat Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Spustitelné (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Vybrat Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Vybrat vše" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Zvolte PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Vybrat vše" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Vyberte soubor parametrů ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool parametry (*.arg)|*.arg|Všechny soubory(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3626,14 +3715,14 @@ "Soubor %s neexistuje.\n" "Mám vytvořit parametrový soubor s výchozími parametry?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "ExifTool parametrický soubor" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3641,18 +3730,18 @@ "Nebyl vybrán soubor.\n" "Mám vytvořit parametrový soubor s výchozími parametry?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Vyberte nový soubor parametrů ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Nelze uložit soubor \"%s\"." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, fuzzy, c-format msgid "" "File %s does not exist.\n" @@ -3661,7 +3750,7 @@ "Soubor %s neexistuje.\n" "Mám vytvořit prázdny parametrový soubor?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 #, fuzzy msgid "" "No file selected.\n" @@ -3670,23 +3759,24 @@ "Nebyl vybrán soubor.\n" "Mám vytvořit prázdný parametrový soubor s výchozími parametry?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Opravdu nastavit zobrazené nastavení na výchozí hodnoty?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Nahrát výchozí" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Vyberte, prosím, nejprve jednu z možností" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Vyberte záznam" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3694,29 +3784,29 @@ "Nemůžete smazat poslední nastavení.\n" "Alespoň jedno je nutné." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "Opravdu chcete smazat nastavení detektoru kontrolních bodů \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Smaže nastavení detektoru kontrolních bodů" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Nahraje nastavení detektoru kontrolních bodů" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Nastavení detektoru kontrolních bodů (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Uloží nastavení detektoru kontrolních bodů" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3744,49 +3834,54 @@ msgid "Remove %lu control points" msgstr "Odebráno %lu kontrolních bodů" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Náhled panoramatu" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Nastavení náhledu" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projekce (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Mód prolnutí:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Výstup:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Komprese:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parametry projekce" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Levým kliknutím definujete nový střed, pravým přesunete bod na horizont." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Vystřeďte panorama levým tlačítkem myši, nastavte horizont pravým tlačítkem." @@ -3805,7 +3900,7 @@ msgid "Click a connection to edit control points." msgstr "Klikněte na propojení pro úpravu kontrolních bodů." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3813,29 +3908,115 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "\"%s\" nenalezen. Prosím vyberte v nastavení platnou cestu" + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "\"%s\" nenalezen. Prosím vyberte v nastavení platnou cestu" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Nyní hledám: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Zavřít" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +#, fuzzy +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Následující parametrový soubor bude užit pro kopírování tagů z prvního " +"obrázku do všech průběžných obrázků.\n" +"Vzory nebudou nahraženy." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Adresář \"%s\" neexistuje." -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Nepodařilo se nastavit proměnou prostředí PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Otevřít Dávkový zpracovatel" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Otevře PTBatcher, dávkový zpracovatel Hugin projektů" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Otevřín Nástroj kalibrace objektivu" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "Otevře Calibrate_lens_gui, jednoduchý nástroj pro kalibraci objektivů" @@ -3849,11 +4030,11 @@ "V cestě nelze najít \"%s\".\n" "Možná není nainstalováno správně nebo je zadána špatná cesta." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "mažu dočasné soubory s kontrolními body" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3862,15 +4043,15 @@ "Používejte prosím %namefile, %i nebo %s k určení vstupních souborů pro " "detektor kontrolních bodů." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Chyba během vytváření kontrolních bodů" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3882,14 +4063,14 @@ "Vyberte, prosím, méně obrázků nebo vložte obrázky do složky\n" "s kratším jménem" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Vybráno příliš mnoha obrázků" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3900,38 +4081,38 @@ "\n" "Nemohu spustit příkaz: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "chyba v wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Hledám kontrolní body" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Nelze spustit příkaz: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3940,9 +4121,9 @@ "Příkaz: %s\n" "skončil s chybovým kódem: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3957,13 +4138,13 @@ "\n" "Spouštěný příkaz: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Chyba detektoru kontrolních bodů" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3971,7 +4152,7 @@ "Používejte prosím %i pro nastavení vstupních souborů a %k pro určení souboru " "s klíčovými body pro krok generování bodů" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3979,11 +4160,11 @@ "Užijte %k jako soubor s klíčovými body a %o pro výstupní projekt pro krok " "spárování" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "generuji soubor s klíči" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3996,11 +4177,11 @@ "\n" "Nemohu spustit příkaz: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Výchozí" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4008,252 +4189,252 @@ "Nelze vyčistit běžící dávku.\n" "Chcete jí zrušit?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Vyčištěná dávka." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "Chyba: Nelze získat stav, projekt č. %d není na seznamu." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Chyba: Nelze nahrát soubor s dávkou." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Dávka úspěšně skončila." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Dávka skončil s chybami." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Započínám s vypnutím..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Vypínám..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Příprava k hibernaci..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Započínám s hibernací..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Příprava k uspání..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Započínám s uspáním..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Vybrat soubor projektu" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Není nastaven výstupní prefix" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Nevybrány žádné soubory projektu" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Slepuji" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Pomocník" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Chyba při odebírání, projekt s č. %d chybí na seznamu." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Chyba:Nelze smazat projektový soubor:" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Spouštím dávku..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI slepuje" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Dávka již probíhá." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Spouštím příkaz \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Nyní slepuji: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Nyní hledám: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "Chyba: Nelze nastavit stav, projekt č. %d chybí na seznamu." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Zatím nic nedělám..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Stiskli jste příkazovou klávesu." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Stiskli jste kontrolní klávesu." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Má být přeskočeno načítání dávky?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Nedělat nic" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Zavřít PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Vypnout počítač" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Uspat počítač" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Hibernovat počítač" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Zadejte prosím aplikaci ke spuštění:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Zadejte aplikaci" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Určete adresář ve kterém budu hledat projekty" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Určete zdrojový projektový soubor(y)" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Přidány projekty z adresáře %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Přidá projekt %s do seznamu ve frontě slepování." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Poslat projekt %s do fronty asistenta." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Dávka zastavena" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugin - dávkový zpracovatel" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Nastavte výstupní prefix pro projekt" # Pochopit a přeložit znovu. -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Prefix cíle asistenta nemůže být změněn." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Prosím vyberte projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Prosím vyberte projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Zadejte dávku pro otevření" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Dávky (*.ptb)|*.ptb;|Všechny soubory (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Nelze otevřít app pomocí programu Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Není vybrán projekt. Mám spustit Hugin bez projektu?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Dávka pozastavena" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Pozastavuji zpracování Hugin dávkové fronty" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Běžící dávka..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Dávková fronta Hugin s ezpracovává" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4261,7 +4442,7 @@ "V seznamu jsou projekty, jejichž běh selhal.\n" "Mám je odebrat?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4269,16 +4450,16 @@ "Nelze odebrat běžící projekty.\n" "Chcete je zrušit?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Odebrat projekt %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Prosím vyberte projekt k odebrání" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4286,16 +4467,16 @@ "Nelze obnovit nastavení běžících projektů.\n" "Chcete je zrušit?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Obnovit projekt %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Vyberte projekt k znovunastavení" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4303,15 +4484,15 @@ "Nelze obnovit nastavení probíhajícího projektu.\n" " Chcete zrušit běh dávky?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Vyberte dávku pro uložení" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Dávka (*.ptb)|*.ptb;|Všechny soubory (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4321,15 +4502,15 @@ "Díky tomu může dojít ke zpomalení.\n" "Mám dávkovou frontu promazat?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Vyčistit frontu" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Pokračovat v dávkovém zpracování" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Spouštím dávku" @@ -4365,7 +4546,7 @@ msgid "E&xit" msgstr "U&končit\tAlt-X" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4375,11 +4556,11 @@ "Pokud tento dialog uzavřete, přijdete o ně.\n" "Opravdu chcete pokračovat?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Přijato" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4389,11 +4570,11 @@ "Pokud tento dialog uzavřete, přijdete o ně.\n" "Opravdu chcete pokračovat?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Stop" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4402,7 +4583,7 @@ "Adresář %s neexistuje.\n" "Vyberte existující adresář." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4410,7 +4591,7 @@ "Nevybrali jste žádné panorama.\n" "Vyberte alespoň jedno panorama zkuste to znovu." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4419,139 +4600,141 @@ "Nepodařilo se zapsat všechny soubory projektu.\n" "Možná nemáte oprávnění pro zápis do těchto adresářů nebo je disk plný." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Odebrat vybraný obrázek z projektu" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Rozdělit zde na dvě panoramata" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Nahrávám soubor %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Start" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Nalezeno %d možných panoramat." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Nebylo nalezeno žádné možné panorama." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d obrázků: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Objevena syntaktická chyba v parametrech, končím." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI spuštěn" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Čekám" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Probíhá" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Proběhlo" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Selhalo" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Soubor chybí" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pozastaveno" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "Čís." -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Výstupní prefix" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Stav" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Změněno" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Výstupní formát" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projekce" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Velikost" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Chyba, nemohu konvertovat id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Pomocník" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Změnit prefix" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Obnovit projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Hugin - otevřít pro úpravy" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Odebrat" @@ -4587,16 +4770,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Soubory výpisu (*.log)|*.log|Všechny soubory (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Nelze najít uživatelem zadaný výstupní soubor \"%s\"." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Určete zdrojový projektový soubor" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4606,7 +4789,7 @@ "Hugin nemůže s takovými soubory pracovat. Přejmenujte soubor a zkuste znova." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Co je Hugin" @@ -4639,19 +4822,19 @@ msgstr "Systém" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4729,8 +4912,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Vybrat..." @@ -4818,7 +5004,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Nastavení" @@ -4850,10 +5036,6 @@ msgid "Send selected panoramas to queue" msgstr "Pošle vybrané panorama do fronty" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Zavřít" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Hledám panoramata" @@ -4952,12 +5134,12 @@ msgstr "&Minimalizovat do lišty" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Konec" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Skončí program" @@ -5062,143 +5244,38 @@ msgid "adddir" msgstr "addir" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "předchozí obrázkový pár" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "další obrázkový pár" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Popis:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "mód:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "druh:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "svislá čára" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Všechny obrázky najednou" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "vodorovná čára" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama se štosy" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zvětšení:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Víceřadé panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "přizpůsobit oknu" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Víceřadé panorama se štosy" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Doladit" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Předzarovnané panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Zkusí optimalizovat právě aktivní bod" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "au&todoladit" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "autopřidat" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "okamžitě přidat druhý kontrolní bod při výběru druhého bodu" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "automaticky odhadnout" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"Zkusí odhadnout posun mezi obrázky a použít jej při umísťování kontrolních " -"bodů." - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 -msgid "&Delete" -msgstr "Sma&zat" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 -msgid "&Add" -msgstr "Přid&at" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 -msgid "add a new Point" -msgstr "přidat nový bod" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 -msgid "Create control points for current image pair" -msgstr "Vytvořit kontrolní body pro vybraný pár" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 -msgid "Remove control points in clouds" -msgstr "Odebere kontrolní body v mracích" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 -msgid "Remove worst control points" -msgstr "Odebrat nejhorší kontrolní body" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 -msgid "Control Points" -msgstr "Kontrolní body" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:17 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 -msgid "Delete" -msgstr "Smazat" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:24 -msgid "Select by Distance" -msgstr "Vybrat dle vzdálenosti" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Popis:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "druh:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (autor A. Jenny)" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Všechny obrázky najednou" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama se štosy" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Víceřadé panorama" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Víceřadé panorama se štosy" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Předzarovnané panorama" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detektor" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detektor" #: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 msgid "One step detector" @@ -5275,10 +5352,127 @@ msgid "Parameters for Control Point Detectors" msgstr "Nastavení pro detektor kontrolních bodů" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "předchozí obrázkový pár" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "další obrázkový pár" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "mód:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "svislá čára" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "vodorovná čára" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zvětšení:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "přizpůsobit oknu" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Doladit" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Zkusí optimalizovat právě aktivní bod" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "au&todoladit" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "autopřidat" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "okamžitě přidat druhý kontrolní bod při výběru druhého bodu" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "automaticky odhadnout" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"Zkusí odhadnout posun mezi obrázky a použít jej při umísťování kontrolních " +"bodů." + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 +msgid "&Delete" +msgstr "Sma&zat" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 +msgid "&Add" +msgstr "Přid&at" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 +msgid "add a new Point" +msgstr "přidat nový bod" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 +msgid "Create control points for current image pair" +msgstr "Vytvořit kontrolní body pro vybraný pár" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 +msgid "Remove control points in clouds" +msgstr "Odebere kontrolní body v mracích" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 +msgid "Remove worst control points" +msgstr "Odebrat nejhorší kontrolní body" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 +msgid "Control Points" +msgstr "Kontrolní body" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:17 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 +msgid "Delete" +msgstr "Smazat" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:24 +msgid "Select by Distance" +msgstr "Vybrat dle vzdálenosti" + +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" msgstr "Neplatná jména souborů" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" + +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Ano" + +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Ne" + #: hugin1/hugin/xrc/edit_script_dialog.xrc:4 msgid "Edit Panorama Tools Script" msgstr "Editovat skript Panorama Tools" @@ -5288,29 +5482,157 @@ "This is the script which will be sent to the Panorama Tools engine. Editing " "these lines is an advanced technique." msgstr "" -"Toto je skript, který bude odeslán do Panorama Tools. Editování těchto řádek " -"je pro zkušené uživatele." +"Toto je skript, který bude odeslán do Panorama Tools. Editování těchto řádek " +"je pro zkušené uživatele." + +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Pokračovat s těmito změnami" + +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Zahodit změny a zrušit" + +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Seskupit:" + +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimální překryv:" + +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Minimální překryv pro detekci výstupního štosu" + +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maximální Ev rozdíl" + +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maximální rozdíl Ev pro detekci výstupních vrstev" + +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Displej" + +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Obecné" + +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF data" + +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Umístění" + +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parametry objektivu" + +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Fotometrické parametry" + +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Typ objektivu" + +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Přidat obrázky..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Typ objektivu:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Násobitel ohniskové vzdálenosti:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Vyhledávání charakteristik" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Nastavení:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "Spustí vybraný detektor na zvolených obrázcích" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimalizovat" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometrie:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Vypočítat" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometrie:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Vybraný obrázek" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Nahrát parametry objektivu..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "" +"Zadejte horizontální zorné pole (HFOV) nebo ohniskovou vzdálenost a ořezový " +"faktor:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Pokračovat s těmito změnami" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Zahodit změny a zrušit" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "stupňů" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Data fotoaparátu a objektivu" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Yaw:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Pitch:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Roll:" @@ -5318,34 +5640,11 @@ msgid "Translation parameter" msgstr "Parametry posunu" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Umístění" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "stupně pohledu (v):" @@ -5445,7 +5744,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Nápověda" @@ -5490,8 +5789,8 @@ msgstr "Nahrávat masku" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Uložit" @@ -5504,121 +5803,47 @@ msgid "Manipulate image variables" msgstr "Upravit proměnné obrázku..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Seskupit:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimální překryv:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimální překryv pro detekci výstupního štosu" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maximální Ev rozdíl" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maximální rozdíl Ev pro detekci výstupních vrstev" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Displej" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Obecné" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF data" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parametry objektivu" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Fotometrické parametry" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Typ objektivu" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Přidat obrázky..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Typ objektivu:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Násobitel ohniskové vzdálenosti:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Vyhledávání charakteristik" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Nastavení:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "Spustí vybraný detektor na zvolených obrázcích" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimalizovat" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometrie:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "&Nastavení" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Vypočítat" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometrie:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Další argumenty:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Vybraný obrázek" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Nahrát parametry objektivu..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Zpracovávání:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Zadejte horizontální zorné pole (HFOV) nebo ohniskovou vzdálenost a ořezový " -"faktor:" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "stupňů" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Data fotoaparátu a objektivu" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Import" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5763,14 +5988,6 @@ msgid "Don't ask again" msgstr "Neptat se znova" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Ano" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Ne" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5831,21 +6048,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importovat pozice z Papywizard XML" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "V&rať" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Odvolat poslední akci" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Znovu" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Opakovat odvolanou akci" @@ -5890,12 +6107,12 @@ msgid "Use only normal control points in optimization." msgstr "Počet bodů na tento obrázek" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "Op&timalizovat" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Znovu spustit optimalizátor s aktuálním nastavením" @@ -5924,16 +6141,16 @@ msgid "Run a python script" msgstr "Spustit skript v Pythonu" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "Z&obrazit" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Celá obrazovka" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Zobrazí hlavní okno Hugin přes celou obrazovku" @@ -6015,22 +6232,22 @@ msgid "Show the Stitcher panel" msgstr "Zobrazí panel Slepovač" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Jednoduché" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Pokročilé" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Expertní" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Rozhraní" @@ -6052,86 +6269,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "Slepit s nastavením z uživatelsky definované sekvence" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Nějaké informace o rozdílných tlačítkách atd." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Tip dne" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Zobraz jeden z tipů dne." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Klávesové zkratky" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "klávesové zkratky" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "FA&Q" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Často kladené otázky (FAQ)" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&O programu" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Nastavení" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nový" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nový projekt" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Otevřít" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Otevřít projekt" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Uložit" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Uložit aktuální projekt" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Uložit j&ako" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Uložit aktuální projekt do nového souboru" @@ -6147,19 +6364,19 @@ "Uložit tento projekt do PTStitcher-kompatibilního skriptovacího souboru, " "užitečné při dávkovém zpracování" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Poslední otevřené projekty" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Seznam nedávno otevíraných projektů" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Spustit &Dávkový zpracovatel" @@ -6244,7 +6461,7 @@ msgid "Show the OpenGL preview image" msgstr "Zobrazit OpenGL náhledový obrázek" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Náhled panoramatu" @@ -6301,15 +6518,10 @@ msgstr "Vytěsnit oblast ze všech obrázků z tohoto objektivu" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Export" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Import" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopírovat" @@ -6353,8 +6565,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" "Použije všechny změny na všechny obrázky ze stejným objektivem, jako je " "vybraný obrázek." @@ -6462,7 +6674,8 @@ msgid "execute the PTOptimizer engine" msgstr "spustí PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientace obrázku" @@ -6508,39 +6721,39 @@ msgid "Interpolator (i):" msgstr "Interpolátor (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bikubicky)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineárně" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Nejbližší soused" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "odhad hodnot mezi zdrojovými body" @@ -6568,7 +6781,7 @@ msgid "Enfuse options" msgstr "Enfuse možnosti" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Zorné pole:" @@ -6729,10 +6942,6 @@ msgid "Image fusion:" msgstr "Fůzovač obrázků:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR slučovač:" @@ -6836,15 +7045,15 @@ msgid "Output parameters" msgstr "Parametry výstupu" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Mód prolnutí :" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "hrubý překryv (rychlé)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "pozvolný překryv" @@ -6914,27 +7123,43 @@ msgid "This affects the control points editor and mask editor." msgstr "Odebere kontrolní body v maskách." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Program Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(prázdné pro systémový)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Program Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Program Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Možnosti souborů" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Dočasný adresář:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(prázdné pro systémový)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Výchozí název projektu:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Výchozí výstupní prefix:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6965,43 +7190,43 @@ "%lens - objektiv (prvního obrázku)\n" "%projectname - název projektu (pouze pro výstupní prefix)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Výchozí jména souborů" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Soubory" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Nahrávání obrázku" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Automaticky zarovnat obrázky po nahrání" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Vyhledat svislé čáry" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Vyhledá svislé čáry v obrázcích pro vyrovnání panoramata." -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Odebrat mrakům podobné body (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Volitelné kroky asistenta" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Automaticky zarovnat" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7009,67 +7234,67 @@ "Počet kontrolních bodů\n" "na překryv" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Převzorkovat výsledné panorama na menší rozlišení" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "procent maximální šířky " -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor kontrolních bodů" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR a 16 bitový režim zobrazení" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Křivka" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineární" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmické" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "použito pro zobrazení v GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Šířka stopy:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "bodů" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Šířka vyhledávacího pole:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "procent šířky obrázku" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Šířka lokálního vyhledávacího pole:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Korelační práh:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7077,11 +7302,11 @@ "0: žádná podobnost\n" "1: maximální podobnost" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Práh vrcholu zakřivení:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7089,116 +7314,112 @@ "0: žádný vrchol\n" " 0.2: odlišující vrchol" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Rotační hledání" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Povolit rotační hledání (pomalejší, ale přesnější)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Počáteční úhel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Konečný úhel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Kroky:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Detektor kontrolních bodů" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programy pro detekci kontrolních bodů" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nový..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Upravit..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Nahoru" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Dolů" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Výchozí" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Pomocník používá výchozí hodnotu." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Výstupní formát" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Výchozí formát souboru:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "výchozí výstupní formát pro cílové panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF komprese:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "výchozí TIFF komprese" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG kvalita:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "výchozí JPEG komprese" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Prolínač:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Výchozí slučovač:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Výchhozí slučovač pro nové projekty." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Zpracovatel" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Nástroj, který provede slepování" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Spustit slepování okamžitě" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7207,19 +7428,19 @@ "Je li vybráno, zpracovatel okamžitě obnoví zpracování fronty úloh. Jinak " "zpracovatel čeká " -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Přepsat existující soubory" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "VAROVÁNÍ: existující soubory budou bez ptaní přepsány." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Podrobný výstup" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7227,19 +7448,19 @@ "Umožní získat podrobnosti i v případě, že slepování spadne, nebo za jeho " "běhu." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Slepuji" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Kopírovat metadata do výsledných souborů nástrojem ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "ExifTool možnosti" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7248,7 +7469,7 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 #, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " @@ -7258,19 +7479,19 @@ "obrázku do všech průběžných obrázků.\n" "Vzory nebudou nahraženy." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Průběžný soubor s parametry ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "nechte prázdné pro výchozí" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Upravit vybraný soubor s parametry ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 #, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " @@ -7282,27 +7503,27 @@ "Je použit navíc k průběžnému parametrovému souboru.\n" "Vzory budou nahraženy před spuštěním exiftool." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "ExifTool parametry(soubor):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Vytvoří Photo Sphere XMP data" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Může být provedeno pouze s equirectangulárními výstupními obrázky." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Pokročilé nastavení" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Počet vláken:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7313,81 +7534,83 @@ "zpracování.\n" "Nastavte toto číslo na počet procesorů (nebo jader) přístupných v systému." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 pro automatické vyhledání" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Slepuji (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Výchozí interpolátor (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Uložit oříznuté obrázky jako výchozí" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Použít GPU pro přemapování (EXPERIMENTÁLNÍ VLASTNOST)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" +msgstr "Použít GPU pro přemapování:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Pokusí se zrychlit přemapování přesunutím výpočtů na grafickou kartu." -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Použít alternativní program Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Program Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Výchozí parametry:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Toto jsou výchozí nastavení nového projektu.\n" "Pro jednotlivý projekt mohou být změněny v záložce Slepovač.\n" "Nenastavujte -w, -o či --compression , hugin je nastaví sám." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Použít alternativní program Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Program enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programy" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Volby Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM práh:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7395,19 +7618,19 @@ "vyšší než 0.5: méně citlivé\n" "méně než 0.5: citlivější" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Velikost filtru Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "malý" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "velký" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7415,7 +7638,7 @@ "větší je přesnější\n" "menší může prozkoumat kontrolní body blízko okrajů" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7425,71 +7648,71 @@ "překrývajících se oblastech. \n" "Pro urychlení výpočtu jsou použity jen některé náhodně vybrané body." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Počet bodů na obrázek:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Fotometrická optimalizace" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Varování" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Zobrazí zprávu o ukládání projekty a výstupním prefixu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "Zobrazí varování o velkém rozpjetí expozic při přidávání obrázků" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Po \"editaci kontrolních bodů\"" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Zeptat se" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Znovu optimalizuji panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Neoptimalizovat panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Editor kontrolních bodů (v okně s rychlým náhledem)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Ostatní" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Nastavení - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Upravit soubor s parametry ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7524,11 +7747,11 @@ "\n" "U vzorů záleží na velikosti písmen." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Vodorovně vystředit střed" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Vystředit" @@ -7536,13 +7759,15 @@ msgid "Show the whole panorama" msgstr "Ukázat celé panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Odhadnout zorné pole" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Přizpůsobit" @@ -7550,7 +7775,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automaticky zarovná zakřivený horizont" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Narovnat" @@ -7645,31 +7871,31 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "Nastaví expozici výsledného panorama na průměr expozic všech obrázků." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Výběr šedé" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Opravte globální vyvážení bíle vybráním neutrálně šedé oblasti." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Upravovat kontrolní body" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Vytvoří či smaže kontrolní body ve vybrané oblasti." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Pozadí:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Měřítko:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7681,159 +7907,147 @@ "* Po kliknutí na čáru se otevře patřičný pár obrázků v záložce Kontrolní " "body. " -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Rozvržení" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "x" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Vodítka:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Pravidlo třetin" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Zlatý řez" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonála" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Metoda diagonály" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Zlatý trojuhelník (dolů)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Zlatý trojuhelník (nahoru) " -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automaticky zarovná zakřivený horizont." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Režim přetahování:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Použít" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Přesune panorama nebo přetáhne obrázky na místo" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Přesunout/přetáhnout" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Nastavit ořez na největší obdélník pokrytý obrázky" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR Autoořez" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "Nastavit ořez na největší obdélník pokrytý štosy" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "levá:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "horní:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "pravá:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "spodní:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Obnoví ořez na maximální velikost" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Změní ořez panoramatu" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Panorama &editor" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "Pře&hled" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Zobrazí náhled panoramatické koule." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Mřížka" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Zobrazí mřížku." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Všechny obrázky" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Obrázek s mediánovou expozicí každého štosu" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Nejsvětlejší obrázek každého štosu" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Nejtmavší obrázek každého štosu" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Ponechat nyní vybrané obrázky" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Obnovit výběr" @@ -8131,6 +8345,85 @@ "Optimalizace všech parametrů zkreslení \"všechno\" má smysl jen tehdy, pokud " "jste dobře rozmístili velké množství kontrolních bodů." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Nastavení" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Obrázky..." + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Přidat obrázky..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Přidat další obrázek do aktuálního projektu" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Odebrat tento obrázek" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Odebrat vybrané obrázky" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Detekce měřítka rohu" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "Přidat projekt..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Přesune panorama nebo přetáhne obrázky na místo" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Změní ořez panoramatu" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Použít GPU pro přemapování (EXPERIMENTÁLNÍ VLASTNOST)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "všechny obrázky|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPG obrázky (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF obrázky (*." +#~ "tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG obrázky (*.png)|*.png;*.PNG|HDR " +#~ "obrázky (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Všechny soubory " +#~ "(*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (autor A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "x" + #~ msgid "Interface" #~ msgstr "Rozhraní" @@ -8692,8 +8985,8 @@ #~ "malfunction, please select \"Preferences\" from the menu and in each tab " #~ "hit the 'Load Defaults' button" #~ msgstr "" -#~ "Spouští se Hugin ve verzi %s. Vaše nastavení pochází ze starší verze " -#~ "%s. Je možné, že Hugin nebude s tímto nastavením pracovat správně.Pro " +#~ "Spouští se Hugin ve verzi %s. Vaše nastavení pochází ze starší verze %" +#~ "s. Je možné, že Hugin nebude s tímto nastavením pracovat správně.Pro " #~ "případnou zkuste v nabídce Soubor -> Nastavení v každé záložce tlačítkem " #~ "Nahrát výchozí použít výchozí hodnoty nastavení." @@ -8703,8 +8996,8 @@ #~ "malfunction, please select \"Preferences\" from the menu and in each tab " #~ "hit the 'Load Defaults' button" #~ msgstr "" -#~ "Spouští se Hugin ve verzi %s. Vaše nastavení pochází z novější verze " -#~ "%s. Je možné, že Hugin nebude s tímto nastavením pracovat správně.Pro " +#~ "Spouští se Hugin ve verzi %s. Vaše nastavení pochází z novější verze %" +#~ "s. Je možné, že Hugin nebude s tímto nastavením pracovat správně.Pro " #~ "případnou zkuste v nabídce Soubor -> Nastavení v každé záložce tlačítkem " #~ "Nahrát výchozí použít výchozí hodnoty nastavení." @@ -9273,9 +9566,6 @@ #~ msgid "Flatfield" #~ msgstr "Flatfield" -#~ msgid "Image file:" -#~ msgstr "Soubor obrázku:" - #~ msgid "Polynomial" #~ msgstr "Polynom" @@ -9458,10 +9748,6 @@ #~ msgid "* r^4" #~ msgstr "* r^4" -#, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "Přidat projekt..." - #~ msgid "PTStitcher:" #~ msgstr "PTStitcher:" @@ -9533,9 +9819,6 @@ #~ "Autopano-SIFT not found. Please specify a valid path in the preferences" #~ msgstr "Autopano-SIFT nenalezen. Prosím vyberte v nastavení správnou cestu" -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "\"%s\" nenalezen. Prosím vyberte v nastavení platnou cestu" - #~ msgid "Error in Autopano command" #~ msgstr "Chyba v Autopano příkazu" @@ -9623,9 +9906,6 @@ #~ msgid "PTStitcher note" #~ msgstr "poznámka PTStitcher" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Zvolte PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "Nevybrán PTStitcher.exe" @@ -9828,9 +10108,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "Chyba během načítání obrázku: %s" -#~ msgid "Remove this image" -#~ msgstr "Odebrat tento obrázek" - #~ msgid "Stitching Options" #~ msgstr "Nastavení slepování" @@ -9948,9 +10225,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend:" -#~ msgid "Additional Arguments:" -#~ msgstr "Další argumenty:" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "Nenastavujte argumenty -w a -o, ty Hugin přidá sám" diff -Nru hugin-2018.0.0+dfsg/src/translations/da.po hugin-2019.0.0+dfsg/src/translations/da.po --- hugin-2018.0.0+dfsg/src/translations/da.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/da.po 2019-02-17 15:24:33.000000000 +0000 @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: da\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2017-06-30 23:19+0100\n" "Last-Translator: Thomas Pryds \n" "Language-Team: Danish \n" -"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" @@ -43,16 +43,16 @@ msgid "Searching for best crop..." msgstr "Søger efter bedste beskæring…" -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Det eksterne program %s blev ikke fundet i programpakken; bruger i stedet " "systemsti" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -79,9 +79,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|PNG-fil (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Filen %s findes. Overskriv?" @@ -118,7 +118,7 @@ msgstr "Beskæringsfaktoren skal være positiv." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -131,24 +131,28 @@ "Vil du stadig bruge den høje værdi?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -169,8 +173,8 @@ msgstr "Full-frame fiskeøje" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Ækvirektangulært" @@ -201,11 +205,13 @@ msgid "builtin" msgstr "indbygget" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "brugerdefineret (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineær" @@ -229,16 +235,16 @@ msgid "Error loading lens parameters" msgstr "Fejl under indlæsning af objektivparametre" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Gem fil med objektivparametre" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Objektivprojektfil (*.ini)|*.ini|Alle filer (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Gem projekt" @@ -274,22 +280,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Fejl under pausning af proces %ld, kode 1" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Annullér" @@ -323,12 +330,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Kunne ikke åbne projektfil:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "kunne ikke åbne script: %s" @@ -338,8 +345,8 @@ msgid "Project %s does not contain any active images." msgstr "Projektet %s indeholder ingen aktive billeder." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "fejl under tolkning af panotools script: %s" @@ -353,17 +360,17 @@ msgid "Could not create temporary file" msgstr "Kunne ikke oprette midlertidig fil" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "Køen er tom. Dette burde aldrig ske." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Fejl under sammenføjning" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -371,11 +378,11 @@ "Overskriv eksisterende billedfiler?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Overskriv eksisterende billedfiler?" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -384,12 +391,12 @@ "Fejl under sammenføjning af projektet\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Fejl under kørsel af assistent" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -398,274 +405,284 @@ "Fejl under kørsel af assistenten\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Sammenføjer panorama…" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Platform:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Version:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Arbejdsmappe:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Outputpræfiks:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Blander:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Ukendt blander (enblend --version mislykkedes)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "intern" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Eksponeringsfusion:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Ukendt eksponeringsfusion (enfuse --version mislykkedes)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "ExifTool-version:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "MISLYKKEDES" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Antal aktive billeder:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Værdi for output-eksponering: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Lærredstørrelse: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "Interesseregion: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projektion:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Bruger GPU til remapping:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "sand" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "falsk" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panorama-output:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Eksponeringskorrektion, low dynamic range" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Eksponeringsfusioneret ud fra stakke" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Eksponeringsfusioneret ud fra hvilket som helst arrangement" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "High Dynamic Range" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Remappede billeder:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Ingen eksponeringskorrektion, low dynamic range" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Kombinerede stakke:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Eksponeringsfusionerede stakke" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Lag:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" "Lag med tilnærmelsesvis ens eksponering er kombineret med bløde overgange, " "uden eksponeringskorrektion" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Første inputbillede" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Antal:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Filnavn:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Størrelse: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Responstype:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Eksponeringsværdi: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Remapper og blander LDR-billeder…" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Remapper LDR-billeder…" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Blander billeder…" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Remapper LDR-billeder og blander eksponeringslag…" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Remapper LDR-billeder uden eksponeringskorrektion…" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Blander eksponeringslag %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fusionerer alle eksponeringslag…" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Fusionerer stak nummer %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Blander alle stakke…" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Remapper HDR-billeder…" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Kombinerer hdr-stak nummer %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Blander hdr-stakke…" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Opdaterer metadata…" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Sammenføjer ved hjælp af “%s”" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "første billede" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "sidste billede" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "mappe" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Kameraproducent" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Kameramodel" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -673,35 +690,69 @@ msgid "Lens" msgstr "Objektiv" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "ukendt projektion" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Alle billeder" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Indlæser filen %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Fejl" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -711,25 +762,11 @@ "Filnavnet (navnene) indeholder et af de følgende ugyldige tegn: %s\n" "Hugin kan ikke arbejde med disse filnavne. Omdøb filen(erne) og prøv igen." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Fejlretningsrapport genereret i “%s”." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-filer (*." -"hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -741,27 +778,27 @@ msgstr "Input “%s” er ikke et gyldigt tal." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Advarsel" @@ -778,7 +815,7 @@ msgid "Could not save information into database." msgstr "Kunne ikke gemme information i databasen." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -789,11 +826,11 @@ "%s\n" "Afbrudt" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Billedfilformat ikke understøttet" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -805,7 +842,7 @@ "Hugin understøtter ikke denne billedtype. Springer dette billede over.\n" "Omdan billedet til et gråskalabillede og prøv at indlæse det igen." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -822,14 +859,14 @@ "Konvertér dette billede til et gråskala- eller RGB-billede og prøv at " "indlæse igen." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin understøtter kun gråskala- eller RGB-billeder (med eller uden " "alfakanal)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -838,7 +875,7 @@ "Filen “%s” er et gråskalabillede, men andre billeder i projektet er " "farvebilleder." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -847,7 +884,7 @@ "Filen “%s” er et farvebillede, men andre billeder i projektet er " "gråskalabilleder." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -857,7 +894,7 @@ "Omdan billedet til henholdsvis et gråskalabillede eller et RGB-billede og " "prøv at indlæse det igen." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -866,7 +903,7 @@ "Filen “%s” har ingen indlejret icc-profil, men andre billeder i projektet " "har profilen “%s” indlejret." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -875,7 +912,7 @@ "Filen “%s” har icc-profilen “%s” indlejret, men andre billeder i projektet " "har ingen indlejrede farveprofiler." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -884,7 +921,7 @@ "Filen “%s” har icc-profilen “%s” indlejret, men andre billeder i projektet " "har farveprofilen “%s” indlejret." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -892,7 +929,7 @@ "Hugin forventer alle billeder i samme farveprofil.\n" "Konvertér venligst alle billeder til samme farveprofil og prøv igen." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -900,7 +937,7 @@ "Hugin har detekteret billedstakke i de tilføjede billeder og vil tildele " "tilsvarende staknumre til billederne." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -910,11 +947,11 @@ "gentildelt baseret på denne detektion. Eksisterende staktildelinger vil " "overskrives." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Skal billedernes positioner i hver stak sammenkædes?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -927,41 +964,41 @@ "af positionen (fx under håndholdt fotografering), skal du ikke sammenkæde " "positionerne." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Sammenkæd position" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Sammenkæd ikke position" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Tildel ikke stakke" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Behold eksisterende stakke" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Billedfil ikke fundet" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Vælg billedbehandler" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -972,16 +1009,17 @@ "\n" "Klik OK for at fjerne." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Fejl opfanget" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Tilføj billeder" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -990,32 +1028,32 @@ "Fejl, skabelon forventer %d billeder,\n" "aktivt projekt indeholder %d billeder.\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Kunne ikke anvende skabelon" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Fejl under indlæsning af projektfil" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultat" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc-mappe blev ikke fundet i programpakke" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Fatal fejl" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1050,7 +1088,7 @@ "de allerede tilføjede billeder.\n" "Check billedet igen, hvis du har valgt de korrekte filer." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Tilføj billede: annullér" @@ -1063,9 +1101,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1082,7 +1120,7 @@ msgstr "Finder linjer…" #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Færdig" @@ -1096,11 +1134,11 @@ "Kør venligst “Find linjer” først. Hvis der ikke blev fundet nogen linjer, " "ændr da parametrene." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimerer parametre for objektivforvrængning…" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1110,143 +1148,143 @@ "Kør venligst “Find linjer” og “Optimér” før du gemmer objektivdata. Hvis der " "ikke blev fundet nogen linjer, ændr da parametrene." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Gem objektivparametre til ini-fil" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Gem objektivparametre til objektivdatabase" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Gemmer objektivdata" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Gem objektiv" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Gem projektfil" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Projektfiler (*.pto)|*.pto|Alle filer (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Fjerner midlertidige filer…" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "viser denne hjælpebesked" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "kør assistent" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "udfør sammenføjning med givent projekt" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "antal tråde i brug" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "præfiks der bruges til sammenføjning" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "brug brugerdefinerede kommandoer i nævnte fil" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 #, fuzzy msgid "use user defined assistant commands in given file" msgstr "brug brugerdefinerede kommandoer i nævnte fil" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "udskriv kun kommandoer" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Operativsystem: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arkitektur: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Ledig hukommelse: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktiv codepage: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Version: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Sti til ressourcer: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Sti til data: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Hugins kamera- og objektivdatabase: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multitråde med C++11 std::thread og OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Skærmprofil: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Biblioteker" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano fra http://autopano.kolor.com er ikke tilgængelig for OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Bruger Autopano-Sift i stedet" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1254,64 +1292,65 @@ "Mindst et inputfelt er tomt.\n" "Check venligst dine input." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Prøv at forbinde alle overlappende billeder." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Arbejd kun på billedpar uden kontrolpunkter." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Vælg program for kontrolpunkt-detektering" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Kørbare filer (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "nr." -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "venstre x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "venstre y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "højre x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "højre y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Positionering" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Afstand" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "nyt kontrolpunkt tilføjet" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "søger efter lignende punkter…" -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Fejl under finjustering" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1320,19 +1359,23 @@ "Punkt finjusteret, vinkel: %.0f grader, korrelationskoefficient: %0.3f, " "krumning: %0.3f %0.3f" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "ændr punkter, eller klik på højre museknap for at tilføje par" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Beregnet punkt er uden for billedet" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Intet lignende punkt fundet." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1340,7 +1383,7 @@ "En intern transformation mislykkedes.\n" "Check at punktet er inden for billedet." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1351,31 +1394,37 @@ "Korrelationskoefficient (%.3f) er lavere end grænseværdien, der er sat i " "indstillingerne." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Tilføj ny linje" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linje %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Korrelationsgrænseværdi:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "lodret linje" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "vandret linje" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1385,38 +1434,38 @@ "For at oprette færre punkter,\n" "anfør et højere tal." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Grænseværdi for hjørnedetektion" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Opret kontrolpunkter" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Skala for hjørnedetektion" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Fejl under oprettelse af kontrolpunkter:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Vælg punkt på højre billede" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Vælg punkt på venstre billede" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Opret KP (nuværende indstilling: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1424,35 +1473,35 @@ "Kan ikke køre Celeste uden mindst ét kontrolpunkt, der forbinder de to " "billeder" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Kører Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Indlæser modelfil" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Fjernede %lu kontrolpunkter" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste-resultat" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Rydder" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Opret KP" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1460,19 +1509,20 @@ "Opret kontrolpunkter for billedpar ved hjælp af den nuværende " "kontrolpunktdetektor i fanebladet Fotografier." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Prøver at fjerne kontrolpunkter fra skyer" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Ryd KP" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Fjern perifere kontrolpunkter efter statistisk metode" @@ -1484,23 +1534,23 @@ msgid "Could not process event!" msgstr "Kunne ikke udføre handling!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G KP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Venstre bill." -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Højre bill." -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P KP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1508,7 +1558,7 @@ "Indtast minimal kontrolpunkt-fejlmargin.\n" "Alle punkter med en højere fejlværdi vil blive valgt." -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Vælg kontrolpunkter" @@ -1583,60 +1633,60 @@ "Træk billederne for at flytte dem (eller brug Shift for at fastlåse), eller " "rul ved at højre-trække eller Ctrl-trække." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Hurtig panoramaforhåndsvisning" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fil" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Viste billeder" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Alle" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Ingen" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Skjul" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "træk for at ændre lodret synsfelt (VFOV)" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "træk for at ændre vandret synsfelt (HFOV)" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Preview" @@ -1644,83 +1694,88 @@ msgid "Overview" msgstr "Overblik" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Nulstiller projektionens parametre til deres udgangspunkt." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Ingen billeder indlæst." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu billeder indlæst." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Billederne er forbundet ved %lu kontrolpunkter.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%lu uforbundne billedgrupper fundet: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "Billeder eller kontrolpunkter er ændret; ny positionering nødvendig." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Fejl i middelværdi efter optimering: %.1f pixel, maks.: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Retlinjet" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindrisk" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Yaw-værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Pitch-værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Roll-værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X-værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y-værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z-værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Værdi skal være numerisk." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1732,55 +1787,55 @@ "Men dit projekt har Tpy- og Tpp-parametre, der ikke er nul.\n" "Skal Tpy- og Tpp-parametrene sættes til nul?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "forskel" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autobeskæring" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Beregner optimal beskæring" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "top skal være et heltal større end 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "venstre skal være et heltal større end 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "højre skal være et heltal større end 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "bund skal være et heltal større end 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "venstre kant skal være mindre end højre" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "topkant skal være mindre end bundkant" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Ugyldig HFOV-værdi. Maksimal HFOV for denne projektion er %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Ugyldig VFOV-værdi. Maksimal VFOV for denne projektion er %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1788,7 +1843,7 @@ "Med et bredt synsfelt bliver panoramaer med retlinjet projektion meget " "strakt hen imod kanterne.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1796,15 +1851,15 @@ "Da synsfeltet kun er meget bredt i den vandrette retning, prøv i stedet " "cylindrisk projektion." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "For et meget bredt panorama, prøv ekvirektangulær projektion i stedet." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Du kan også prøve Panini-projektion." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1816,7 +1871,7 @@ "En ekvirektangulær projektion vil have det samme indhold på mindre lodret " "plads." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1827,7 +1882,7 @@ "Cylindrisk projektion bevarer lodrette linjer, modsat ekvirektangulær " "projektion." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1838,7 +1893,7 @@ "En konform projektion bevarer vinkler omkring et punkt, hvilket ofte gør det " "pænere at kigge på." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1850,14 +1905,14 @@ "Fiskeøje-panorama-projektion trykker det mere sammen, så du kan få et bredt " "synsfelt men stadig have en fornuftig dækning af midten." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "" "Ved at sætte panorama til retlinjet projektion holdes rette linjer rette." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1866,27 +1921,27 @@ "Du har skjult infobaren, som viser hints om valg og projektion.\n" "Hvis du vil se baren igen, aktivér den da igen i indstillingerne." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individuel" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaik" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaik, individuel" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfære" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mosaikplan" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1897,12 +1952,12 @@ "\n" "Skal panoramaet nu genoptimeres?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "Aktuelt valgt optimeringsstrategi er “%s”." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1910,7 +1965,7 @@ "Det valgte område indeholder intet aktivt billede.\n" "Vælg venligst et område, der dækkes af mindst 2 billeder." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1918,7 +1973,7 @@ "Det valgte område dækkes kun af et enkelt billede.\n" "Kan ikke oprette kontrolpunkter for et enkelt billede." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1932,27 +1987,27 @@ "\n" "Fortsæt alligevel?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Søger efter kontrolpunkter" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Behandler" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Remap billede til panoramaprojektion…" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Matcher interessepunkter…" -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Tjekker resultater…" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1963,7 +2018,7 @@ "\n" "Skal panoramaet nu genoptimeres?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1971,7 +2026,7 @@ "Fejl under initialiseringen af GLEW\n" "Hurtigforhåndsvisning kan ikke åbnes." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2018,7 +2073,7 @@ msgstr "Antal masker" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Beskæring" @@ -2051,7 +2106,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Den maksimale EV-forskel skal være større end 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Stakke" @@ -2230,7 +2285,7 @@ msgid "Shutter speed" msgstr "Lukkerhastighed" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2377,97 +2432,97 @@ msgid "Camera response parameter" msgstr "Kameraresponsparameter" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "ikke aktiv" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "aktiv" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Objektiv %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Stak %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Output-stak %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Output-eksponeringslag %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Sammenkæd" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Frakæd" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Vælg alle for aktuelt objektiv" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Fravælg alle for aktuelt objektiv" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Vælg alle for aktuel stak" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Fravælg alle for aktuel stak" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Vælg alle" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Fravælg alle" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Redigér billedvariable…" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Gem billede" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Gem billede" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "Viste billeder" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Antal aktive billeder:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Kontrolpunkter" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2500,12 +2555,24 @@ msgid "Did you know..." msgstr "Vidste du, at…" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Version %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2513,74 +2580,74 @@ "Fatal installationsfejl\n" "Filen data/splash.png blev ikke fundet på:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Hjælp" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Handlinger" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "&Output" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Brugerdefineret sekvens: %s" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Brugerdefinerede output-sekvenser" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Redigér" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Brugerdefineret sekvens: %s" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "kør assistent" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Startet" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimering" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Eksponering" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Gem ændringer på panorama før åbning af andet projekt?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Gem ændringer på panorama før oprettelse af nyt projekt?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Gem ændringer på panorama før programmet lukkes?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2589,7 +2656,7 @@ "Hvis du indlæser et andet projekt uden at gemme, vil dine ændringer siden " "sidste gemning blive kasseret." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2598,7 +2665,7 @@ "Hvis du starter et nyt projekt uden at gemme, vil dine ændringer siden " "sidste gemning blive kasseret." -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2606,40 +2673,40 @@ "Hvis du lukker uden at gemme, vil dine ændringer siden sidste gemning blive " "kasseret." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Gem ikke" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Luk uden at gemme" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "gennemtvang lukning" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "gemte projektet %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin – Panorama-sammenføjning" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Panorama-editor" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2652,36 +2719,36 @@ "\n" "(Fejlkode: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Gem PTmender scriptfil" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender-filer (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Åbn projekt:" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekt åbnet" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Indlæser billede:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Fejl under åbning af projekt:" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Åbn projektfil" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2692,11 +2759,11 @@ "Denne fil kan ikke indlæses med Fil, Indlæs.\n" "Vil du i stedet tilføje dette billede til det aktuelle projekt?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Åbn projekt: Annullér" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2707,7 +2774,7 @@ "Denne fil er ikke et gyldigt billede.\n" "Denne fil vil blive fjernet fra projektet." -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2719,32 +2786,32 @@ "der ikke er adgang.\n" "Denne fil vil blive fjernet fra projektet." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Kunne ikke indlæse projektfilen %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Åbn Papywizard-XML-fil" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Papywizard-XML-filer (*.xml)|*.xml|Alle filer (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Vælg skabelonprojekt" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Finjusterer alle punkter" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Finjustering" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2773,23 +2840,23 @@ "Brug kontrolpunktlisten (F3) for at se alle punkter for det aktuelle " "projekt\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Finjusteringsresultat" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Fjerner kontrolpunkter i masker" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Vælg Python-script" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python-script (*.py)|*.py|Alle filer (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2798,13 +2865,13 @@ "Filen “%s” ikke fundet.\n" "Måske er den blevet omdøbt, flyttet eller slettet." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Fejl!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2812,12 +2879,12 @@ "Celeste-model forventet i %s blev ikke fundet. Hugin skal installeres " "korrekt." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Kunne ikke indlæse Celeste-modelfilen %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2827,7 +2894,7 @@ "vignetteringsforskydning.\n" "Disse funktioner understøttes ikke i den simple brugerflade." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2837,7 +2904,7 @@ "eller forvridningsparametre.\n" "Disse parametre understøttes ikke i den simple brugerflade." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2847,17 +2914,17 @@ "translaterings- eller forvridningsparametre.\n" "Disse parametre understøttes ikke i den avancerede brugerflade." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Kører assistent" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2865,12 +2932,12 @@ "Assistenten kunne ikke finde lodrette linjer. Tilføj venligst lodrette " "linjer i panorama-editoren og optimér projektet manuelt." -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Advarsel: %d uforbundne billedgrupper er fundet:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2882,7 +2949,7 @@ "\n" "Klip på “Positionér”-knappen igen efter at have tilføjet punkterne" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2890,23 +2957,23 @@ "Assistenten afsluttede ikke korrekt. Tjek venligst den resulterende " "projektfil." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Projektfil ikke fundet" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Kan ikke køre PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Kørte forkert program" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Masketype" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2914,29 +2981,29 @@ "Opret en polygonmaske ved at klikke med venstre museknap på billedet; sæt " "sidste punkt med højre museknap." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Gem maske" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Maskefiler (*.msk)|*.msk|Alle filer (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Indlæs maske" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Indlæs maske: annullér" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Kunne ikke tolke maske fra filen %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Indtast venligst et gyldigt tal" @@ -3079,7 +3146,7 @@ msgstr "Fotometrisk positionering" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Indlæser billeder" @@ -3123,64 +3190,68 @@ msgid "Photometric optimization finished" msgstr "Fotometrisk optimering udført" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Tilføj individuelle billeder…" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Tilføj tidsserie af billeder…" -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Ingen matchende billeder fundet." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Redigér billedvariable…" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Fjern valgte billede(r)" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Forankr dette billede for position" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Forankr dette billede for eksponering" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nyt objektiv" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Ændr objektiv…" -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Indtast nyt objektivnummer" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Objektivnummer" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Ændr objektivnummer" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Indlæs objektiv fra objektivdatabase" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Indlæs objektiv fra ini-fil" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3189,12 +3260,12 @@ "Skal de indlæste parametre anvendes på alle billeder med det samme objektiv " "som det valgte?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Spørgsmål" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3204,100 +3275,100 @@ "Gennemførsel af objektivparametre kan resultere i uønskede resultater.\n" "Gennemfør indstillinger alligevel?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Gem objektiv til ini-fil" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Fjern kontrolpunkter" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Valgte billeder har ingen kontrolpunkter." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Fjern virkelig %lu kontrolpunkter?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Fjern kontrolpunkter" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Fjern kontrolpunkter" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Rydder kontrolpunkter" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Tjekker parvist" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Tjekker hele projektet" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Rydning gennemført" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Fjern kontrolpunkter i skyer" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Nulstil brugerdefineret…" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Nulstil positioner" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Nulstil translateringsparametre" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Nulstil objektivparametre" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Nulstil fotometriske parametre" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Ny stak" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Skift stak…" -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Tast nyt staknummer" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "staknummer" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Ændr staknummer" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Sæt stakstørrelse…" -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Kvalitet:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3367,47 +3438,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff arealtro" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "bredde skal være et heltal større end 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "højde skal være et heltal større end 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "Venstre kant skal være mindre end højre." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Topkant skal være mindre end bundkant." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "PTmender-valgmuligheder endnu ikke implementeret" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "PTblender-valgmuligheder endnu ikke implementeret" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Valgmuligheder for dette HDRMerge-program endnu ikke implementeret" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Kunne ikke oprette midlertidig projektfil" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Angiv outputpræfiks" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3416,15 +3487,15 @@ "Du har ikke rettigheder til at skrive til mappen “%s”.\n" "Vælg venligst en anden mappe til det endelige output." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Vælg brugerdefineret output" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Brugerdefineret output|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3439,7 +3510,7 @@ "Formindsk lærredstørrelsen i panelet Sammenføj eller vælg TIF eller PNG som " "output-format." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3452,7 +3523,7 @@ "beskæring, og sammenføje fra fanebladet Sammenføjning. Sammenføjning af et " "panorama af denne størrelse kan tage lang tid og bruge meget hukommelse." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3466,19 +3537,19 @@ "Hvis dette er for stort, reducér da panoramaets lærredsstørrelse eller det " "beskårede område." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Er du sikker på, at du vil sammenføje så stort et panorama?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Sammenføj alligevel" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Lad mig fikse det" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3488,7 +3559,7 @@ "Tjek venligst dine indstillinger sådan at mindst ét af dine billeder er i " "outputregionen." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3525,121 +3596,138 @@ msgid "Miscellaneous" msgstr "Diverse" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Systemstandard" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baskisk" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalansk" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Kinesisk (simplificeret)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Kinesisk (traditionelt)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Tjekkisk" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Dansk" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Hollandsk" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Engelsk" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Fransk" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Tysk" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Ungarsk" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiensk" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japansk" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polsk" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugisisk (brasiliansk)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Russisk" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovakisk" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spansk" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Svensk" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finsk" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valenciansk (sydcatalansk)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Vælg Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Eksekvérbare filer (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Vælg Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Vælg alle" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Vælg alle" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Vælg ExifTool-argfil" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool-argfiler (*.arg)|*.arg|Alle filer (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3648,14 +3736,14 @@ "Filen %s findes ikke.\n" "Skal argfilen oprettes med standardmærker?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool-argfil" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3663,18 +3751,18 @@ "Ingen fil valgt.\n" "Skal der oprettes en argfil med standardmærker?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Vælg ny ExifTool-argfil" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Kunne ikke gemme filen “%s”." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3683,7 +3771,7 @@ "Filen %s findes ikke.\n" "Skal der oprettes en eksempel-argfil?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3691,23 +3779,24 @@ "Ingen fil er valgt.\n" "Skal der oprettes en eksempel-argfil?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Nulstil virkelig de viste indstillinger til standardværdierne?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Indlæs standardværdier" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Vælg venligst et element først" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Vælg element" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3715,29 +3804,29 @@ "Du kan ikke fjerne den sidste indstilling.\n" "Mindst én indstilling er nødvendig." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "Vil du virkelig fjerne kontrolpunkt-detektor-indstillingen “%s”?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Fjern kontrolpunkt-detektor-indstilling" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Indlæs kontrolpunkt-detektor-indstillinger" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Kontrolpunkt-detektor-indstilling" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Gem kontrolpunkt-detektor-indstillinger" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3764,50 +3853,55 @@ msgid "Remove %lu control points" msgstr "Fjern %lu kontrolpunkter" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panorama preview" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Preview-indstillinger" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projektion (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Blend-metode:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Output:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Komprimering:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Projektionsparametre" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Venstreklik for at definere nyt centerpunkt, højreklik for at flytte punkt " "til horisont." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "Centrér panorama med venstre museknap, sæt horisont med højre museknap" @@ -3825,7 +3919,7 @@ msgid "Click a connection to edit control points." msgstr "Klik på en forbindelse for at ændre kontrolpunkter." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3836,29 +3930,114 @@ "Fejl: %s\n" "En mulig årsag kan være en ugyldig eller manglende billedfil." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Detekterer nu: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Luk" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +#, fuzzy +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Den følgende argfil vil blive brugt til at kopiere mærker fra det første " +"billede til alle mellemliggende billeder." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Mappen %s findes ikke." -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Kunne ikke angive miljøvariablen PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Åbn joblistebehandler" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Åbner PTBatcher, joblistebehandleren til Hugins projektfiler" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Åbn værktøj til objektivkalibrering" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Åbner Calibrate_lens_gui, en simpel grafisk brugerflade til " @@ -3875,11 +4054,11 @@ "Måske har du ikke installeret det korrekt, eller givet en forkert sti i " "indstillingerne." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "rydder op i midlertidige nøglepunktfiler" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3888,15 +4067,15 @@ "Brug venligst %namefile, %i eller %s til at specificere inputfilerne til " "kontrolpunkt-detektor" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Fejl i kommando til kontrolpunkt-detektor" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3908,14 +4087,14 @@ "Vælg venligst færre billeder eller placér billederne i en mappe\n" "med et kortere stinavn" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "For mange billeder er valgt" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3927,38 +4106,38 @@ "\n" "Kunne ikke udføre kommando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute fejl" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "finder kontrolpunkter" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Kunne ikke udføre kommando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3967,9 +4146,9 @@ "Kommando: %s\n" "fejlede med fejlkode: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3984,13 +4163,13 @@ "\n" "Udført kommando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Fejl ved kontrolpunkt-detektor" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3998,7 +4177,7 @@ "Brug venligst %i til at specificere inputfilerne og %k til at specificere " "nøglepunktfilen for nøglegenereringstrinet" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4006,11 +4185,11 @@ "Brug venligst %k til at specificere nøglepunktfilerne og %o til at " "specificere output-projektfilen for sammenligningstrinet" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "genererer nøglefil" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4023,11 +4202,11 @@ "\n" "Kunne ikke udføre kommando: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Standard" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4035,250 +4214,250 @@ "Kan ikke tømme jobliste, der kører.\n" "Vil du annullere den?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Jobliste tømt." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "Fejl: Kunne ikke finde status; projekt med indeks %d er ikke i listen." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Fejl: Kunne ikke indlæse joblistefil." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Jobliste gennemført." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Jobliste gennemført med fejl." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Initialiserer nedlukning…" -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Lukker ned…" -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Gør klar til dvale…" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Initialiserer dvale…" -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Gør klar til hvile…" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Initialiserer hviletilstand…" -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Angiv projektfil" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Intet outputpræfiks angivet" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Ingen projektfil specificeret" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s – Sammenføjer" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s – Assistent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Fejl under fjernelse; projekt med id %d er ikke i listen." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Fejl: Kunne ikke slette projektfil" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Kører jobliste…" -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI sammenføjer" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Jobliste kører allerede." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Kører kommandoen “%s”" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Sammenføjer nu: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Detekterer nu: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "Fejl: Kunne ikke sætte status; projekt med indeks %d er ikke i listen." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "I øjeblikket inaktiv…" -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Du har trykket på Kommando-tasten." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Du har trykket på Ctrl-tasten." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Skal indlæsning af joblisten springes over?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Gør ingenting" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Luk PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Luk computer ned" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Sæt computer i hvile" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Sæt computer i dvale" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Indtast venligst kommandolinjeprogrammet, som skal køres:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Indtast program" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Specificér en mappe for søgning efter projekter" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Specificér projektkildefil(er)" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Tilføjede projekter fra mappen %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Tilføj projektet %s til sammenføjningskø." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Tilføj projektet %s til assistentkø." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Jobliste stoppet" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugins joblistebehandler" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Angiv outputpræfiks for projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Præfikset for et assistentmål kan ikke ændres." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Vælg venligst et projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Vælg venligst kun ét projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Specificér joblistefil til indlæsning" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Joblistefiler (*.ptb)|*.ptb;|Alle filer (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Kan ikke åbne app i Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Intet projekt valgt. Åbn Hugin uden et projekt?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Jobliste på pause" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Sætter udførelsen af Hugins jobliste på pause" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Fortsætter jobliste…" -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Udfører Hugins jobliste" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4286,7 +4465,7 @@ "Der er fejlslagne projekter i listen.\n" "Fjern også dem?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4294,16 +4473,16 @@ "Kan ikke fjerne projekt, der kører.\n" "Vil du annullere det?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Fjernede projektet %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Vælg venligst et projekt, der skal fjernes" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4311,16 +4490,16 @@ "Kan ikke nulstille projekt, der kører.\n" "Vil du annullere det?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Nulstillede projektet %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Vælg venligst et projekt, der skal nulstilles" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4328,15 +4507,15 @@ "Kan ikke nulstille projekter, der kører.\n" "Vil du annullere joblisten?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Specificér joblistefil, der skal gemmes" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Joblistefil (*.ptb)|*.ptb;|Alle filer (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4346,15 +4525,15 @@ "Dette kan have negativ indflydelse på ydelsen.\n" "Skal joblisten tømmes nu?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Tøm jobliste" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Behold jobliste" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Starter jobliste" @@ -4390,7 +4569,7 @@ msgid "E&xit" msgstr "&Afslut" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4400,11 +4579,11 @@ "Hvis du lukker dialogboksen, vil du miste dem.\n" "Fortsæt alligevel?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Accepteret" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4414,11 +4593,11 @@ "Hvis du fortsætter, vil de blive set bort fra.\n" "Fortsæt alligevel?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Stop" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4427,7 +4606,7 @@ "Mappen %s findes ikke.\n" "Angiv venligst en eksisterende mappe." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4435,7 +4614,7 @@ "Du har ikke valgt et muligt panorama.\n" "Vælg venligst mindst ét panorama og prøv igen." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4445,139 +4624,141 @@ "Måske har du ikke skrivetilladelse for disse mapper, eller din harddisk er " "fuld." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Fjern billede fra projekt" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Split her i to panoramaer" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Indlæser filen %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Start" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Fandt %d mulige panoramaer." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Ingen mulige panoramaer fundet." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d billeder: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Syntaksfejl fundet i parametre, afbryder." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI startet" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Venter" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Under kørsel" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Færdig" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Fejlede" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fil mangler" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pause" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Outputpræfiks" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Status" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Sidst ændret" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Output-format" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projektion" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Størrelse" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Fejl, kan ikke konvertere id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Ændr præfiks" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Nulstil projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Ændr med Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Fjern" @@ -4613,16 +4794,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Logfiler (*.log)|*.log|Alle filer (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Kunne ikke finde den angivne bruger-outputfil “%s”." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Specificér projektkildefil" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4633,7 +4814,7 @@ "filnavn." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Om Hugin" @@ -4666,19 +4847,19 @@ msgstr "System" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4757,8 +4938,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Vælg…" @@ -4846,7 +5030,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Valgmuligheder" @@ -4878,10 +5062,6 @@ msgid "Send selected panoramas to queue" msgstr "Send panoramaer til kø" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Luk" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Gennemsøger panoramaer" @@ -4975,12 +5155,12 @@ msgstr "&Minimér til statusfelt" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Afslut" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Afslut program" @@ -5085,42 +5265,149 @@ msgid "adddir" msgstr "tilføj mappe" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "forrige billedpar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Beskrivelse:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "næste billedpar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Type:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "metode:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Alle billeder på én gang" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "lodret linje" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama med stakke" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "vandret linje" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Multirække-panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Multirække-panorama med stakke" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "tilpas til vindue" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Forhåndspositioneret panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Finjustering" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detektor" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Ettrins-detektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Program:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumenter:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Cleanup-argumenter:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Totrins-detektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Kendetegns-descriptor:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Kendetegnssammenligner:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detektor for stakke" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "Efterlad tomt hvis ingen kontrolpunktdetektor skal køres på stakke." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Avancerede valgmuligheder" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Denne indstilling har ingen avancerede valgmuligheder." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"følgende mønstre vil blive erstattet før kørsel:\n" +"%o -- output-projekt (0.oto vil blive tilføjet ved brug af Autopano)\n" +"%p -- antal kontrolpunkter mellem hvert par\n" +"%v -- vandret synsfelt for første billede\n" +"%f -- projektion for første billede (0-4, som i PanoTools)\n" +"%i -- billedfiler\n" +"%namefile -- fil, der indeholder billedfilnavne\n" +"%s -- input-PanoTools-script\n" +"%k -- mellemliggende nøglefiler" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parametre for kontrolpunkt-detektors" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "forrige billedpar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "næste billedpar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "metode:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "lodret linje" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "vandret linje" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "tilpas til vindue" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Finjustering" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 msgid "Tries to optimize the currently active point" msgstr "Prøver at optimere det aktive punkt" @@ -5178,7 +5465,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Fjern" @@ -5186,153 +5473,184 @@ msgid "Select by Distance" msgstr "Vælg efter afstand" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Beskrivelse:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Ugyldige filnavne" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Type:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (af A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Ja" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Alle billeder på én gang" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Nej" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama med stakke" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Redigér Panorama Tools-script" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Multirække-panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Dette er det script, som vil blive sendt til Panorama Tools-maskinen. At " +"redigere dette er en avanceret teknik." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Multirække-panorama med stakke" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Fortsæt med disse ændringer" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Forhåndspositioneret panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Kassér ændringer og annullér" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Gruppér efter:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Ettrins-detektor" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimalt overlap:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Minimalt overlap for output-stak-detektering" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumenter:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maksimal Ev-forskel:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Cleanup-argumenter:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maksimal Ev-forskel for detektering af output-lag" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Totrins-detektor" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Skærm" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Kendetegns-descriptor:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Generelt" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Kendetegnssammenligner:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF-data" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detektor for stakke" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Positioner" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "Efterlad tomt hvis ingen kontrolpunktdetektor skal køres på stakke." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Objektivparametre" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Avancerede valgmuligheder" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Fotometriske parametre" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Denne indstilling har ingen avancerede valgmuligheder." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Objektivtype" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"følgende mønstre vil blive erstattet før kørsel:\n" -"%o -- output-projekt (0.oto vil blive tilføjet ved brug af Autopano)\n" -"%p -- antal kontrolpunkter mellem hvert par\n" -"%v -- vandret synsfelt for første billede\n" -"%f -- projektion for første billede (0-4, som i PanoTools)\n" -"%i -- billedfiler\n" -"%namefile -- fil, der indeholder billedfilnavne\n" -"%s -- input-PanoTools-script\n" -"%k -- mellemliggende nøglefiler" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Tilføj billeder…" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parametre for kontrolpunkt-detektors" +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Objektivtype:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Brændviddefaktor:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Kendetegnssammenligning" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Indstillinger:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "Kør den valgte kontrolpunkt-detektor på de valgte billeder" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimér" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometrisk:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Beregn" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometrisk:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Ugyldige filnavne" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Valgt billede" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Redigér Panorama Tools-script" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Indlæs objektivdata…" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." -msgstr "" -"Dette er det script, som vil blive sendt til Panorama Tools-maskinen. At " -"redigere dette er en avanceret teknik." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "Indtast vandret synsfelt (HFOV) eller brændvidden og beskæringsfaktor" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Fortsæt med disse ændringer" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Kassér ændringer og annullér" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "grader" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Kamera- og objektivdata" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Yaw:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Pitch:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Roll:" @@ -5340,34 +5658,11 @@ msgid "Translation parameter" msgstr "Translateringsparameter" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Positioner" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "vinkel for synsfelt i grader (v):" @@ -5467,7 +5762,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Hjælp" @@ -5512,8 +5807,8 @@ msgstr "Indlæs maske" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Gem" @@ -5526,119 +5821,47 @@ msgid "Manipulate image variables" msgstr "Redigér billedvariable…" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Gruppér efter:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimalt overlap:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimalt overlap for output-stak-detektering" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maksimal Ev-forskel:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maksimal Ev-forskel for detektering af output-lag" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Skærm" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Generelt" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF-data" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Objektivparametre" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Fotometriske parametre" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Objektivtype" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Tilføj billeder…" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Objektivtype:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Brændviddefaktor:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Kendetegnssammenligning" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Indstillinger:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "Kør den valgte kontrolpunkt-detektor på de valgte billeder" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimér" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometrisk:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "&Indstillinger" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Beregn" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometrisk:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Sammenkæd parametre" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Valgt billede" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Indlæs objektivdata…" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Behandler:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "Indtast vandret synsfelt (HFOV) eller brændvidden og beskæringsfaktor" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "grader" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Kamera- og objektivdata" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importér" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5784,14 +6007,6 @@ msgid "Don't ask again" msgstr "Spørg ikke igen" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Ja" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Nej" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5855,21 +6070,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importér positioner fra Papywizard-XML" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Fortryd" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Fortryd den seneste handling" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Gentag" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Gentag den seneste handling" @@ -5913,12 +6128,12 @@ msgid "Use only normal control points in optimization." msgstr "Antal kontrolpunkter i dette billede" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimering" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Kør optimeringen igen med de aktuelle indstillinger" @@ -5947,16 +6162,16 @@ msgid "Run a python script" msgstr "Kør et Python-script" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Vis" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Fuld skærm" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Viser Hugins hovedvindue i fuld skærm" @@ -6038,22 +6253,22 @@ msgid "Show the Stitcher panel" msgstr "Vis sammenføjningspanelet" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Simpel" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Avanceret" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Ekspert" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "&Brugerflade" @@ -6074,86 +6289,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "Sammenføj med indstillingerne fra en brugerdefineret output-sekvens" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Information om de forskellige knapper, osv." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "Dagens &tip" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Vis en af dagens tips." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Tastaturgenveje" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "tastaturgenveje" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ – Ofte stillede spørgsmål" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Ofte stillede spørgsmål (FAQ)" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Om" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Indstillinger" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Ny" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nyt projekt" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Indlæs" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Indlæs projekt" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "Gem" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Gem den aktive projektfil" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "G&em som" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Gem det aktive projekt til en ny fil" @@ -6169,18 +6384,18 @@ "Skriv det aktive projekt til en PTStitcher-kompatibel scriptfil. Nyttig til " "jobliste-kørsel" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "&Seneste projekter" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Liste over senest brugte projektfiler" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Kør joblistebehandler" @@ -6267,7 +6482,7 @@ msgid "Show the OpenGL preview image" msgstr "Vis OpenGL-preview-billedet" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Preview panorama" @@ -6324,15 +6539,10 @@ msgstr "Ekskludér område fra alle billeder fra dette objektiv" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Eksportér" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importér" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopiér" @@ -6376,8 +6586,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" "Anvender alle ændringer på alle billeder med samme objektiv som det eller de " "valgte billeder." @@ -6485,7 +6695,8 @@ msgid "execute the PTOptimizer engine" msgstr "kør PTOptimizer-programmet" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Billedorientering" @@ -6531,39 +6742,39 @@ msgid "Interpolator (i):" msgstr "Interpolering (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (bikubisk)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineær" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Nærmeste nabo" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "tilnærmelse af værdier mellem kildepixels" @@ -6591,7 +6802,7 @@ msgid "Enfuse options" msgstr "Enfuse-valgmuligheder" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Synsfelt:" @@ -6753,10 +6964,6 @@ msgid "Image fusion:" msgstr "Billedfusion:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR-kombinering:" @@ -6860,15 +7067,15 @@ msgid "Output parameters" msgstr "Output-parametre" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Metode for sømsammenføjning:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "hård søm (hurtigere)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "sammenføj søm" @@ -6939,27 +7146,43 @@ msgid "This affects the control points editor and mask editor." msgstr "Fjern alle kontrolpunkter inden i maskerede områder." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Enblend-programfil:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(efterlad tom for OS-standard)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Enblend-programfil:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Enblend-programfil:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Fil-valgmuligheder" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Midlertidig mappe" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(efterlad tom for OS-standard)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Standard-projektfilnavn:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Standard-outputpræfiks:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6990,43 +7213,43 @@ "%lens – objektiv (for første billede)\n" "%projectname – projektfilnavn (kun for output-prefix)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Standardfilnavne" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Filnavne" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Billede indlæses" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Positionér automatisk billeder efter indlæsning" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Detektér lodrette linjer" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Detektér lodrette linjer i billederne for at levelere panoramaet" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Fjern sky-agtige kontrolpunkter (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Valgfrie skridt i assistenten" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Autopositionering" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7034,67 +7257,67 @@ "Antal kontrolpunkter\n" "pr. overlap" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Nedskalér endelig panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "procent af maksimumbredde" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Kontrolpunktredigering" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR og 16 bit-visning" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Kurve" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineær" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmisk" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "bruges til visning i GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Lapbredde:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixels" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Søgeområdebredde:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "procent af billedbredde" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Lokal søgeområdebredde:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Korrelationsgrænseværdi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7102,11 +7325,11 @@ "0: ingen ligheder\n" "1: maksimal lighed" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Grænseværdi for krumningsspidsværdi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7114,116 +7337,112 @@ "0: ingen spidsværdi\n" "0,2: karakteristisk spidsværdi" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Rotationssøgning" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Slå rotationssøgning til (langsommere, men mere præcis)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Startvinkel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Slutvinkel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Skridt:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Kontrolpunkt-detektorer" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programmer til kontrolpunkt-detektering" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Ny…" -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Redigér…" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Flyt op" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Flyt ned" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Sæt som standard" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Assistenten bruger standardindstillingen." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Output-format" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Standardfilformat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "standardoutputformat for endelig panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF-komprimering:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "standard-TIFF-komprimering" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG-kvalitet:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "standard-JPEG-komprimeringsindstilling" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Blander" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Standard-blander:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Standardblander, der bruges i nye projekter." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Behandler" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Programmet, som kører sammenføjningen" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Start sammenføjningsjobs med det samme" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7233,19 +7452,19 @@ "behandleren blive startet i hviletilstand, og brugeren skal starte beregning " "manuelt." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Overskriv eksisterende filer" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "ADVARSEL: eksisterende filer vil blive overskrevet uden advarsel." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Detaljeret output" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7253,19 +7472,19 @@ "Vælg for at få ekstra detaljer; nyttig hvis du vil rapportere en programfejl " "eller bare se projektets fremgang." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Sammenføjning" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Kopiér metadata til de endelige filer ved hjælp af ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "ExifTool-valgmuligheder" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7279,7 +7498,7 @@ "Lad tekstboksene være tomme og tryk “Redigér…” for at oprette en eksempel-" "argfil." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7287,19 +7506,19 @@ "Den følgende argfil vil blive brugt til at kopiere mærker fra det første " "billede til alle mellemliggende billeder." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Midlertidig ExifTool-argfil:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Efterlad tom for standard" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Redigér valgt ExifTool-argfil" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7309,27 +7528,27 @@ "billede til det endelige panorama.\n" "Den anvendes i tillæg til ovennævnte argfil på de mellemliggende billeder." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Endelig ExifTool-argfil:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Opret Photo Sphere XMP-data" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Dette vil kun blive udført for ekvirektangulære outputbilleder." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Avancerede valgmuligheder" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Antal tråde:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7341,81 +7560,83 @@ "Sæt maksimalt dette til antallet af processorer eller processorkerner, der " "er tilgængeligt på dit system" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 for automatisk bestemmelse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Sammenføjning (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Standard-interpolering (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Opret beskårede billeder som standard" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Brug GPU for remapping (EKSPERIMENTEL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" +msgstr "Bruger GPU til remapping:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Brug grafikkortets GPU for at øge hastigheden på remapping" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Brug alternativt Enblend-program" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend-programfil:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Standardargumenter:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Dette er standardargumenterne for nye projekter.\n" "De kan ændres for hvert individuelt projekt i fanebladet Sammenføjning.\n" "Sæt ikke argumenterne -w, -o og --compression. De styres af Hugin." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Brug alternativt Enfuse-program" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse-programfil:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programmer" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste-parametre" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM-grænseværdi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7423,19 +7644,19 @@ "større end 0,5: mindre sensitiv\n" "større end 0,5: mere sensitiv" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor-filterstørrelse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "lille" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "stor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7443,7 +7664,7 @@ "stor er mere nøjagtig\n" "lille kan undersøge kontrolpunkter tæt på billedkanten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7454,55 +7675,55 @@ "For at øge hastigheden på beregningen bruges kun en tilfældig delmængde af " "punkter." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Antal punkter pr. billede:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Fotometrisk optimering" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Advarsler" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Vis besked om gemning af projektfil og outputpræfiks" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "Vis advarsel om stor eksponeringsforskel under tilføjelse af billeder" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Efter “Redigér KP”-værktøj" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Spørg bruger" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Gen-optimér Panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Optimér ikke panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "KP-redigeringsværktøj (i vinduet hurtigforhåndsvisning)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Diverse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Indstillinger – Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 #, fuzzy msgid "" "This argfile is called with command line\n" @@ -7511,11 +7732,11 @@ "Denne argfil kaldes med kommandolinjen\n" "“exiftool -overwrite&original -tagsfromfile billede -@ argfil panorama”." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Redigér ExifTool-argfil" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 #, fuzzy msgid "" "This argfile is called with command line\n" @@ -7524,7 +7745,7 @@ "Denne argfil kaldes med kommandolinjen\n" "“exiftool -overwrite&original -tagsfromfile billede -E -@ argfil panorama”." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7559,11 +7780,11 @@ "\n" "Koderne er versalfølsomme." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centrér preview vandret" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centrér" @@ -7571,13 +7792,15 @@ msgid "Show the whole panorama" msgstr "Vis hele panoramaet" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Beregn synsfelt" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Tilpas" @@ -7585,7 +7808,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Udret automatisk en bølget horisont" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Stræk" @@ -7684,31 +7908,31 @@ "Sætter eksponeringsværdien for panoramaet til den gennemsnitlige eksponering " "for alle billeder." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Grå-vælger" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Ret den overordnede hvidbalance ved at vælge et neutralt, gråt område." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Redigér KP" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Opret eller fjern kontrolpunkter i valgt rektangel." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Baggrund:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Skala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7722,162 +7946,150 @@ "* Klik på en linje for at redigere de tilhørende billeder i fanebladet " "Kontrolpunkter." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Layout" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guider:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Tredjedelsreglen" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Det gyldne snit" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Diagonalmetoden" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Den gyldne trekant (ned)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Den gyldne trekant (op)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Udret automatisk en bølget horisont." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Træk-type:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Anvend" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Flyt panoramaet eller træk billeder til deres position" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Flyt/træk" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Sæt beskæringsområdet til det største rektangel, som er dækket af billeder" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR-autobeskæring" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Sæt beskæringsområdet til det største rektangel, som er dækket af " "billedstakke" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "venstre:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "top:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "højre:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "bund:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Nulstil beskæring til størst muligt område" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Ændr panoramaets beskæringsområde" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Panorama-&editor" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Overblik" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Viser overblik over hele panorama-kuglen." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Gitter" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Viser et gitter." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Alle billeder" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Billede med medianeksponering for hver stak" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Lyseste billede for hver stak" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Mørkeste billede for hver stak" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Behold de valgte billeder" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Nulstil valg" @@ -8181,6 +8393,80 @@ "Optimering af alle forvrængningsparametre, “alle”, giver kun mening ved " "kraftigt overlappende billeder og mange jævnt spredte kontrolpunkter." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Indstillinger" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "&Billeder…" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Tilføj billeder…" + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Tilføj endnu et billede til det aktuelle projekt" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Gem billede" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Fjern valgte billede(r)" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Skala for hjørnedetektion" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Flyt panoramaet eller træk billeder til deres position" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Ændr panoramaets beskæringsområde" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Brug GPU for remapping (EKSPERIMENTEL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Alle billedfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;" +#~ "*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" +#~ "*.EXR|JPEG-filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-filer (*." +#~ "tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-filer (*.png)|*.png;*.PNG|HDR-" +#~ "filer (*.hdr)|*.hdr;*.HDR|EXR-filer (*.exr)|*.exr;*.EXR|Alle filer (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (af A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Brugerflade" diff -Nru hugin-2018.0.0+dfsg/src/translations/de.po hugin-2019.0.0+dfsg/src/translations/de.po --- hugin-2018.0.0+dfsg/src/translations/de.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/de.po 2019-02-17 15:24:33.000000000 +0000 @@ -9,22 +9,22 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-12-12 17:14+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2019-02-17 16:19+0100\n" "Last-Translator: T. Modes\n" "Language-Team: deutsch \n" -"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.2.1\n" "X-Poedit-Basepath: d:/usr/src/hugin/hugin/src\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 #: hugin1/hugin/PapywizardImport.cpp:460 msgid "Searching for control points..." -msgstr "Kontrollpunkte suchen..." +msgstr "Suche nach Kontrollpunkten ..." #: hugin1/base_wx/AssistantExecutor.cpp:80 msgid "Removing control points in clouds..." @@ -36,7 +36,7 @@ #: hugin1/base_wx/AssistantExecutor.cpp:104 msgid "Searching for vertical lines..." -msgstr "Vertikale Linien ermitteln..." +msgstr "Suche nach vertikalen Linien..." #: hugin1/base_wx/AssistantExecutor.cpp:112 #: hugin1/base_wx/AssistantExecutor.cpp:117 @@ -47,15 +47,15 @@ msgid "Searching for best crop..." msgstr "Bestmöglichen Beschnitt bestimmen..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Externe Anwendung %s wurde nicht im Paket gefunden. Verwende Systempfad." -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -83,9 +83,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|PNG-Datei (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Datei %s ist bereits vorhanden. Überschreiben?" @@ -122,7 +122,7 @@ msgstr "Der Formatfaktor muss größer Null sein." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -136,24 +136,28 @@ "Soll dieser hohe Wert trotzdem verwendet werden?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -174,8 +178,8 @@ msgstr "Fischauge Vollbild" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Sphärisch (Equirectangular)" @@ -234,16 +238,16 @@ msgid "Error loading lens parameters" msgstr "Fehler beim Laden der Objektivparameter" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Objektivparameter speichern" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Objektivparameter (*.ini)|*.ini|Alle Dateien (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Projekt speichern" @@ -279,22 +283,22 @@ msgid "Error pausing process %ld, code 2" msgstr "Fehler beim Pausieren des Prozesses %ld, Code 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Abbrechen" @@ -328,12 +332,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Konnte Projektdatei nicht öffnen:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "Konnte Skriptdatei %s nicht öffnen." @@ -343,8 +347,8 @@ msgid "Project %s does not contain any active images." msgstr "Das Projekt %s enthält keine aktiven Bilder." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "Fehler beim Einlesen des Skriptes %s" @@ -358,17 +362,17 @@ msgid "Could not create temporary file" msgstr "Konnte temporäre Datei nicht erzeugen." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "Die Warteschlange ist leer. Das sollte nie passieren." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Fehler beim Zusammenfügen" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -376,11 +380,11 @@ "Bestehende Bilder überschreiben?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Bilder überschreiben" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -389,12 +393,12 @@ "Fehler beim Zusammenfügen von Projekt\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Fehler beim Ablauf des Assistenten" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -403,272 +407,272 @@ "Fehler beim Ablauf des Assistenten\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Panorama zusammenfügen..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Plattform:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Version:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Aktuelles Verzeichnis:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Ausgabe-Präfix:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Überblendung:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Unbekannter Überblender (enblend --version failed)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "intern" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Belichtungsfusion:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Unbekannte Belichtungsfusion (enfuse --version failed)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "ExifTool-Version:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "FEHLGESCHLAGEN" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Anzahl der aktiven Bilder:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Ausgabe-Belichtungswert: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Rahmengrösse: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projektion:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Verwende GPU für Umberechnung:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "wahr" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "falsch" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panorama-Ausgabe:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 hugin1/hugin/xrc/pano_panel.xrc:480 #: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Mit Belichtungskorrektur, niedriger Dynamikumfang" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 +#: hugin1/base_wx/StitchingExecutor.cpp:294 hugin1/hugin/xrc/pano_panel.xrc:492 #: hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Belichtungsfusion aus Stapeln" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 +#: hugin1/base_wx/StitchingExecutor.cpp:298 hugin1/hugin/xrc/pano_panel.xrc:501 #: hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Belichtungsfusion von beliebiger Anordnung" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 hugin1/hugin/xrc/pano_panel.xrc:570 #: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Hoher Dynamikumfang" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Umgerechnete Einzelbilder:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Keine Belichtungskorrektur, niedriger Dynamikumfang (LDR)" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Verbundene Stapel:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Vereinigte Belichtungsreihen" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Ebenen:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Zusammengefügte Ebenen ähnlicher Belichtung, ohne Belichtungskorrektur" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Erstes Quell-Bild" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Nummer:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Dateiname:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Größe: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Kamerakurve:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Belichtungswert: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Umberechnung und Überblendung von LDR-Bildern…" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Umberechnung von LDR-Bildern…" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Überblendung der Bilder…" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Umberechnung von LDR-Bildern und Überblenden von Belichtungsebenen…" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Umberechnung von LDR-Bildern ohne Belichtungskorrektur..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Überblenden von Belichtungsebene %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fusionieren aller Belichtungsebenen…" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Fusion von Stapel Nummer %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Alle Stapel überblenden..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "HDR-Bilder umrechnen..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Verschmelze HDR-Stapel Nummer %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "HDR-Stapel überblenden..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Metadaten aktualisieren..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Zusammenfügen mit Sequenz \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "erstes Bild" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "letztes Bild" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "Verzeichnis" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Kamera-Hersteller" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Kamera-Modell" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -676,35 +680,67 @@ msgid "Lens" msgstr "Objektiv" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "Unbekannte Projektion" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Alle Bilddateien" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "JPEG-Dateien (* .jpg, * .jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "TIFF-Dateien (* .tif, * .tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "PNG-Dateien (* .png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "HDR-Dateien (* .hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "EXR-Dateien (* .exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "Alle Dateien (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "Raw-Dateien" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Fehler" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -716,25 +752,11 @@ "Hugin kann solche Dateinamen nicht verarbeiten. Bitte Datei(en) umbenennen " "und letzte Aktion erneut ausführen." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Report für Fehlerbeseitigung erstellt in \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Alle Bilddateien|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG-Dateien (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-Dateien (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-Dateien (*.png)|*.png;*.PNG|HDR-Dateien " -"(*.hdr)|*.hdr;*.HDR|EXR-Dateien (*.exr)|*.exr;*.EXR|Alle Dateien (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -746,27 +768,27 @@ msgstr "Die Eingabe \"%s\" ist keine gültige Nummer." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Warnung" @@ -783,7 +805,7 @@ msgid "Could not save information into database." msgstr "Information konnte nicht in der Datenbank gespeichert werden." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -794,11 +816,11 @@ "\n" "Vorgang abgebrochen." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Bildformat wird nicht unterstützt" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -810,7 +832,7 @@ "Hugin unterstützt diese Bildart nicht. Dieses Bild wird übersprungen.\n" "Konvertieren sie dieses Bild in Graustufen und laden Sie es neu." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -827,14 +849,14 @@ "Konvertieren sie dieses Bild in Graustufen oder ein Farbbild und laden Sie " "es neu." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin unterstützt nur Graustufen- und RGB-Bilder (jeweils ohne bzw. mit " "Alphakanal)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -843,7 +865,7 @@ "Datei \"%s\" ist ein Graustufen-Bild, aber andere Bilder im Projekt sind " "Farbbilder." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -852,7 +874,7 @@ "Datei \"%s\" ist ein Farbbild, aber andere Bilder im Projekt sind Graustufen-" "Bilder." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -861,7 +883,7 @@ "Hugin unterstützt diese Kombination nicht. Dieses Bild wird übersprungen.\n" "Konvertieren Sie dieses Bild in Graustufen bzw. RGB und laden Sie es neu." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -870,7 +892,7 @@ "Datei \"%s\" hat kein eingebettetes ICC-Profil, aber andere Bilder im " "Projekt besitzen das ICC-Profil \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -879,7 +901,7 @@ "Datei \"%s\" hat ICC-Profil \"%s\", aber andere Bilder im Projekt haben kein " "ICC-Profil." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -888,7 +910,7 @@ "Datei \"%s\" hat ICC-Profil \"%s\", aber andere Bilder im Projekt besitzen " "das ICC-Profil \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -897,7 +919,7 @@ "Bitte konvertieren Sie alle Bilder in das gleiche Farbprofil und versuchen " "Sie es erneut." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -905,7 +927,7 @@ "Hugin hat bei den hinzugefügten Bildern Stapel erkannt und wird diesen " "übereinstimmende Stapelnummern zuweisen." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -915,11 +937,11 @@ "Stapelnummern werden darauf basierend neu zugewiesen. Bereits bestehende " "Stapel-Zuweisungen werden überschrieben." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Soll die Position der Bilder innerhalb jedes Stapels verknüpft werden?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -932,25 +954,25 @@ "Bilder innerhalb der Stapel eine Feinabstimmung der Positionierung " "benötigen, also z.B. bei Bracketing-Aufnahmen aus der freien Hand." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Position verknüpfen" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Position nicht verknüpfen" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Keine Stapel zuweisen" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Bestehende Stapel behalten" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -960,16 +982,16 @@ "konnte.\n" "Bitte wählen Sie das richtige Bild aus." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Bilddatei nicht gefunden" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Bild %s wählen" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -980,16 +1002,16 @@ "\n" "Drücken Sie OK zum Entfernen." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Fehler gefunden" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Bilder hinzufügen" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -998,32 +1020,32 @@ "Fehler, die Vorlage erwartet %d Bilder,\n" "das Projekt enthält %d Bilder.\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Vorlage konnte nicht angewendet werden" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Fehler beim Laden der Projektdatei" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Ergebnis" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc-Verzeichnis nicht im Paket gefunden" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Nicht behebbarer Fehler" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1058,7 +1080,7 @@ "mit denen der bereits hinzugefügten Bilder.\n" "Es sollte überprüft werden, ob die richtigen Bilder ausgewählt wurden." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Bilder hinzufügen abgebrochen" @@ -1071,9 +1093,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1090,7 +1112,7 @@ msgstr "Linien suchen..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Fertig" @@ -1104,11 +1126,11 @@ "Bitte zuerst \"Finde Linien\" ausführen. Die Parameter sollten angepasst " "werden, falls dadurch keine Linien gefunden werden." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." -msgstr "Optimiere Parameter der Objektiv-Verzeichnung" +msgstr "Optimiere Parameter der Objektiv-Verzeichnung..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1119,142 +1141,142 @@ "Objektiv-Daten gespeichert werden. Die Parameter sollten angepasst werden, " "falls dadurch keine Linien gefunden werden." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Objektivparameter in ini-Datei speichern" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Objektiv-Parameter in Objektiv-Datenbank speichern" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Objektivdaten speichern" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Objektiv speichern" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Projekt speichern" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Projekt-Dateien (*.pto)|*.pto|Alle Dateien (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Temporäre Dateien löschen..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "zeigt diese Hilfe-Meldung" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Assistenten ausführen" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Stitching ausführen mit dem vorgegebenen Projekt" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Anzahl der verwendeten Threads" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "Für das Zusammenfügen verwendetes Präfix" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "verwende benutzerdefinierte Ausgabesequenz aus der gegebenen Datei" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "verwende benutzerdefinierten Assistenten aus der gegebenen Datei" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "Nur Befehle anzeigen" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Betriebssystem: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architektur: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Freier Speicher: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktive Codepage: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Version: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Ressourcen-Pfad: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Datenpfad: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Hugins Kamera- und Objektivdatenbank: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi-Threading mittels C++11 std::thread und OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Monitorprofile: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Bibliotheken" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano von http://autopano.kolor.com ist für MacOS X nicht verfügbar" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Benutze stattdessen Autopano-SIFT" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1262,64 +1284,65 @@ "Mindestens ein Eingabefeld ist leer.\n" "Bitte überprüfen Sie Ihre Eingaben." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Versuche alle überlappenden Bilder zu verbinden." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Bearbeitung auf Bildpaare ohne Kontrollpunkte beschränken." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Kontrollpunkt-Detektor Anwendung auswählen" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Anwendungen (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "Nr." -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x links" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y links" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x rechts" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y rechts" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Ausrichtung" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Abstand" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Neuer Kontrollpunkt hinzugefügt" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "Suche ähnliche Punkte..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Fehler bei der Feinjustierung" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1328,19 +1351,24 @@ "Punkt justiert, Winkel: %.0f °, Korrelationskoeffizient: %0.3f, Krümmung: " "%0.3f %0.3f" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "Punkte ändern oder mit der rechten Maustaste das Paar hinzufügen" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Geschätzter Punkt ist außerhalb des Bildes" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" +"Die Entfernung zwischen den Linienenden ist kurz. Überspringe Feinabstimmung." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." -msgstr "Keinen ähnlichen Punkt gefunden" +msgstr "Keinen ähnlichen Punkt gefunden." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1348,7 +1376,7 @@ "Eine interne Transformation schlug fehl.\n" "Bitte prüfen, ob sich der Punkt innerhalb des Bildes befindet." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1359,31 +1387,36 @@ "Der Korrelationskoeffizient (%.3f) ist kleiner als der eingestellte " "Schwellwert." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Neue Linie hinzufügen" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linie %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Korrelation" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "Standard" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "vert. Linie" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "horiz. Linie" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1393,38 +1426,38 @@ "Je höher dieser Wert, desto weniger\n" "Punkte werden erzeugt." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Schwellwert für Eckenerkennung" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Kontrollpunkte erstellen" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Maßstab für Eckenerkennung" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Fehler beim Erzeugen der Kontrollpunkte:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Punkt im rechten Bild wählen" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Punkt im linken Bild wählen" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "KP erstellen (aktuelle Einstellung: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1432,35 +1465,35 @@ "Kann Celeste nicht starten, ohne dass mindestens ein Kontrollpunkt die zwei " "Bilder verbindet." -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Starte Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Lade Modelldatei" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "%lu Kontrollpunkte entfernt" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Ergebnis von Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Säubern" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "KP erstellen" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1468,19 +1501,19 @@ "Erstellt Kontrollpunkte für die aktuell ausgewählten Bilder mit dem aktuell " "ausgewählten Kontrollpunkt-Detektor auf dem Bilder-Reiter." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Versucht, Kontrollpunkte aus Wolken zu entfernen" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "KP säubern" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Entferne Ausreißer mit statistischer Methode" @@ -1492,23 +1525,23 @@ msgid "Could not process event!" msgstr "Interner Fehler: Konnte Ereignis nicht verarbeiten" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G KP-Nr." -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "linkes Bild" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "rechtes Bild" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P KP-Nr." -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1516,7 +1549,7 @@ "Kleinsten zulässigen Kontrollpunktfehler eingeben.\n" "Alle Punkte mit größerem Fehler werden ausgewählt" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Kontrollpunkte auswählen" @@ -1595,60 +1628,60 @@ "Ziehen um Bilder zu bewegen (Hochstelltaste zur Richtungseinschränkung " "verwenden), oder rollen mit rechts-ziehen oder Ctrl-ziehen." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Schnelle Panoramavorschau" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Datei" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Dargestellte Bilder" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Alle" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Keine" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Ausblenden" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "Ziehen um den vertikalen Bildwinkel festzulegen" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "Ziehen um den horizontalen Bildwinkel festzulegen" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Vorschau" @@ -1656,85 +1689,92 @@ msgid "Overview" msgstr "Übersicht" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Setzt die Projektions-Parameter zurück auf deren Grundeinstellung." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "Param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Keine Bilder geladen." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu Bilder geladen." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Die Bilder sind mit %lu Kontrollpunkten verbunden.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%lu unverbundene Bildgruppen gefunden: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Bilder oder Kontrollpunkte haben sich geändert, eine neue Ausrichtung ist " "erforderlich." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Mittlerer Fehler nach Optimierung: %.1f Pixel, max. %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Gradlinig (Rectilinear)" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Zylindrisch" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." -msgstr "Gierwinkel (Yaw) muss numerisch sein" +msgstr "Gierwinkel (Yaw) muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." -msgstr "Nickwinkel (Pitch) muss numerisch sein" +msgstr "Nickwinkel (Pitch) muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." -msgstr "Rollwinkel (Roll) muss numerisch sein" +msgstr "Rollwinkel (Roll) muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X-Wert muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y-Wert muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z-Winkel muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Wert muss numerisch sein." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" +"Der Wert für die Dynamikbereichkompression liegt außerhalb des gültigen " +"Bereichs." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1746,59 +1786,59 @@ "Dieses Projekt hat aber Typ und Tpp Parameter ungleich Null.\n" "Sollen Tpy and Tpp auf Null zurück gesetzt werden?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "Differenz" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Automatischer Beschnitt" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Optimalen Beschnitt berechnen" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Oben muss eine ganze Zahl größer als 0 sein." -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "Links muss eine ganze Zahl größer als 0 sein." -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "Rechts muss eine ganze Zahl größer als 0 sein." -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "Unten muss eine ganze Zahl größer als 0 sein." -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "Der Wert des linken Randes muss kleiner sein als der des rechten." -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "Der Wert des oberen Randes muss kleiner sein als der des unteren." -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" "Ungültiger horizontaler Bildwinkel (HFOV). Der maximale Winkel dieser " "Projektion beträgt: %lf" -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" "Ungültiger vertikaler Bildwinkel (VFOV). Der maximale Winkel dieser " "Projektion beträgt: %lf" -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1806,7 +1846,7 @@ "Bei großem Bildwinkel werden Panoramen in rektilinearer Projektion an den " "Rändern stark gestreckt.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1814,17 +1854,17 @@ "Versuchen Sie eine zylindrische Projektion, da der Bildwinkel horizontal " "sehr groß ist." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Versuchen Sie für ein sehr breites Panorama die sphärische (Equirectangular) " "Projektion." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Sie können auch die Panini-Projektion ausprobieren." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1836,7 +1876,7 @@ "Die equirectanguläre Projektion bringt den gleichen Inhalt auf geringere " "vertikale Ausdehnung." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1847,7 +1887,7 @@ "Die zylindrische Projektion erhält vertikale Linien vertikal, im Gegensatz " "zur equirektangulären.." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1858,7 +1898,7 @@ "Panorama winkeltreu.\n" "Dies kann eine angenehmere Darstellung ergeben." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1871,7 +1911,7 @@ "abgebildet werden kann und trotzdem der mittlere Bereich brauchbar " "abgebildet wird." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1879,7 +1919,7 @@ "Bei einer geradlinigen (rectilinear) Projektion würden gerade Linien gerade " "bleiben." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1889,27 +1929,27 @@ "ausgeblendet.\n" "Die Infoleiste kann in den Einstellungen wieder eingeblendet werden." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "Standard, einzeln" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "Mosaik" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "Mosaik, einzeln" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panorama-Kugel" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mosaik-Ebene" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1920,12 +1960,12 @@ "\n" "Soll das Panorama jetzt neu optimiert werden?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "Momentan ausgewählte Optimierungsstrategie ist \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1934,7 +1974,7 @@ "Bitte einen Bereich auswählen, der von mindestens zwei Bildern abgedeckt " "wird." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1942,7 +1982,7 @@ "Der ausgewählte Bereich enthält nur ein Bild.\n" "Für ein einziges Bild können keine Kontrollpunkte erstellt werden." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1956,27 +1996,27 @@ "\n" "Trotzdem fortfahren?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Kontrollpunkte suchen" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Ausführung" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Bild in Panorama-Projektion umrechnen" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Gleiche herausragende Merkmale ab…" -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Ergebnisse prüfen..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1987,7 +2027,7 @@ "\n" "Soll das Panorama jetzt neu optimiert werden?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1995,7 +2035,7 @@ "Fehler bei Initialisierung von GLEW.\n" "Das Schnelle Vorschaufenster kann nicht geöffnet werden." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2039,7 +2079,7 @@ msgstr "Anzahl der Masken" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Beschnitt" @@ -2072,7 +2112,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Die maximale Ev Differenz muss größer als 0 sein." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Stapel" @@ -2252,7 +2292,7 @@ msgid "Shutter speed" msgstr "Belichtungszeit" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2401,93 +2441,93 @@ msgid "Camera response parameter" msgstr "Parameter der Kamerakurve" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "Nicht aktiv" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "Aktiv" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Objektiv %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Stapel %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Ausgabestapel %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Belichtungsebene %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Verknüpfen" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Verknüpfung trennen" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Für aktuelles Objektiv alles auswählen" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Für aktuelles Objektiv nichts auswählen" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Für aktuellen Stapel alles auswählen" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Für aktuellen Stapel nichts auswählen" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Alles auswählen" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Nichts auswählen" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Bildparameter bearbeiten..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Bild deaktivieren" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Bild aktivieren" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Bilder aktivieren" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Bilder deaktivieren" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Kontrollpunkte" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2520,12 +2560,26 @@ msgid "Did you know..." msgstr "Wussten Sie..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" +"Sie haben nur eine Raw-Datei ausgewählt. Dies wird nicht empfohlen.\n" +"Alle Raw-Dateien sollten auf einmal konvertiert werden." + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "Trotzdem konvertieren" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Version %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2533,70 +2587,70 @@ "Schwerwiegender Installationsfehler.\n" "Die Datei data/splash.png wurde nicht gefunden in:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Hilfe" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Aktionen" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "Aus&gabe" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Benutzerdefinierte Ausgabesequenz: \"%s\"" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Benutzerdefinierte Ausgabesequenzen" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Bearbeiten" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "Benutzerdefinierter Assistent: %s" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "Benutzerdefinierter Assistent" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Gestartet" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimieren" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Belichtung" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "Änderungen am Projekt vor dem Öffnen eines anderen Projektes sichern?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "Änderungen am Projekt vor dem Beginn eines neuen Projektes sichern?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "Änderungen am Projekt vor dem Schließen sichern?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2604,7 +2658,7 @@ "Alle Änderungen seit dem letzten Speichern gehen verloren, wenn Sie jetzt " "ein anderes Projekt laden." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2612,7 +2666,7 @@ "Alle Änderungen seit dem letzten Speichern gehen verloren, wenn Sie jetzt " "ein neues Projekt beginnen." -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2620,40 +2674,40 @@ "Alle Änderungen seit dem letzten Speichern gehen verloren, wenn Sie jetzt " "ohne zu speichern das Programm beenden." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Nicht speichern" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Schließen ohne zu speichern" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Erzwungenes Beenden" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "Projekt %s gespeichert." -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Panorama Stitcher" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Panorama-Editor" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2666,35 +2720,35 @@ "\n" "(Fehler-Code: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "PTmender-Skriptdatei speichern" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender-Dateien (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Öffne Projekt: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekt geöffnet" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "Ladevorgang abgebrochen" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Fehler beim Öffnen des Projekts: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Projekt laden" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2706,11 +2760,11 @@ "geöffnet werden.\n" "Soll diese Bilddatei stattdessen zum aktuellen Projekt hinzugefügt werden?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Projekt laden abgebrochen" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2721,7 +2775,7 @@ "Dies ist kein gültiges Bild.\n" "Die Datei wird aus dem Projekt entfernt." -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2733,32 +2787,32 @@ "zugreifbaren Laufwerk.\n" "Die Datei wird aus dem Projekt entfernt." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Konnte Projektdatei %s nicht öffnen." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Papywizard XML-Datei öffnen" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Papywizard XML-Dateien (*.xml)|*.xml|Alle Dateien (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Projekt-Template auswählen" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Alle Punkte feinjustieren" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Feinjustieren" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2788,23 +2842,23 @@ "Benutzen Sie die Kontrollpunktliste (F3) um alle Punkte des aktuellen " "Projekts zu sehen.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Ergebnis der Feinjustierung" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Kontrollpunkte werden aus maskierten Bereichen entfernt" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Python-Skript auswählen" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python-Skript (*.py)|*.py|Alle Dateien (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2813,13 +2867,13 @@ "Datei \"%s\" nicht gefunden.\n" "Datei wurde evtl. umbenannt, verschoben oder gelöscht." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Fehler!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2827,43 +2881,45 @@ "Celeste Modell-Datei in %s erwartet, aber nicht gefunden, Hugin muss korrekt " "installiert werden." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Konnte Celeste-Modelldatei %s nicht öffnen." # Doesn’t “vignetting center shift” in source text refer to two different parameters (vignetting AND center shift)? -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -"Zur Standard-Ansicht kann nicht umgeschaltet werden. Das Projekt verwendet " -"Stapel und/oder Versatz des Vignettierungs-Zentrum.\n" -"Solche Eigenschaften werden von der Standard-Ansicht nicht unterstützt." +"Zur Standard-Benutzeroberfläche kann nicht umgeschaltet werden. Das Projekt " +"verwendet Stapel und/oder Versatz des Vignettierungs-Zentrum.\n" +"Diese Funktionen werden von der Standard-Benutzeroberfläche nicht " +"unterstützt." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -"Zur Standard-Ansicht kann nicht umgeschaltet werden. Das Projekt verwendet " -"Translation oder Scherungs-Parameter.\n" -"Solche Parameter werden von der Standard-Ansicht nicht unterstützt." +"Zur Standard-Benutzeroberfläche kann nicht umgeschaltet werden. Das Projekt " +"verwendet Translation oder Scherungs-Parameter.\n" +"Solche Parameter werden von der Standard-Benutzeroberfläche nicht " +"unterstützt." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -"Zur Fortgeschrittenen-Ansicht kann nicht umgeschaltet werden. Das Projekt " -"verwendet Translation oder Scherungs-Parameter.\n" -"Solche Parameter werden von der Fortgeschrittenen-Ansicht nicht unterstützt." +"Zur erweiterten Benutzeroberfläche kann nicht umgeschaltet werden. Das " +"Projekt verwendet Translation oder Scherungs-Parameter.\n" +"Diese werden von der erweiterten Benutzeroberfläche nicht unterstützt." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." @@ -2871,11 +2927,11 @@ "Die Assistent-Befehlssequenz ist leer. Dies weist auf einen Fehler in der " "benutzerdefinierten Assistentendatei hin." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Starte Assistenten" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2884,12 +2940,12 @@ "vertikale Linien im Panorama-Editor hinzu und optimieren Sie das Projekt " "manuell." -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Warnung, %d unverbundene Bildgruppen gefunden:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2901,7 +2957,7 @@ "\n" "Drücken Sie danach noch einmal die Ausrichten-Schaltfläche." -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2909,23 +2965,23 @@ "Der Assistent hat nicht erfolgreich abgeschlossen. Bitte überprüfen Sie die " "erzeugte Projektdatei." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Projektdatei nicht gefunden" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "PTBatcherGui kann nicht gestartet werden" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Falsches Programm wurde gestartet" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Masken-Art" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2933,29 +2989,29 @@ "Klicks mit der linken Maustaste erstellen eine Polygonmaske, ein Klick auf " "die rechte Maustaste setzt den letzten Punkt." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Maske speichern" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Masken-Dateien (*.msk)|*.msk|Alle Dateien (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Maske laden" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Maske laden abbrechen" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Konnte Maske der Datei %s nicht analysieren." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Bitte eine gültige Zahl eingeben" @@ -3103,7 +3159,7 @@ msgstr "Fotometrische Ausrichtung" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Laden der Bilder" @@ -3147,63 +3203,67 @@ msgid "Photometric optimization finished" msgstr "Fotometrische Optimierung abgeschlossen" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Einzelne Bilder hinzufügen..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "Mehrere Raw-Dateien auswählen" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Serie zeitlich abfolgender Bilder hinzufügen..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Keine passenden Bilder gefunden." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Bildparameter manipulieren..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Löschen ausgewählter Bilder" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Positionsanker festlegen" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Belichtungsanker festlegen" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Neues Objektiv" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Objektiv ändern..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Neue Objektivnummer eingeben" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Objektiv-Nr." -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Objektivnummer ändern" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Lade Objektiv aus der Objektiv-Datenbank" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Objektivparameter aus einer Datei laden" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3212,12 +3272,12 @@ "Sollen die geladenen Parameter auf alle Bilder angewendet werden, die das " "selbe Objektiv verwenden?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Frage" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3228,100 +3288,100 @@ "führen.\n" "Einstellungen trotzdem verwenden?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Objektivparameter in ini-Datei speichern" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Kontrollpunkte entfernen" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Ausgewählte Bilder haben keine Kontrollpunkte." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "%lu Kontrollpunkte wirklich löschen?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Kontrollpunkte löschen" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Kontrollpunkte säubern" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Säubere Kontrollpunkte" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Paarweises Prüfen" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Kontrolliere das ganze Projekt" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Säubern beendet" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Entferne Kontrollpunkte aus Wolkenbereichen" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Ausgewählte Einstellungen zurücksetzen..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Positionen zurücksetzen" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Translations-Parameter zurücksetzen" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Objektiv-Parameter zurücksetzen" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Fotometrische Parameter zurücksetzen" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Neuer Stapel" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Stapel ändern..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Neue Stapel-Nummer eingeben" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Stapel-Nr." -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Stapel-Nummer ändern" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Stapel-Größe einstellen..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Qualität:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3391,47 +3451,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff, flächentreu" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "Die Breite muss eine ganze Zahl größer als 0 sein." -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "Die Höhe muss eine ganze Zahl größer als 0 sein." -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "Die linke Begrenzung muss kleiner sein als die rechte." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Die obere Begrenzung muss kleiner sein als die untere." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" -msgstr "Optionen noch nicht implementiert." +msgstr "Optionen noch nicht implementiert" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" -msgstr "Optionen noch nicht implementiert." +msgstr "Optionen noch nicht implementiert" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Optionen für dieses HDRMerge Programm sind noch nicht verfügbar" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Konnte temporäre Projektdatei nicht erzeugen." -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" -msgstr "Bitte Namensanfang eingeben: " +msgstr "Bitte Namensanfang eingeben" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3440,15 +3500,15 @@ "Sie haben keine Schreibberechtigung für den Ordner \"%s\".\n" "Bitte wählen Sie einen anderen Ordner für die endgültige Ausgabe." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Benutzerdefinierte Ausgabesequenz wählen" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Benutzerdefinierte Ausgabesequenz|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3463,7 +3523,7 @@ "Verringern Sie die Bildgröße auf dem Zusammenfügen-Reiter oder wählen Sie " "TIF oder PNG als Ausgabeformat." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3477,7 +3537,7 @@ "dieser Größe kann eine lange Zeit und eine große Menge Speicher in Anspruch " "nehmen." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3490,19 +3550,19 @@ "Sollte das zu groß sein, können die Abmessungen des Panoramas oder der " "Beschnittbereich verkleinert werden." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Sind Sie sicher, dass Sie so ein großes Panorama erzeugen wollen?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Trotzdem zusammenfügen" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Korrigieren" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3512,7 +3572,7 @@ "Bitte Einstellungen überprüfen, damit wenigstens ein Bild in diesem Bereich " "ist." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3543,127 +3603,142 @@ #: hugin1/hugin/PapywizardImport.cpp:464 msgid "Connecting overlapping images" -msgstr "Verbinde alle überlappenden Bilder." +msgstr "Verbinde alle überlappenden Bilder" #: hugin1/hugin/PluginItems.cpp:71 msgid "Miscellaneous" msgstr "Sonstiges" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "System-Voreinstellung" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baskisch" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Katalanisch" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Chinesisch (traditionell)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Tschechisch" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Dänisch" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Niederländisch" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Englisch" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Französisch" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Deutsch" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Ungarisch" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italienisch" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japanisch" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polnisch" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugiesisch (Brasilien)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Russisch" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovakisch" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spanisch" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Schwedisch" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finnisch" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valencianisch (Südkatalanisch)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Enblend auswählen" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Anwendungen (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Enfuse auswählen" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "dcraw auswählen" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "RawTherapee-cli auswählen" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Darktable-cli auswählen" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 hugin1/hugin/xrc/pref_dialog.xrc:1085 +#: hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "ExifTool Argfile auswählen" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool Argfiles (*.arg)|*.arg|Alle Dateien(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3672,14 +3747,14 @@ "Datei %s existiert nicht.\n" "Soll das Argfile mit Standard-Tags erstellt werden?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool Argfile" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3687,18 +3762,18 @@ "Keine Datei ausgewählt.\n" "Soll ein Argfile mit Standard-Tags erstellt werden?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Neues ExifTool Argfile auswählen" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Konnte Datei \"%s\" nicht speichern." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3707,7 +3782,7 @@ "Datei %s existiert nicht.\n" "Soll ein leeres beispielhaftes Argfile erstellt werden?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3715,25 +3790,25 @@ "Keine Datei ausgewählt.\n" "Soll ein beispielhaftes Argfile erstellt werden?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "Möchten Sie die angezeigten Einstellungen wirklich\n" "auf die Voreinstellungen zurücksetzen?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Auf Grundeinstellungen zurücksetzen" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Bitte erst einen Eintrag auswählen" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Wählen Sie einen Eintrag" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3741,30 +3816,30 @@ "Sie können die letzte Einstellung nicht löschen.\n" "Mindestens eine Einstellung ist erforderlich." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Wollen Sie wirklich die Kontrollpunkt-Detektor Einstellung \"%s\" entfernen?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Lösche Einstellung für Kontrollpunkt-Detektor" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Lade Einstellung für Kontrollpunkt-Detektor" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Kontrollpunkt-Detektor-Einstellungen (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Speichere Einstellungen für Kontrollpunkt-Detektor" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3792,50 +3867,54 @@ msgid "Remove %lu control points" msgstr "Entferne %lu Kontrollpunkte" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panoramavorschau" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Vorschauoptionen" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Projektion:" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Überblendmodus:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Ausgabe:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Dynamikbereichkompression:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Projektionsparameter" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Linke Maustaste: Mittelpunkt wählen; rechter Maustaste: Punkt auf den " "Horizont bewegen." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Panorama zentrieren mit der linken Maustaste, Horizont setzen mit der " @@ -3854,7 +3933,7 @@ msgid "Click a connection to edit control points." msgstr "Eine Verbindung anklicken, um Kontrollpunkte zu bearbeiten." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3865,30 +3944,127 @@ "Fehler: %s\n" "Eine Ursache könnte ein fehlerhaftes oder fehlendes Bild sein." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Programm \"%s\" wurde nicht gefunden. Bitte vorhandenes Programm in " +"Voreinstellungen angeben." + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Programm \"%s\" wurde nicht im PATH-Variable gefunden. Bitte vollständigen " +"and gültigen Pfad für Programm in Voreinstellungen angeben." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Prozessiere: %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "Aktualisiere EXIF-Daten der Datei %s" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Bearbeitungsprofile \"%s\" wurde nicht gefunden.\n" +"Bitte geben Sie ein vorhandenes Bearbeitungsprofil an oder lassen Sie das " +"Feld leer, um RT-Standardwerte zu verwenden" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Importiere Raw-Bilder" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Kann Ausgabe der Konvertierung des Referenzbildes nicht lesen.\n" +"Weitere Bilder können daher nicht prozessiert werden." + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Schließen" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Warnung: Lesefehler" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Die folgenden Dateien werden übersprungen da die Metadaten dieser Dateien " +"nicht gelesen werden konnten." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Warnung: Raw-Dateien von verschiedenen Kameras" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"Die folgenden Bilder wurden mit einer anderen Kamera aufgenommen.\n" +"Die Raw-Konvertierung funktioniert nur für Bilder von der gleichen Kamera." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" +"Mindestens eine Raw-Datei konnte nicht erfolgreich konvertiert werden.\n" +"Diese Bilder werden ignoriert." + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Wähle Standard-RT-Bearbeitungsprofil" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "RT-Bearbeitungsprofile|*.pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Verzeichnis '%s' existiert nicht" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Konnte Umgebungsvariable PYTHONHOME nicht setzen" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Stapelverarbeitung öffnen" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" "Öffnet PTBatcher, das Stapelverarbeitungsprogramm für Hugins Projektdateien." -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Objektiv-Kalibrierung öffnen" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "Öffnet Calibrate_lens_gui, ein einfaches GUI zur Objektiv-Kalibrierung" @@ -3903,11 +4079,11 @@ "Eventuell wurde es nicht richtig installiert oder in den Voreinstellungen " "wurde ein falscher Pfad eingetragen." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "Temporäre keypoint-Dateien löschen" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3916,15 +4092,15 @@ "Bitte verwenden Sie %namefile, %i oder %s, um die Dateien für den " "Kontrollpunkt-Detektor festzulegen" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Fehler im Befehl für den Kontrollpunkt-Detektor" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3936,14 +4112,14 @@ "Bitte wählen Sie weniger Bilder aus oder verschieben Sie\n" "die Bilder in einen Ordner mit kürzerem Pfadnamen." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Zu viele Bilder ausgewählt" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3955,38 +4131,38 @@ "\n" "Konnte folgenden Befehl nicht ausführen: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Ausführungsfehler" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Suche Kontrollpunkte" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Konnte den Befehl nicht ausführen: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3995,9 +4171,9 @@ "Befehl: %s\n" "ist fehlgeschlagen mit Fehlercode: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4012,13 +4188,13 @@ "\n" "Ausgeführter Befehl: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Fehlfunktion des Kontrollpunkt-Detektors" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4026,7 +4202,7 @@ "Bitte %i für die Angabe der Bilddaten und %k zur Bezeichnung der keypoint-" "Datei für den Schritt der Merkmals-Erzeugung verwenden" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4034,11 +4210,11 @@ "Bitte verwende %k für die Festlegung der keypoint-Dateien und %o zur " "Festlegung der resultierenden Projekt-Datei für den Abgleichungs-Schritt" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "Erstelle Merkmale-Datei" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4052,11 +4228,11 @@ "\n" "Konnte folgenden Befehl nicht ausführen: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Standard" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4064,255 +4240,255 @@ "Die laufende Stapelverarbeitung kann nicht gelöscht werden.\n" "Wollen Sie sie abbrechen?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Stapelverarbeitung gelöscht." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Fehler: Konnte Status nicht ermitteln, Projekt mit Index %d ist nicht in der " "Liste." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Fehler: Stapelverarbeitungsdatei konnte nicht geladen werden." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Stapelverarbeitung erfolgreich beendet." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Stapelverarbeitung mit Fehlern beendet." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Leite das Herunterfahren ein..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Rechner wird heruntergefahren..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Ruhezustand vorbereiten..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Leite den Ruhezustand ein..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Standbymodus vorbereiten..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Leite den Standbymodus ein..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Projektdatei auswählen" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Keine Namensanfang angegeben" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Keine Projektdatei angegeben" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Zusammenfügen" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Assistent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Fehler beim Entfernen, das Projekts mit ID %d ist nicht in der Liste." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Fehler: Konnte Projektdatei nicht löschen" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Starte Stapelverarbeitung..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI fügt Bilder zusammen" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Stapelverarbeitung läuft schon." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Führe Befehl \"%s\" aus" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Wird jetzt zusammengefügt: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Wird jetzt erfasst: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Fehler: Konnte Status nicht setzen, Projekt mit Index %d ist nicht in der " "Liste." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Mache nicht viel..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Die Befehlstaste wurde gedrückt." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Die ctrl-Taste wurde gedrückt." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Soll das Laden der Batch-Warteschlange übersprungen werden?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Nichts tun" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI schliessen" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Computer herunterfahren" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Computer in Standbymodus versetzen" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Computer in Ruhezustand versetzen" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Geben Sie das Kommandazeilenprogramm an, das ausgeführt werden soll:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Programm angeben" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Geben Sie einen Ordner an, um darin Projekte zu suchen" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Projektdatei(en) angeben" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Projekte hinzugefügt aus Verzeichnis %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Projekt %s der Stapelverarbeitungsliste hinzugefügt." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Projekt %s der Assistenten-Warteschlange hinzugefügt." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Stapelverarbeitung angehalten" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugins Stapelverarbeitung" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Bitte Namensanfang eingeben" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "" "Der Namensanfang eines Assistenten-Eintrages kann nicht geändert werden." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Bitte ein Projekt auswählen" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Bitte nur ein Projekt auswählen" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" -msgstr "Geben Sie die Stapelverarbeitungsdatei zum Öffnen an:" +msgstr "Geben Sie die Stapelverarbeitungsdatei zum Öffnen an" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Stapelverarbeitungsdateien (*.ptb)|*.ptb;|Alle Dateien (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Kann Projekt nicht in Hugin öffnen." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Kein Projekt gewählt. Hugin ohne Projekt öffnen?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Stapelverarbeitung angehalten" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Hugin's Stapelverarbeitung pausiert" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Setze Stapelverarbeitung fort..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Hugin's Stapelverarbeitung wird ausgeführt" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4320,7 +4496,7 @@ "Es befinden sich fehlgeschlagene Projekte in der Liste.\n" "Sollen sie auch entfernt werden?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4328,16 +4504,16 @@ "Kann ein Projekt in Bearbeitung nicht entfernen.\n" "Wollen Sie es abbrechen?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Projekt %s entfernt" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Bitte wählen Sie ein Projekt zum Entfernen" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4345,16 +4521,16 @@ "Kann Projekt in Bearbeitung nicht zurücksetzen.\n" "Wollen Sie es abbrechen?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Projekt %s zurückgesetzt" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Bitte wählen Sie ein Projekt zum Zurücksetzen" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4362,15 +4538,15 @@ "Kann Projekte in Bearbeitung nicht zurücksetzen.\n" "Wollen Sie die Stapelverarbeitung abbrechen?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" -msgstr "Geben Sie die Stapelverarbeitungsdatei zum Speichern an:" +msgstr "Geben Sie die Stapelverarbeitungsdatei zum Speichern an" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Stapelverarbeitungsdatei (*.ptb)|*.ptb;|Alle Dateien (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4380,15 +4556,15 @@ "Dies kann negative Auswirkungen auf die Leistung haben.\n" "Sollte der Stapelwarteschlange nun gelöscht?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Liste jetzt löschen" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Liste behalten" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Stapelverarbeitung wird gestartet" @@ -4424,7 +4600,7 @@ msgid "E&xit" msgstr "Be&enden" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4434,11 +4610,11 @@ "Wenn Sie den Dialog schließen, gehen diese gefundenen Panoramen verloren.\n" "Trotzdem fortfahren?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Angenommen" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4448,11 +4624,11 @@ "Wenn Sie fortfahren, werden sie nicht berücksichtigt.\n" "Wollen Sie immer noch fortfahren?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Stop" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4461,7 +4637,7 @@ "Verzeichnis %s existiert nicht.\n" "Bitte geben Sie ein existierendes Verzeichnis an." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4469,7 +4645,7 @@ "Sie haben kein mögliches Panorama gewählt.\n" "Bitte wählen Sie wenigstens ein Panorama und versuchen Sie es noch einmal." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4479,139 +4655,139 @@ "Vielleicht haben Sie keine Schreibrechte für diese Verzeichnisse oder die " "Festplatte ist voll." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Entferne Bild aus dem Projekt" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Teile hier in zwei Panoramen auf" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Lade Datei %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Start" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "%d mögliche Panoramen gefunden." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Keine möglichen Panoramen gefunden" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d Bilder: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Fehler in der Komandozeile." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI gestartet" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Warte" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "In Bearbeitung" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Vollständig" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Fehlgeschlagen" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Datei fehlt" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pausiert" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Namensanfang/Präfix" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Status" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Zuletzt geändert" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Ausgabeformat" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projektion" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Größe" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Fehler, kann ID nicht konvertieren" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 hugin1/hugin/xrc/pref_dialog.xrc:362 #: hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Präfix ändern" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Projekt zurücksetzen" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Mit Hugin bearbeiten" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Entfernen" @@ -4647,16 +4823,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Log-Dateien (*.log)|*.log|Alle Dateien (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Konnte benutzerdefinierte Ausgabesequenz \"%s\" nicht finden." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Projektdatei auswählen" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4667,7 +4843,7 @@ "Dateinamen eingeben." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Über Hugin" @@ -4700,19 +4876,18 @@ msgstr "System" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4793,8 +4968,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Auswählen ..." @@ -4887,7 +5065,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Optionen" @@ -4913,16 +5091,12 @@ #: hugin1/hugin/xrc/batch_frame.xrc:400 msgid "Start date (duration):" -msgstr "Beginn (Dauer)" +msgstr "Beginn (Dauer):" #: hugin1/hugin/xrc/batch_frame.xrc:437 msgid "Send selected panoramas to queue" msgstr "Gewählte Panoramen in die Warteschlange schicken." -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Schließen" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Suche Panoramen" @@ -5019,12 +5193,12 @@ msgstr "In &Infobereich minimieren" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Beenden" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Anwendung beenden" @@ -5129,69 +5303,178 @@ msgid "adddir" msgstr "Ordner hinzufügen" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "Vorheriges Bildpaar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Beschreibung:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "Nächstes Bildpaar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Typ:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "Modus:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Alle Bilder auf einmal" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "vert. Linie" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama mit Stapeln" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "horiz. Linie" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Mehrzeiliges Panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Mehrzeiliges Panorama mit Stapeln" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "In Fenster einpassen" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Ausgerichtetes Panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Feinjustierung" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Kontrollpunkt-Detektor" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Versucht den momentan aktiven Punkt zu optimieren" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Einstufiger Detektor" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "Au&tomatisch feinjustieren" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programm:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "Automatisch hinzufügen" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumente:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "" -"Kontrollpunkt automatisch hinzufügen, wenn der zweite Punkt ausgewählt wurde." +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Temporäre Dateien entfernen:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "Automatisch &schätzen" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Zweistufiger Detektor" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"Die Verschiebung der Bilder wird geschätzt und zur Positionierung eines " -"Kontrollpunktes im jeweils anderen Bild verwendet." +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Objekterkennung:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Merkmalsverknüpfung:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Stapel-Detektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Nicht ausfüllen, wenn kein Kontrollpunkt-Detektor für Stapel verwendet " +"werden soll." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Erweiterte Option" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Diese Einstellung hat keine erweiterten Optionen." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Folgende Platzhalter werden vor dem Aufruf ersetzt:\n" +"%o -- Ausgabeprojekt (0.oto wird angehängt, wenn Autopano benutzt wird)\n" +"%p -- Anzahl der Kontrollpunkte pro Bildpaar\n" +"%v -- Hor. Bildwinkel des ersten Bildes\n" +"%f -- Projektion des ersten Bildes (0 bis 4, wie in PanoTools)\n" +"%i -- Bilddateien\n" +"%namefile -- Datei, die die Bilddateinamen enthält\n" +"%s -- zu verwendendes PanoTools-Skript\n" +"%k -- als Zwischenergebnis generierte Merkmals-Datei(en) (key)" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parameter für Kontrollpunkt-Detektoren" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "Vorheriges Bildpaar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "Nächstes Bildpaar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "Modus:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "vert. Linie" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "horiz. Linie" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "In Fenster einpassen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Feinjustierung" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Versucht den momentan aktiven Punkt zu optimieren" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "Au&tomatisch feinjustieren" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "Automatisch hinzufügen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "" +"Kontrollpunkt automatisch hinzufügen, wenn der zweite Punkt ausgewählt wurde." + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "Automatisch &schätzen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"Die Verschiebung der Bilder wird geschätzt und zur Positionierung eines " +"Kontrollpunktes im jeweils anderen Bild verwendet." #: hugin1/hugin/xrc/cp_editor_panel.xrc:288 msgid "&Delete" @@ -5223,7 +5506,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Löschen" @@ -5231,155 +5514,186 @@ msgid "Select by Distance" msgstr "Auswahl nach Abstand" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Beschreibung:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Warnung: Ungültige Dateinamen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Typ:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"Die folgenden Dateien existieren bereits.\n" +"Sie werden während der Raw-Konvertierung überschrieben.\n" +"Sollen diese Dateien überschrieben werden?" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (von A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Ja" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Alle Bilder auf einmal" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Nein" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama mit Stapeln" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "PanoramaTools-Skript bearbeiten" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Mehrzeiliges Panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Dieses Skript wird an die PanoramaTools-Engine gesendet. Das Bearbeiten " +"dieser Zeilen ist für fortgeschrittene Nutzer gedacht." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Mehrzeiliges Panorama mit Stapeln" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Mit diesen Änderungen fortfahren" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Ausgerichtetes Panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Änderungen verwerfen und abbrechen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Kontrollpunkt-Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Gruppieren nach:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Einstufiger Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimale Überlappung:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programm:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Minimale Überlappung für die Erkennung des Ausgabe-Stapels\n" +"Mit -1 werden die im Projekt zugewiesenen Stapel verwendet." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumente:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maximale Ev-Differenz:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Temporäre Dateien entfernen:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maximale EV-Differenz für die Erkennung von Ausgabe-Ebenen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Zweistufiger Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Anzeige" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Objekterkennung:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Allgemein" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Merkmalsverknüpfung:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF Daten" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Stapel-Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Bild-Position" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Nicht ausfüllen, wenn kein Kontrollpunkt-Detektor für Stapel verwendet " -"werden soll." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Objektivparameter" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Erweiterte Option" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Fotometrische Parameter" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Diese Einstellung hat keine erweiterten Optionen." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Objektivtyp" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Bilder hinzufügen..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Objektivtyp:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Formatfaktor:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Abgleich von Merkmalen" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Einstellung:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -"Folgende Platzhalter werden vor dem Aufruf ersetzt:\n" -"%o -- Ausgabeprojekt (0.oto wird angehängt, wenn Autopano benutzt wird)\n" -"%p -- Anzahl der Kontrollpunkte pro Bildpaar\n" -"%v -- Hor. Bildwinkel des ersten Bildes\n" -"%f -- Projektion des ersten Bildes (0 bis 4, wie in PanoTools)\n" -"%i -- Bilddateien\n" -"%namefile -- Datei, die die Bilddateinamen enthält\n" -"%s -- zu verwendendes PanoTools-Skript\n" -"%k -- als Zwischenergebnis generierte Merkmals-Datei(en) (key)" +"Wende den ausgewählten Kontrollpunkt-Detektor bei den markierten Bildern an" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parameter für Kontrollpunkt-Detektoren" +#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 +#: hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimieren" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometrisch:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Ungültige Dateinamen" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Berechnen" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometrisch:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Ausgewähltes Bild" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "PanoramaTools-Skript bearbeiten" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Objektivdaten laden..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Dieses Skript wird an die PanoramaTools-Engine gesendet. Das Bearbeiten " -"dieser Zeilen ist für fortgeschrittene Nutzer gedacht." +"Horizontalen Bildwinkel (HFOV) oder Brennweite und Verlängerungsfaktor " +"angeben:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Mit diesen Änderungen fortfahren" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Änderungen verwerfen und abbrechen" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "Grad" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Kamera- und Objektivdaten" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Gierwinkel (Yaw):" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Nickwinkel (Pitch):" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Rollwinkel (Roll):" @@ -5387,34 +5701,11 @@ msgid "Translation parameter" msgstr "Translations-Parameter" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Bild-Position" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "Bildwinkel (v):" @@ -5514,7 +5805,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Hilfe" @@ -5558,8 +5849,8 @@ msgstr "Laden" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Speichern" @@ -5571,122 +5862,44 @@ msgid "Manipulate image variables" msgstr "Bildparameter manipulieren" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Gruppieren nach:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimale Überlappung:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimale Überlappung für die Erkennung des Ausgabe-Stapels" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maximale Ev-Differenz:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maximale EV-Differenz für die Erkennung von Ausgabe-Ebenen" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Anzeige" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Allgemein" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF Daten" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Objektivparameter" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Fotometrische Parameter" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Objektivtyp" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Bilder hinzufügen..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Objektivtyp:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Formatfaktor:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Abgleich von Merkmalen" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Einstellung:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "" -"Wende den ausgewählten Kontrollpunkt-Detektor bei den markierten Bildern an" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimieren" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometrisch:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Berechnen" - -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometrisch:" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Ausgewähltes Bild" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Objektivdaten laden..." - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "" -"Horizontalen Bildwinkel (HFOV) oder Brennweite und Verlängerungsfaktor " -"angeben:" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "Grad" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" +msgstr "WB-Referenz:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "dcraw" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "Zusätzliche Argumente für dcraw:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Bearbeitungsprofil:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "Um RT-Standardwerte zu verwenden, lassen Sie dieses Feld leer" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "darktable" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "Raw-Konverter" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Kamera- und Objektivdaten" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importieren" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5834,14 +6047,6 @@ msgid "Don't ask again" msgstr "Nicht wieder fragen" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Ja" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Nein" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5906,21 +6111,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importiere Positionen aus Papywizard XML-Datei" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Rückgängig" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Letzte Aktion rückgängig machen" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "Wieder&herstellen" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Letzte Aktion wiederholen" @@ -5962,12 +6167,12 @@ msgid "Use only normal control points in optimization." msgstr "Verwende nur normale Kontrollpunkte beim Optimieren." -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimieren" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Optimierung mit aktuellen Einstellungen wiederholen" @@ -5995,15 +6200,15 @@ msgid "Run a python script" msgstr "Ein Python-Skript ausführen" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Ansicht" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "Bildschirm&füllend" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Zeigt Hugins Hauptfenster bildschirmfüllend an" @@ -6079,19 +6284,19 @@ msgid "Show the Stitcher panel" msgstr "Zeige den Reiter \"Zusammenfügen\"" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "&Standard" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" -msgstr "&Fortgeschritten" +msgstr "&Erweitert" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" -msgstr "&Experte" +msgstr "E&xperte" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "Benutzer&oberfläche" @@ -6111,86 +6316,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "Zusammenfügen mit einer benutzerdefinierten Ausgabesequenz" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Einige Informationen über verschiedene Funktionen und so weiter." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Tipp des Tages" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Tipp des Tages anzeigen" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Tasten&kürzel" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "Tastaturkürzel" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Häufig gestellte Fragen" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Über" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Einstellungen" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Neu" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Neues Projekt erstellen" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "Ö&ffnen..." #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Projekt öffnen" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Speichern" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Aktuelles Projekt speichern" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Speichern &unter..." #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Projekt unter neuem Namen speicheren" @@ -6206,18 +6411,18 @@ "Schreibe das aktuelle Projekt in eine PTStitcher-kompatible Skriptdatei, " "nützlich zur Stapelverarbeitung" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "&Zuletzt benutzte Projekte" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Liste der zuletzt verwendeten Projekt-Dateien" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Stapelve&rarbeitung starten" @@ -6304,7 +6509,7 @@ msgid "Show the OpenGL preview image" msgstr "Zeigt das OpenGL-Vorschaufenster" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Vorschaufenster" @@ -6361,15 +6566,10 @@ msgstr "Bereich bei allen Bildern mit diesem Objektiv ausschliessen" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Speichern" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Laden" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopieren" @@ -6552,7 +6752,7 @@ #: hugin1/hugin/xrc/optimize_photo_panel.xrc:92 msgid "Image variables:" -msgstr "Bildparameter" +msgstr "Bildparameter:" #: hugin1/hugin/xrc/optimize_photo_panel.xrc:115 msgid "Camera and Lens variables:" @@ -6562,39 +6762,39 @@ msgid "Interpolator (i):" msgstr "Interpolation:" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly 3 (Bikubisch)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilinear" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Pixelwiederholung" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Approximation der Werte zwischen den Quellpixeln" @@ -6624,7 +6824,7 @@ msgid "Enfuse options" msgstr "Optionen für Fusion" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Bildwinkel:" @@ -6791,10 +6991,6 @@ msgid "Image fusion:" msgstr "Fusion:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "Enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR-Verbindung:" @@ -6898,15 +7094,15 @@ msgid "Output parameters" msgstr "Ausgabe-Parameter" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Überblendmodus:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "harter Übergang (schneller)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "weicher Übergang" @@ -6976,27 +7172,40 @@ msgid "This affects the control points editor and mask editor." msgstr "Diese Einstellung betrifft den Kontrollpunkt- und Maskeneditor." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "dcraw-Anwendung:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(für System-Voreinstellung leer lassen)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "RT-cli-Anwendung:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "darktable-cli-Anwendung:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Dateioptionen" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Temp-Verzeichnis:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(für System-Voreinstellung leer lassen)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Standardname der Projektdatei:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Standard Namensanfang der Ausgabedateien:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7027,45 +7236,45 @@ "%lens - Objektiv (des ersten Bildes)\n" "%projectname - Name der Projekt-Datei (nur für Ausgabe-Prefix)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Standard-Dateinamen" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Dateinamen" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Bilder laden" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Bilder nach dem Laden automatisch ausrichten" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Vertikale Linien ermitteln" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" "Erkennt in den Bildern vertikale Linien, mit denen das Panorama ausgerichtet " "werden kann." -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Entferne Kontrollpunkte in wolkenähnlichen Bereichen (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Optionale Arbeitsschritte" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Automatische Ausrichtung" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7073,67 +7282,67 @@ "Anzahl der Kontrollpunkte\n" "je Überlappung:" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Fertiges Panorama skalieren auf" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "Prozent der maximalen Breite" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Kontrollpunkte-Editor" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR- und 16-Bit-Darstellung" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" -msgstr "Kennlinie:" +msgstr "Kennlinie" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "Linear" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "Logarithmisch" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "Gamma von 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "(nur für Bildanzeige)" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Musterbreite:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "Pixel" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Suchbereichsbreite:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "Prozent der Bildbreite" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Lokale Suchbereichsbreite:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Korrelationsschwellwert:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7141,11 +7350,11 @@ "0: keine Ähnlichkeit\n" "1: maximale Ähnlichkeit" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Krümmungschwellwert:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7153,116 +7362,112 @@ "0: Kein Maximum\n" "0,2: ausgeprägtes Maximum" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Rotationssuche" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Rotationssuche verwenden (langsamer, aber genauer)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Startwinkel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Endwinkel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Schritte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Kontrollpunkt-Detektoren" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Kontrollpunkt-Detektoren" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Neu..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Bearbeiten..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Nach oben" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Nach unten" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Als Standard verwenden" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Der Assistent verwendet die hier als Standard definierte Einstellung." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Ausgabeformat" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Standard-Dateiformat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "Standard-Ausgabeformat für das abschliessende Panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF-Komprimierung:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "Standard-TIFF-Komprimierung" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG-Qualität:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "Einstellung für Standard-JPEG-Komprimierung" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Blender" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Standard-Blender:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Standard-Blender, der für neue Projekte verwendet wird." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Prozessor" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Die das Zusammenfügen ausführende Engine" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Aufträge zum Zusammenfügen sofort ausführen" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7272,20 +7477,20 @@ "sofort fortsetzen. Andernfalls wird die Prozesssteuerung in Wartestellung " "gestartet und der Anwender muss die Abarbeitung manuell starten." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Existierende Dateien überschreiben" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" "ACHTUNG: existierende Dateien werden ohne weitere Rückfrage überschrieben." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Ausführliche Fortschrittsanzeige" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7293,19 +7498,19 @@ "Aktivieren, um detaillierte Informationen zu erhalten; nützlich für die " "Meldung von Fehlern oder einfach, um den Projektfortschritt zu verfolgen." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Zusammenfügen" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Metadaten mit Hilfe von ExifTool in die fertigen Dateien kopieren" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Optionen für ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7319,7 +7524,7 @@ "Um ein beispielhaftes Argfile zu erstellen, lassen Sie die Textfelder leer " "und drücken Sie \"Bearbeiten ...\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7327,19 +7532,19 @@ "Das folgende Argfile wird verwendet, um Informationen aus dem ersten Bild in " "alle Zwischenbilder zu kopieren." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Als Zwischenergebnis generiertes ExifTool Argfile:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Für Standard-Einstellung leer lassen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Ausgewähltes ExifTool Argfile bearbeiten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7350,29 +7555,29 @@ "Es wird zusätzlich zu dem oben angebebenen Argfile für die " "Zwischenergebnisse angewendet." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Abschliessendes ExifTool Argfile:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Erstelle Photo Sphere XMP Daten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" "Dies wird nur bei der Ausgabe von sphärischen (Equirectangular) Bildern " "angewendet." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Fortgeschrittene Optionen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Anzahl der Threads:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7384,47 +7589,47 @@ "Dieser Wert sollte maximal der Anzahl an Prozessoren oder Prozessorkernen " "entsprechen, die auf dem System verfügbar sind." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "Für automatische Erkennung auf '0' belassen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Zusammenfügen (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Standard Interpolator (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Beschnittene Bilder als Standard verwenden" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Verwende Grafikkarte für Berechnungen (EXPERIMENTELL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "Verwende GPU für Berechnungen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Verwendet die Grafikkarte, um Berechnungen zu beschleunigen." -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Alternative Enblend-Anwendung verwenden" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Anwendung:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Argumente:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Dies sind die Standard-Argumente für neue Projekte.\n" "Sie können für einzelne Projekte im \"Zusammenfügen\"-Reiter abgeändert " @@ -7432,35 +7637,35 @@ "Die Argumente -w, -o und --compression sollten nicht verwendet werden, da " "diese von Hugin gesetzt werden." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Alternative Enfuse-Anwendung verwenden" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Anwendung:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programme" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste-Parameter" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM-Schwelle:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7468,19 +7673,19 @@ "größer als 0,5: weniger empfindlich\n" "weniger als 0,5: empfindlicher" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor-Filter-Größe" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "klein" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "groß" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7488,7 +7693,7 @@ "Groß ist genauer\n" "Klein kann Kontrollpunkte untersuchen, die näher am Bildrand liegen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7499,76 +7704,76 @@ "Um die Geschwindigkeit zu erhöhen, werden nur einige zufällige Punkte im " "Überlappungsbereich benutzt." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Anzahl der Punkte pro Bild: " -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Fotometrische Optimierung" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Warnungen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Zeige Hinweis zur Speicherung von Projektdatei und Ausgabepräfix" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Zeige Warnung über grosse Belichtungsunterschiede beim Hinzufügen von Bildern" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Nach Kontrollpunkt-Werkzeug" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Nachfragen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Panorama neu optimieren" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Panorama nicht optimieren" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Kontrollpunkt-Werkzeug (KP-Tool im Schnellen Vorschaufenster)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Verschiedenes" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Hugin - Voreinstellungen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -"Diese Argfile wird wie folgt verwendet\n" +"Diese Argfile wird wie folgend verwendet\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "ExifTool Argfile bearbeiten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -"Diese Argfile wird wie folgt verwendet\n" +"Diese Argfile wird wie folgend verwendet\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7604,11 +7809,11 @@ "\n" "Bei den Platzhaltern wird Groß- und Kleinschreibung beachtet." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Vorschau horizontal zentrieren" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Zentrieren" @@ -7616,13 +7821,13 @@ msgid "Show the whole panorama" msgstr "Zeige das gesamte Panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Bildwinkel ermitteln" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Einpassen" @@ -7630,7 +7835,7 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automatische Ausrichtung eines gebogenen Horizonts" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Ausrichten" @@ -7729,33 +7934,33 @@ "Legt den Belichtungswert des Panoramas auf die mittlere Belichtung aller " "Bilder fest." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Grau-Pipette" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Globalen Weißabgleich durch die Auswahl eines neutralgrauen Bereichs " "korrigieren." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "KP-Tool" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Erstelle oder lösche Kontrollpunkte im ausgewählten Bereich." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Hintergrund:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Skalierung:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7769,154 +7974,142 @@ "* Klicken Sie auf eine Linie, um die damit verbundenen Bilder zur " "Bearbeitung im Kontrollpunkte-Reiter zu öffnen." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Layout" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Hilfslinien:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Drittel-Regel" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Goldener Schnitt" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Einfache Diagonalen" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Diagonalmethode" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Goldenes Dreieck (abwärts)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Goldenes Dreieck (aufwärts)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automatische Ausrichtung eines gebogenen Horizonts." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Ziehen-Methode:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Übernehmen" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Panorama verschieben oder Bilder zurechtrücken" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Bewegen/Ziehen" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Setze das grösste mit Bildern ausfüllte Rechteck als Beschnittfläche." -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "Automatischer HDR-Beschnitt" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Setze das grösste mit Bilder-Stapeln ausfüllte Rechteck als Beschnittfläche." -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "Links:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "Oben:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "Rechts:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "Unten:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Beschnitt auf den maximal möglichen Bereich zurücksetzen" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Die Beschnittfläche des Panoramas ändern" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Panorama-&Editor" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "Ü&bersicht" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Zeigt die Übersicht der Panorama-Sphäre." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "&Gitter" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Blendet ein Raster ein." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "&Alle Bilder" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "Bild mit &mittlerer Belichtung von jedem Stapel" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "&Hellstes Bild jedes Stapels" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "&Dunkelstes Bild jedes Stapels" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "Ausgewählte Bilder &beibehalten" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "Auswahl &zurücksetzen" @@ -8005,7 +8198,7 @@ "Wenn Sie alternative Kontrollpunkt-Detektoren gegenüber Hugins eingebautem " "bevorzugen, stehen Einstellungen unter Einstellungen -> Kontrollpunkt-" "Detektoren zur Verfügung. Sie müssen diese Detektoren allerdings separat " -"installieren, falls Sie das noch nicht getan haben. " +"installieren, falls Sie das noch nicht getan haben." #: hugin1/hugin/xrc/data/tips.txt:10 msgid "" @@ -8229,6 +8422,93 @@ "verwendet werden und ausserdem viele, gleichmäßig verteilte Kontrollpunkte " "vorhanden sind." +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "" +#~ "Bitte fügen Sie mindestens ein Raw-Bild zur Liste hinzu bevor Sie die " +#~ "Konvertierung starten." + +#~ msgid "Import Raw Files" +#~ msgstr "Importiere Raw-Dateien" + +#~ msgid "(WB reference)" +#~ msgstr "(WB-Referenz)" + +#~ msgid "Images" +#~ msgstr "Bilder" + +#~ msgid "Add image(s)..." +#~ msgstr "Bilder hinzufügen..." + +#~ msgid "Add other images to list" +#~ msgstr "Fügt weitere Bilder zur Liste hinzu" + +#~ msgid "Remove image" +#~ msgstr "Bild entfernen" + +#~ msgid "Remove selected image from list" +#~ msgstr "Entfernt ausgewählte Bilder von der Liste" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "Markiere aktuelles Bild als Referenz für den Weißabgleich" + +#~ msgid "Converter settings" +#~ msgstr "Einstellungen für Konverter" + +#~ msgid "Import &raw file(s)..." +#~ msgstr "Importiere &Raw-Datei..." + +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "" +#~ "Konvertiert Raw-Datei ins TIFF-Format und fügt diese dem aktuellen " +#~ "Projekt hinzu" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Panorama verschieben oder Bilder zurechtrücken" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Die Beschnittfläche des Panoramas ändern" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Verwende Grafikkarte für Berechnungen (EXPERIMENTELL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Alle Bilddateien|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;" +#~ "*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" +#~ "*.EXR|JPEG-Dateien (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF-Dateien " +#~ "(*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG-Dateien (*.png)|*.png;*.PNG|" +#~ "HDR-Dateien (*.hdr)|*.hdr;*.HDR|EXR-Dateien (*.exr)|*.exr;*.EXR|Alle " +#~ "Dateien (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (von A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "Enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Benutzeroberfläche" @@ -9260,9 +9540,6 @@ #~ msgid "Flatfield" #~ msgstr "Flatfield" -#~ msgid "Image file:" -#~ msgstr "Bilddatei:" - #~ msgid "Polynomial" #~ msgstr "Polynom" @@ -9491,9 +9768,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#~ msgid "&Import Project..." -#~ msgstr "Importiere Projekt..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9591,10 +9865,6 @@ #~ "Autopano-SIFT nicht gefunden. Bitte gültigen Pfad in den Einstellungen " #~ "angeben." -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "" -#~ "\"%s\" nicht gefunden. Bitte gültigen Pfad in den Einstellungen angeben." - #~ msgid "Error in Autopano command" #~ msgstr "Fehler im Autopano-Kommando" @@ -9690,9 +9960,6 @@ #~ msgid "PTStitcher note" #~ msgstr "PTStitcher-Anmerkung" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "PTStitcher auswählen" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "Keine PTStitcher auswählt" @@ -9964,9 +10231,6 @@ #~ "c\n" #~ "d" -#~ msgid "Remove this image" -#~ msgstr "Dieses Bild entfernen" - #~ msgid "Crop..." #~ msgstr "Crop..." @@ -10034,9 +10298,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend:" -#~ msgid "Additional Arguments:" -#~ msgstr "Zusätzliche Argumente:" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "Die Argumente -w und -o werden automatisch von Hugin hinzugefügt." diff -Nru hugin-2018.0.0+dfsg/src/translations/en_GB.po hugin-2019.0.0+dfsg/src/translations/en_GB.po --- hugin-2018.0.0+dfsg/src/translations/en_GB.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/en_GB.po 2019-02-17 15:24:33.000000000 +0000 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: en_GB\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2013-09-16 20:52+0100\n" "Last-Translator: Gareth Jones \n" "Language-Team: British English \n" -"Language: British English\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: British English\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 #: hugin1/hugin/PapywizardImport.cpp:460 @@ -43,14 +43,14 @@ msgid "Searching for best crop..." msgstr "" -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -73,9 +73,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "" @@ -107,7 +107,7 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -117,24 +117,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "" @@ -155,8 +159,8 @@ msgstr "" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "" @@ -187,11 +191,13 @@ msgid "builtin" msgstr "built-in" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "" @@ -213,16 +219,16 @@ msgid "Error loading lens parameters" msgstr "" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "" @@ -254,22 +260,23 @@ msgid "Error pausing process %ld, code 2" msgstr "" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "" @@ -303,12 +310,12 @@ msgid "Panorama Tools" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "" @@ -318,8 +325,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "" @@ -333,313 +340,323 @@ msgid "Could not create temporary file" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" "%s" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" "%s" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Optimising Panorama" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Exposure optimisation" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -647,35 +664,67 @@ msgid "Lens" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -683,20 +732,11 @@ "again." msgstr "" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -708,27 +748,27 @@ msgstr "" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "" @@ -744,7 +784,7 @@ msgid "Could not save information into database." msgstr "Could not initialise database." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -752,11 +792,11 @@ "Abort" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -765,7 +805,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -776,77 +816,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -854,41 +894,41 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -896,48 +936,49 @@ "Press OK to remove." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" "current project contains %d images\n" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -965,7 +1006,7 @@ "Please check the image again, if you selected the correct images." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "" @@ -978,9 +1019,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -995,7 +1036,7 @@ msgstr "" #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "" @@ -1006,11 +1047,11 @@ "parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimising lens distortion parameters..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1020,230 +1061,235 @@ "Please run \"Find lines\" and \"Optimise\" before saving the lens data. If " "there are no lines found, change the parameters." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1251,121 +1297,127 @@ "preferences." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" "enter a higher number." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "" @@ -1377,29 +1429,29 @@ msgid "Could not process event!" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "" @@ -1464,60 +1516,60 @@ "drag or ctrl-drag." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "" @@ -1525,83 +1577,88 @@ msgid "Overview" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Mean error after optimisation: %.1f pixel, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1609,75 +1666,75 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1685,14 +1742,14 @@ "space." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" "Cylindrical projection preserves vertical lines, unlike equirectangular." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1700,7 +1757,7 @@ "easier on the eye." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1708,40 +1765,40 @@ "field of view and still have a reasonable coverage of the middle." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" "If you want to see the bar again, activate the bar in the preferences again." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1749,24 +1806,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1775,27 +1832,27 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1803,7 +1860,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1811,7 +1868,7 @@ "Error initialising GLEW\n" "Fast preview window can not be opened." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -1852,7 +1909,7 @@ msgstr "" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "" @@ -1885,7 +1942,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "" @@ -2062,7 +2119,7 @@ msgid "Shutter speed" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "" @@ -2209,93 +2266,93 @@ msgid "Camera response parameter" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2328,132 +2385,144 @@ msgid "Did you know..." msgstr "" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" msgstr "" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimiser" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2462,35 +2531,35 @@ "(Error code: %s)" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2498,11 +2567,11 @@ "Do you want to add this image file to the current project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2510,7 +2579,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2518,32 +2587,32 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2570,47 +2639,47 @@ "\n" "Use the Control Point list (F3) to see all points of the current project\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" "Maybe file was renamed, moved or deleted." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2620,42 +2689,42 @@ "vignetting centre shift.\n" "These features are not supported in simple interface." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2663,57 +2732,57 @@ "After adding the points, press the \"Align\" button again" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "" @@ -2851,7 +2920,7 @@ msgstr "" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "" @@ -2895,174 +2964,178 @@ msgid "Photometric optimization finished" msgstr "Photometric optimisation finished" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" "Apply settings anyway?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "" -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3132,62 +3205,62 @@ msgid "Hammer-Aitoff Equal Area" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3197,7 +3270,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3206,7 +3279,7 @@ "a long time and a large amount of memory." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3214,26 +3287,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3263,209 +3336,225 @@ msgid "Miscellaneous" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3490,49 +3579,53 @@ msgid "Remove %lu control points" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Left click to define new centre point, right click to move point to horizon." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "Centre panorama with left mouse button, set horizon with right button" @@ -3549,7 +3642,7 @@ msgid "Click a connection to edit control points." msgstr "" -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3557,29 +3650,111 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3591,26 +3766,26 @@ "settings." msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " "point detector" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3618,14 +3793,14 @@ "a shorter pathname" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3633,47 +3808,47 @@ " Could not execute command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" "failed with error code: %d" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3683,29 +3858,29 @@ "Executed command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3714,328 +3889,328 @@ " Could not execute command: %s" msgstr "" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Initialising shut-down..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Initialising shut-down..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Initialising shut-down..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Shut-down when done" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "" @@ -4071,7 +4246,7 @@ msgid "E&xit" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4081,35 +4256,35 @@ "If you close the dialogue, you will lose them.\n" "Continue anyway?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" "Do you still want to continue?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" "Please give an existing directory." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4119,140 +4294,142 @@ "Maybe you have no write permission for these directories or your disk is " "full." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "Optimising Panorama" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "" @@ -4281,16 +4458,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "" -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4298,7 +4475,7 @@ msgstr "" #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "" @@ -4331,19 +4508,19 @@ msgstr "" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "" @@ -4421,8 +4598,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "" @@ -4508,7 +4688,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "" @@ -4540,10 +4720,6 @@ msgid "Send selected panoramas to queue" msgstr "" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "" @@ -4637,12 +4813,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "" @@ -4746,60 +4922,158 @@ msgid "adddir" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Pre-aligned panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Tries to optimise the currently active point" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Clean-up arguments:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Tries to optimise the currently active point" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "" #: hugin1/hugin/xrc/cp_editor_panel.xrc:275 msgid "" @@ -4837,7 +5111,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "" @@ -4845,175 +5119,190 @@ msgid "Select by Distance" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Pre-aligned panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Clean-up arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" msgstr "" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimise" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 -msgid "Yaw:" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 -msgid "Pitch:" +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 -msgid "Roll:" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:54 -msgid "Translation parameter" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "" + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 -msgid "Z:" +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:15 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 +msgid "Yaw:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:28 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 +msgid "Pitch:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:41 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 +msgid "Roll:" +msgstr "" + +#: hugin1/hugin/xrc/image_variable_dlg.xrc:54 +msgid "Translation parameter" +msgstr "" + +#: hugin1/hugin/xrc/image_variable_dlg.xrc:95 +#: hugin1/hugin/xrc/preview_frame.xrc:808 +msgid "Z:" msgstr "" #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 @@ -5115,7 +5404,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "" @@ -5155,8 +5444,8 @@ msgstr "" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "" @@ -5168,118 +5457,43 @@ msgid "Manipulate image variables" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimise" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" msgstr "" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 @@ -5421,14 +5635,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5486,21 +5692,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "" @@ -5539,12 +5745,12 @@ msgid "Use only normal control points in optimization." msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimise" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Re-run the optimiser with current settings" @@ -5572,15 +5778,15 @@ msgid "Run a python script" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "" @@ -5658,19 +5864,19 @@ msgid "Show the Stitcher panel" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "" @@ -5690,86 +5896,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Keyboard Short-cuts" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "keyboard short-cuts" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "" @@ -5783,18 +5989,18 @@ "batch processing" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "" @@ -5879,7 +6085,7 @@ msgid "Show the OpenGL preview image" msgstr "" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "" @@ -5936,15 +6142,10 @@ msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "" @@ -5988,8 +6189,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6092,7 +6293,8 @@ msgid "execute the PTOptimizer engine" msgstr "" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "" @@ -6134,39 +6336,39 @@ msgid "Interpolator (i):" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Nearest neighbour" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "" @@ -6194,7 +6396,7 @@ msgid "Enfuse options" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "" @@ -6339,10 +6541,6 @@ msgid "Image fusion:" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "" @@ -6439,15 +6637,15 @@ msgid "Output parameters" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "" @@ -6513,27 +6711,40 @@ msgid "This affects the control points editor and mask editor." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 -msgid "File Options" +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 -msgid "Temporary dir:" +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 +msgid "File Options" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:261 +msgid "Temporary dir:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6551,271 +6762,267 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " "has to start the processing manually." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -6824,52 +7031,52 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -6877,102 +7084,102 @@ "available in your system" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -6982,73 +7189,73 @@ "values in the overlapping areas.\n" "To speed up the computation, only a random subset of points is used." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Photometric optimiser" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "Optimising Panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "Optimise now!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7068,11 +7275,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centre the preview horizontally" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centre" @@ -7080,13 +7287,15 @@ msgid "Show the whole panorama" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "" @@ -7094,7 +7303,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "" @@ -7188,31 +7398,31 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Grey picker" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Correct global white-balance by selecting a neutral grey area." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7224,153 +7434,141 @@ "* Green, yellow and red lines indicate good, medium and poor alignment.\n" "* Click a line to edit the associated images in the Control Points tab." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "" diff -Nru hugin-2018.0.0+dfsg/src/translations/es.po hugin-2019.0.0+dfsg/src/translations/es.po --- hugin-2018.0.0+dfsg/src/translations/es.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/es.po 2019-02-17 15:24:33.000000000 +0000 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: hugin\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2016-07-22 22:27+0100\n" "Last-Translator: gautxori\n" "Language-Team: Español \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "X-Generator: Poedit 1.7.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -50,9 +50,9 @@ msgid "Searching for best crop..." msgstr "Buscando el mejor recorte..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" @@ -60,7 +60,7 @@ "del sistema" # No se ha encontrado el programa externo %s definido en las preferencias. Volviendo a la versión empaquetada. -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -88,9 +88,9 @@ msgstr "mapa de bits (*.bmp)|*.bmp|Fichero PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "El archivo %s existe. ¿Lo sobreescribo?" @@ -134,7 +134,7 @@ msgstr "El factor de recorte debe ser positivo." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -147,24 +147,28 @@ "¿Quieres usar ese valor tan alto?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -185,8 +189,8 @@ msgstr "Ojo de pez de marco completo" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirrectangular" @@ -217,11 +221,13 @@ msgid "builtin" msgstr "incluido" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "usuario (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineal" @@ -249,17 +255,17 @@ msgstr "Error al cargar los parámetros del objetivo" # Guardar archivo de los parámetros del objetivo -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Guardar en archivo los parámetros del objetivo" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "" "Archivos de proyecto de objetivos (*.ini)|*.ini|Todos los archivos (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Guardar proyecto" @@ -296,22 +302,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Error al pausar el proceso %ld, código 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Cancelar" @@ -348,13 +355,13 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "No se ha podido abrir el proyecto:" # no se ha podido abrir el script: %s -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "no se pudo abrir el script: %s" @@ -364,8 +371,8 @@ msgid "Project %s does not contain any active images." msgstr "El proyecto %s no contiene imágenes activas." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "error al revisar el script de panotools: %s" @@ -380,17 +387,17 @@ msgid "Could not create temporary file" msgstr "No se ha podido crear el archivo temporal" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "La cola está vacía. Esto nunca debería suceder" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Error durante el ensamblado" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -398,11 +405,11 @@ "¿Sobreescribir las imágenes existentes?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Sobreescribir las imágenes existentes" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -411,12 +418,12 @@ "Error al ensamblar el proyecto\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Error durante el proceso de asistencia" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -425,288 +432,298 @@ "Error al ejecutar el asistente\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Ensamblando panorámica..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Plataforma:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Versión:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "Carpeta de trabajo:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "Prefijo de salida:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Mezclador:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Mezclador desconocido (fallo en enblend --version)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "Error interno" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Fusión de exposición:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "fusión de exposición desconocida (fallo en enfuse --version)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Versión ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "FALLIDO" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "Número de imágenes activas:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "Valor de exposición de salida %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "Tamaño de lienzo: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "CdV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Proyección:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "Usar GPU para remapeo:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "verdadero" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "falso" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Salida de la panorámica:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Exposición corregida, rango dinámico bajo" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Exposición fusionada desde las pilas" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Exposición fusionada a partir de cualquier ajuste" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Rango dinámico alto" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Imágenes remapeadas:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Sin corrección de exposición, rango dinámico bajo" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Pilas combinadas:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Pilas fusionadas de exposición" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Capas:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Capas mezcladas de exposición similar, sin corrección de exposición" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "primera imagen de entrada" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "Número:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Nombre del archivo:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "Tamaño: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "Tipo de respuesta:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "CdvH: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "Exposición (Eev): %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Remapeando y fusionando imágenes LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "Remapeando imágenes LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "Fusionando imágenes..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Remapeando imágenes LDR y fusionando capas de exposición..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "Remapeando imágenes LDR, sin corrección de exposición" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "Capa de exposición de salida %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fusionando todas las capas de exposición..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "Fusionando pila número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Fusionando todas las pilas..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "Remapeando imágenes HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "Combinando pila HDR número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Fusionando pilas HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Actualizando metadatos..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Ensamblando usando \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "primera imagen" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "última imagen" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "carpeta" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Fabricante de la cámara" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Modelo de la cámara" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -714,35 +731,69 @@ msgid "Lens" msgstr "Objetivo" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "proyección desconocida" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Tamaño de la imagen:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Leyendo archivo %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Error" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -754,26 +805,11 @@ "Hugin no puede gestionar estos nombres de archivo. Renombre sus archivos e " "inténtelo de nuevo." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Informe de depuración generado en \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Todos los archivos de imágenes|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." -"TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." -"HDR;*.exr;*.EXR|Archivos JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|" -"Archivos TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Archivos PNG (*.png)|" -"*.png;*.PNG|Archivos HDR (*.hdr)|*.hdr;*.HDR|Archivos EXR (*.exr)|*.exr;*." -"EXR|Todos los archivos (*)|*" - # Respuesta de Cámara #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format @@ -786,27 +822,27 @@ msgstr "La entrada «%s» no es un número válido." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Advertencia" @@ -827,7 +863,7 @@ # No se ha podido decodificar la imagen:\n # %s\n # Interrumpiendo -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -838,11 +874,11 @@ "%s\n" "Interrumpiendo" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Formato de imagen no compatible" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -854,7 +890,7 @@ "Hugin no soporta este tipo de imagen. Saltando esta imagen.\n" "Convierte la imagen en escala de gris e inténtalo de nuevo." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -870,13 +906,13 @@ "Hugin no soporta este tipo de imagen. Saltando esta imagen.\n" "Convierte la imagen en escala de gris e inténtalo de nuevo." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin sólo soporta imágenes RGB y en escala de gris (con y sin canal alfa)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -885,7 +921,7 @@ "El fichero \"%s\" es una imagen en escala de gris, pero otras imágenes en el " "proyecto son en color." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -894,7 +930,7 @@ "la imagen \"%s\" es en color, pero otras imágenes en el proyecto son en " "escala de gris." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 #, fuzzy msgid "" "Hugin does not support this mixing. Skipping this image.\n" @@ -904,7 +940,7 @@ "Hugin no soporta esta combinación. Saltando esta imagen.\n" "Convierte la imagen en escala de gris e inténtalo de nuevo." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -913,7 +949,7 @@ "El fichero \"%s\" no tiene perfil icc embebido, pero otras imágenes del " "proyecto tienen embebido el perfil \"%s\"" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -922,7 +958,7 @@ "El fichero \"%s\" tiene el perfil icc \"%s\" embebido, pero otras imágenes " "del proyecto no tienen embebido perfil icc" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -931,7 +967,7 @@ "El fichero \"%s\" tiene el perfil icc \"%s\" embebido, pero otras imágenes " "del proyecto tienen embebido el perfil \"%s\"" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -939,7 +975,7 @@ "Hugin espera todas las imágenes con el mismo perfil de color.\n" "Por favor convierte todas las imágenes al mismo perfil e inténtalo de nuevo" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -947,7 +983,7 @@ "Hugin ha detectado pilas de imágenes conteniendo las imágenes añadidas y " "asignará los números de pila correspondientes a las imágenes." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -957,12 +993,12 @@ "números de pila conforme a la detección. Se sobreescribirán las asignaciones " "de pila existentes." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 #, fuzzy msgid "Should the position of images in each stack be linked?" msgstr "¿Se deberían vincular las posiciones de las imágenes en cada pila?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -975,45 +1011,45 @@ "posición (por ejemplo al sujetar la cámara con la mano), entonces no vincule " "las posiciones." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "Vincular posiciones" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "No vincular las posiciones" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "No asignar pilas" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "Mantener las pilas existentes" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "No se encontró el archivo de la imagen" # Selecciona el editor de imagen -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Seleccione el editor de imagen" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -1024,16 +1060,17 @@ "\n" "Pulse Aceptar para eliminarlos." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Se detectó un error" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Añadir imágenes" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -1043,33 +1080,33 @@ "el proyecto actual contiene %d imágenes\n" # No se ha podido aplicar la plantilla -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "No se pudo aplicar la plantilla" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Error al cargar archivo del proyecto" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultado" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "No se ha encontrado el directorio xrc en el paquete" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Error fatal" # No se ha encontrado el directorio xrc, hugin debe estar bien instalado\n -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1104,7 +1141,7 @@ "añadidas.\n" "Compruebe de nuevo si añadió las imágenes correctas." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Añadir imagen: cancelar" @@ -1118,9 +1155,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1137,7 +1174,7 @@ msgstr "Buscando líneas..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Finalizado" @@ -1151,164 +1188,164 @@ "Ejecute «Buscar líneas» antes. Cambie los parámetros si no se encuentra " "ninguna línea." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimizando los parámetros de distorsión del objetivo..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " "there are no lines found, change the parameters." msgstr "" "No existe ninguna línea detectada.\n" -"Ejecute «Buscar líneas» y «Optimizar» antes de guardar los datos del " -"objetivo. Cambie los parámetros si no se encuentra ninguna línea." +"Ejecute «Buscar líneas» y «Optimizar» antes de guardar los datos del objetivo. " +"Cambie los parámetros si no se encuentra ninguna línea." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Guardando datos del objetivo en el archivo «ini»" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "Guardar los parámetros en la base de datos de «lensfun»" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Guardando datos del objetivo" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Guardar objetivo" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Guardar archivo de proyecto" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Archivos de proyectos (*.pto)|*.pto|Todos los archivos (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 #, fuzzy msgid "Removing temporary files..." msgstr "Eliminando los archivos temporales ..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "muestra este mensaje de ayuda" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "ejecutar el asistente" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "ejecutar el ensamblado en el projecto dado" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "Número de hebras:" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 #, fuzzy msgid "prefix used for stitching" msgstr "prefijo usado para el ensamblado" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "usar los comandos definidos por el usuario en el fichero dado" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 #, fuzzy msgid "use user defined assistant commands in given file" msgstr "usar los comandos definidos por el usuario en el fichero dado" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "solo imprimir comandos" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Sitema operativo: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arquitectura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "Memoria libre: %1ld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Código de página activa: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Versión: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Ruta a los recursos: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Ruta a los datos: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "Datos de la cámara y objetivo: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi-hilo usando C++11 std::thread y OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "Perfil del monitor: %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Bibliotecas" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano de http://autopano.kolor.com no está disponible para OS X" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Usando Autopano-Sift en su lugar" # Al menos un campo de entrada está vacío.\nPor favor, comprueba tus datos. -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1316,88 +1353,93 @@ "Al menos un campo de entrada está vacío.\n" "Por favor, compruebe sus datos." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Intente conectar todas las imágenes que se solapan." # Sólo trabaja sobre pares de imágenes sin puntos de control. -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Sólo trabaje sobre pares de imágenes sin puntos de control." # Elije programa detector de puntos de control -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Elija programa detector de puntos de control" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Ejecutables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "izquierda x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "izquierda y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "derecha x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "derecha y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Alineamiento" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distancia" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "añadido nuevo punto de control" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "buscando puntos similares..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Error durante el ajuste fino" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"El punto se ha ajustado, ángulo %.0f grados, coeficiente de correlación: " -"%0.3f, curvatura: %0.3f %0.3f " +"El punto se ha ajustado, ángulo %.0f grados, coeficiente de correlación: %" +"0.3f, curvatura: %0.3f %0.3f " # cambia puntos o pulsa el botón derecho del ratón para añadir el par -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "cambie puntos, o pulse el botón derecho del ratón para añadir el par" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "El punto estimado está fuera de la imagen" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "No se encontró un punto similar." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1407,7 +1449,7 @@ # Comprueba la similitud visualmente.\n # El coeficiente de correlación (%.3f) es menor al umbral establecido en las preferencias. -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1418,34 +1460,40 @@ "El coeficiente de correlación (%.3f) es menor que el umbral establecido en " "las preferencias." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Añadir una línea nueva" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Línea %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Umbral de correlación:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "línea vert." -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "línea horiz." # Crear puntos de control.\n # Para crear menos puntos,\n # introduce un número mayor. -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1455,40 +1503,40 @@ "Para crear menos puntos,\n" "introduzca un número mayor." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Umbral de detección de esquina" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Crear puntos de control" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Escala de detección de esquina" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Error al crear los puntos de control:\n" # Elije un punto de la imagen derecha -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Seleccione un punto en la imagen de la derecha" # Elije un punto de la imagen izquierda -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Seleccione un punto de la imagen de la izquierda" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Crear pto control (Conf. actual: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1496,36 +1544,36 @@ "No se puede ejecutar Celeste sin al menos un punto de control que conecte " "ambas imágenes" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Ejecutando Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Cargando archivo modelo" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Eliminados %lu puntos de control" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Resultado de Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Limpiando" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Crear pto control" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1533,20 +1581,21 @@ "Crear puntos de control para el par de imágenes con el detector de puntos de " "control en la pestaña de fotos." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Intenta quitar puntos de control de nubes" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Limpiar ptos de control" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Quitar los puntos de control periféricos por método estadístico" @@ -1558,26 +1607,26 @@ msgid "Could not process event!" msgstr "¡No se pudo procesar el evento!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Img. izq." # Img. der. -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Img. dcha." -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" # Introduce el error mínimo de los puntos de control.\n # Se seleccionará todo punto con un error mayor -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1586,7 +1635,7 @@ "Se seleccionará todo punto con un error mayor" # Elije puntos de control -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Elija puntos de control" @@ -1671,62 +1720,62 @@ "o gira alrededor del eje óptico arrastrando, junto con el botón derecho o " "pulsando ctrl." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Vista previa rápida de la panorámica" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Archivo" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "imágenes mostradas" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Todo" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Ninguna" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Ocultar" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "CdVV" # arrastra para cambiar el campo de visión vertical -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "arrastre para cambiar el campo de visión vertical" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "CdVH" # arrastra para cambiar el campo de visión horizontal -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "arrastre para cambiar el campo de visión horizontal" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Vista previa" @@ -1734,86 +1783,91 @@ msgid "Overview" msgstr "Vista general" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "" "Restablece los parámetros de la proyección a sus valores predeterminados." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "parám:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "No existe ninguna imagen cargada." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu imágenes cargadas." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Las imágenes están conectadas por %lu puntos de control.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Se encontraron %lu grupos de imágenes no conectadas: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Las imágenes o los puntos de control han cambiado, se necesita una nueva " "alineación." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Error medio después de la optimización: %.1f píxel, máx: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectilínea" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cilíndrica" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "El valor del guiñada debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "El valor de cabeceo debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "El valor de alabeo (giro alrededor del eje óptico) debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "El valor X debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "El valor Y debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "El valor Z debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "El valor debe ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1826,59 +1880,59 @@ "Debería restablecer esos valores?" # diferencia -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "diferencias" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autorecortar" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Calculando el recorte óptimo" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Arriba debe ser un entero mayor que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "izquierda debe ser un entero mayor que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "derecha debe ser un entero mayor que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "abajo debe ser un entero mayor que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "el límite izquierdo debe ser más pequeño que el derecho" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "el límite superior debe ser más pequeño que el inferior" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" -"Valor de CdVH no válido. El valor máximo del CdVH para esta proyección es " -"%lf." +"Valor de CdVH no válido. El valor máximo del CdVH para esta proyección es %" +"lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" -"Valor de CdVV no válido. El valor máximo del CdVV para esta proyección es " -"%lf." +"Valor de CdVV no válido. El valor máximo del CdVV para esta proyección es %" +"lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1886,7 +1940,7 @@ "Con un campo de visión amplio, las panorámicas con proyección rectilinea se " "estiran mucho hacia los bordes.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1894,16 +1948,16 @@ "Al ser el campo de visión muy amplio sólo en horizontal, prueba en su lugar " "una proyección cilíndrica." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Para una panorámica muy ancha inténte mejor la proyección equirectangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " También puede probar la proyección Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1915,7 +1969,7 @@ "Una proyección equirrectangular se ajustaría al mismo contenido en menos " "espacio vertical." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1926,7 +1980,7 @@ "La proyección cilíndrica preserva las líneas verticales, a diferencia de la " "equirrectangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1937,7 +1991,7 @@ "de ojo de pez. Preserva los ángulos alrededor de un punto, lo que la hace " "más agradable a la vista." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1949,7 +2003,7 @@ "La panorámica de ojo de pez la comprime, y la puedes adaptar a un campo de " "visión ancho teniendo una cobertura razonable en el medio." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1957,7 +2011,7 @@ "Configurar la panorámica a una proyección rectilínea mantendrá rectas las " "líneas rectas." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1967,27 +2021,27 @@ "de la proyección.\n" "Si quieres verla de nuevo actívala en las Preferencias." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaico" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaico, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Esfera panorámica" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Plano de mosaico" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1997,12 +2051,12 @@ "Se han eliminado %lu ptos de control de la panorámica.\n" "¿Reoptimizar ahora la panorámica?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "La estrategia de optimización actual es \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -2010,7 +2064,7 @@ "La región seleccionada no contiene imagen activa.\n" "Por favor selecciona una región cubierta por al menos 2 imágenes." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -2018,7 +2072,7 @@ "La región seleccionada la cubre una sola imagen.\n" "No se puede crear puntos de control para una sola imagen." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -2031,31 +2085,31 @@ "colaterales.\n" "¿Continuar?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "Buscando puntos de control" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "Procesando:" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Remapear la imagen a proyección panorámica..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "Casando puntos de interés..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "Comprobando los resultados..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -2065,7 +2119,7 @@ "Se han añadido %lu puntos de control.\n" "¿Re-optimizar?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -2073,7 +2127,7 @@ "Error al inicializar GLEW\n" "No se puede abrir la ventana de vista previa rápida." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 #, fuzzy msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " @@ -2119,7 +2173,7 @@ msgstr "Número de máscaras" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Recorte" @@ -2154,7 +2208,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "La máxima diferencia Ev debe ser mayor que 0" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Pilas" @@ -2350,7 +2404,7 @@ msgid "Shutter speed" msgstr "Velocidad del obturador" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2536,97 +2590,97 @@ msgid "Camera response parameter" msgstr "Parámetro de respuesta de la cámara" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "inactivo" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "activo" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "Objetivo %d" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr "Pila %d" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "Pila de salida %d" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Capa de exposición de salida %d" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Enlazar" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Desenlazar" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Seleccionar todas para el objetivo actual" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Deseleccionar todas para el objetivo actual" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Seleccionar todas para la pila actual" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Deseleccionar todas para la pila actual" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Seleccionar todas" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Deseleccionar todas" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Editar variables de imagen..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Guardar imagen" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Guardar imagen" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "imágenes mostradas" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Número de imágenes activas:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Puntos de control" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2661,14 +2715,26 @@ msgid "Did you know..." msgstr "¿Sabía que...?" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versión %s" # Error fatal de instalación\n # No se encontró archivo de datos/splash.png en: -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2676,78 +2742,78 @@ "Error fatal de instalación\n" "No se encontró data/splash.png en:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "Ay&uda" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Acciones" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "&Salida" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, fuzzy, c-format msgid "User defined sequence: %s" msgstr "" "No se puede abrir la secuencia de salida definida por el usuario \"%s\"." -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "" "No se puede abrir la secuencia de salida definida por el usuario \"%s\"." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Editar" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "" "No se puede abrir la secuencia de salida definida por el usuario \"%s\"." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "ejecutar el asistente" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Iniciado" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimizador" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Exposición" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "¿Guardar los cambios a la panorámica antes de cerrar?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "¿Guardar los cambios a la panorámica antes de cerrar?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "¿Guardar los cambios a la panorámica antes de cerrar?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2755,7 +2821,7 @@ msgstr "" "Si cierra sin guardar perderá los cambios desde la última vez que lo guardó" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2763,7 +2829,7 @@ msgstr "" "Si cierra sin guardar perderá los cambios desde la última vez que lo guardó" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " @@ -2772,40 +2838,40 @@ "Si cierra sin guardar perderá los cambios desde la última vez que lo guardó" # No Guardar -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "No guardar" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Cerrar sin guardar" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "salida forzada" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "proyecto %s guardado" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin: ensamblador de panorámicas" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Editor de panorámicas" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2818,36 +2884,36 @@ "\n" "(Código de error: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Guardar el archivo de script de PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Archivos PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Abrir proyecto: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Proyecto abierto" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Cargando imagen:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Error al abrir el proyecto: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Abrir un archivo de proyecto" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2858,11 +2924,11 @@ "No se puede abrir con Fichero, Abrir.\n" "¿Quieres añadir la imagen al proyecto actual?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Abrir proyecto: cancelar" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2870,7 +2936,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2878,30 +2944,30 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "No se ha podido abrir el proyecto %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Abrir un archivo Papywizard xml" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Archivos Papywizard xml (*.xml)|*.xml|All files (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Elegir plantilla de proyecto" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Ajuste fino de todos los puntos" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Ajuste fino" @@ -2914,7 +2980,7 @@ # serán puestos en 0\n # \n # Use la lista de puntos de control (F3) para ver todos los puntos del proyecto actual\n -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2943,23 +3009,23 @@ "Use la lista de puntos de control (F3) para ver todos los puntos del " "proyecto actual\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Resultado del ajuste fino" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Quitando puntos de control en las máscaras" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Seleccionar script Python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Script Python (*.py)|*.py|Todos los ficheros (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2969,13 +3035,13 @@ "Quizá renombró, movió o eliminó el archivo." # ¡Error! -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Error" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2983,12 +3049,12 @@ "No se encontró el archivo de modelo de Celeste %s; Hugin necesita que esté " "correctamente instalado." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "No se pudo cargar el archivo de modelo Celeste %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2998,7 +3064,7 @@ "desplazamiento del centro de viñeteado.\n" "Esas características no se soportan en la interfaz simple." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -3008,7 +3074,7 @@ "traslación o cizalladura.\n" "Esas características no se soportan en la interfaz simple." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -3018,29 +3084,29 @@ "traslación o cizalladura.\n" "Esas características no se soportan en la interfaz avanzada." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Ejecutando el asistente" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Atención, se encontraron %d grupos de imágenes no conectadas:" # Crea puntos de control entre las imágenes no conectadas usando la pestaña Puntos de control.\n -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -3053,7 +3119,7 @@ "\n" "Después de añadir los puntos, pulse de nuevo el botón \"Alinear\"" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -3061,24 +3127,24 @@ "El asistente no finalizó correctamente. Compruebe el resultado del archivo " "de proyecto." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "No se encontró el archivo de proyecto" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "No se puede iniciar PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 #, fuzzy msgid "Launched incorrect programme" msgstr "Se inició el programa incorrecto" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Tipo de máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -3086,30 +3152,30 @@ "Cree una máscada poligonal pulsando con el botón izquierdo del ratón, " "establezca el último punto con el botón derecho del ratón." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Guardar máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Archivos de máscara (*.msk)|*.msk|All files (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Cargar máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Cargar máscara: cancelar" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "No se pudo analizar la máscara del archivo %s." # Por favor, introduce un número válido -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Introduzca un número válido" @@ -3274,7 +3340,7 @@ msgstr "Alineamiento fotométrico" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Cargando imágenes" @@ -3318,68 +3384,72 @@ msgid "Photometric optimization finished" msgstr "La optimización fotométrica ha terminado" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Añadir imágenes individuales..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Añadir una serie temporal de imágenes..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "No se encontró ninguna imagen coincidente." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Editar variables de imagen..." # Eliminar la(s) imagen(es) elegida(s) -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Quitar la(s) imagen(es) elegida(s)" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Anclar esta imagen para la posición" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Anclar esta imagen para la exposición" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Objetivo nuevo" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Cambiar objetivo..." # Introduce un nuevo número de objetivo -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Introducir un nuevo número de objetivo" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Número de objetivo" # Cambia número de objetivo -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Cambiar número de objetivo" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "Cargar objetivo desde la base de datos Lensfun" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Cargar objetivo desde archivo «ini»" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3388,12 +3458,12 @@ "¿Se deben aplicar los parámetros cargados a todas las imágenes con el mismo " "objetivo?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Pregunta" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3404,106 +3474,106 @@ "inesperados.\n" "¿Aplico los resultados?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Guardar objetivo en archivo «ini»" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Quitar puntos de control" # Sólo trabaja sobre pares de imágenes sin puntos de control. -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 #, fuzzy msgid "Selected images have no control points." msgstr "Las imágenes seleccionadas no tienen puntos de control." # ¿Seguro que quieres eliminar %d puntos de control? -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "¿Seguro que quiere eliminar %lu puntos de control?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Eliminar los puntos de control" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Limpiar puntos de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Eliminando puntos de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Comprobando los pares" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Comprobando proyecto completo" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Finalizando la limpieza" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Quitar puntos de control en nubes" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Restablecer lo definido por el usuario..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Restablecer posiciones" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "Restablecer parámetros de traslación" # Parámetros del Objetivo -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Restablecer parámetros del objetivo" # Parámetros del Objetivo -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Restablecer parámetros fotométricos" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Pila nueva" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Cambiar pila..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Introduzca el nuevo número de pila" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "número de pila" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Cambiar el número de pila" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Establecer tamaño de pila..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Calidad:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3575,49 +3645,49 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Equiarea de Hammer-Aitoff" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "la anchura debe ser un entero mayor que 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "la altura debe ser un entero mayor que 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 #, fuzzy msgid "Left boundary must be smaller than right." msgstr "el límite izquierdo debe ser más pequeño que el derecho" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 #, fuzzy msgid "Top boundary must be smaller than bottom." msgstr "el límite superior debe ser más pequeño que el inferior" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " Aún no se han implementado las opciones de PTmender" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " Aún no se han implementado las opciones de PTblender" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " Las opciones para el programa HDRMerge aún no están implementadas" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "No se pudo crear el archivo de proyecto temporal" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Indicar prefijo de salida" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3626,16 +3696,16 @@ "No tiene permiso para escribir en la carpeta \"%s\".\n" "Seleccione otra carpeta para la salida final." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "Seleccionar salida definida por el usuario" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Salida definida por el usuario|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3650,7 +3720,7 @@ "Reduce el tamaño de lienzo en el panel de ensamblado o selecciona formatos " "TIF o PNG." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3663,7 +3733,7 @@ "y ensamble desde la pestaña de Ensamblador. Ensamblar una panorámica de este " "tamaño puede llevar mucho tiempo y una gran cantidad de memoria." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3675,19 +3745,19 @@ "\n" "Si es demasiado grande, reduce el tamaño de lienzo o el area de recorte." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "¿Está seguro de que quiere ensamblar una panorámica tan grande?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Ensamblar de todas formas" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Permíta que el programa lo arregle" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3697,7 +3767,7 @@ "Comprueba la configuración, de modo que al menos una imagen esté en la " "región de salida" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3735,126 +3805,144 @@ msgid "Miscellaneous" msgstr "Miscelánea" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Predeterminados del sistema" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Euskera" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalán" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Chino (simplificado)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Chino (tradicional)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Checo" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Danés" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holandés" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Inglés" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francés" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Alemán" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Húngaro" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiano" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japonés" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polaco" # Portugués (brasileño) -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasil)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Ruso" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Eslovaco" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Español" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Sueco" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finlandés" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valenciano (Catalán sureño)" # Selecciona Enblend -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Seleccionar Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Ejecutables (*.exe)|*.exe" # Selecciona Enfuse -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Seleccionar Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Seleccionar todas" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Seleccionar PTmender" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Seleccionar todas" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "Seleccionar argfile para ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Archivos ExifTool argfile (*.arg)|*.arg|Todos los archivos (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3863,14 +3951,14 @@ "El fichero %s no existe.\n" "¿Debería crearse el argfile con los tags por defecto?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool argfile" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3879,19 +3967,19 @@ "¿Crear un fichero argfile con los tags por defecto?" # Elije un punto de la imagen izquierda -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "Seleccione un nuevo argfile de ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "No se ha podido guardar el fichero \"%s\"." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, fuzzy, c-format msgid "" "File %s does not exist.\n" @@ -3900,7 +3988,7 @@ "El fichero %s no exite.\n" "¿Crear un fichero argfile vacío?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 #, fuzzy msgid "" "No file selected.\n" @@ -3910,28 +3998,29 @@ "¿Crear un fichero argfile vacío?" # ¿Deseas restablecer todas las preferencias mostradas a los valores predeterminados? -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "¿Desea restablecer todas las preferencias mostradas a los valores " "predeterminados?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Cargar predeterminados" # Por favor, selecciona una entrada primero -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Por favor, seleccione una entrada primero" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Seleccionar entrada" # No se puede borrar el último ajuste.\n # Al menos un ajuste es necesario. -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3939,30 +4028,30 @@ "No se puede borrar el último ajuste.\n" "Al menos un ajuste es necesario." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "¿Realmente quiere quitar el ajuste de detección de puntos de control «%s»?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Eliminar ajuste de detección de puntos de control" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Cargar ajustes de detección de puntos de control" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Ajustes de detección de puntos de control (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Guardar ajustes de detección de puntos de control" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3991,44 +4080,49 @@ msgid "Remove %lu control points" msgstr "Eliminar %lu puntos de control" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Vista previa de la panorámica" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opciones de vista previa" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "proyección (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Modo de fundido:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Salida:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Compresión:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parámetros de proyección" # Pulsa con el botón izquierdo para definir un nuevo punto central, pulsa con el botón derecho para mover el punto al horizonte. -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" @@ -4036,7 +4130,7 @@ "el botón derecho para mover el punto al horizonte." # Centra la panorámica con el botón izquierdo, establece el horizonte con el derecho -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centre la panorámica con el botón izquierdo, establezca el horizonte con el " @@ -4059,7 +4153,7 @@ msgid "Click a connection to edit control points." msgstr "Pulse una conexión para editar los puntos de control." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -4067,32 +4161,118 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "No se encontró \"%s\". Indique una ruta válida en las preferencias" + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "No se encontró \"%s\". Indique una ruta válida en las preferencias" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Detectando ahora: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Cerrar" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +#, fuzzy +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Se usará el fichero argfile siguiente para copiar los tags de la primera " +"imagen a las imágenes intermedias.\n" +"No se reemplazarán los patrones." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, fuzzy, c-format msgid "Directory '%s' does not exists" msgstr "La carpeta %s no existe" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "No se ha podido fijar la variable de entorno PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "Abrir el Procesador de lotes" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" "Abre PTBatcher, el procesador de lotes para archivos de proyecto de Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Abrir herramienta de calibración de objetivos" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "Abrir Calibrate_lens_gui, una GUI simple para calibración de objetivo" @@ -4107,11 +4287,11 @@ "Quizá no lo ha instalado correctamente o ha proporcionado una ruta " "incorrecta en la configuración." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "limpiando los archivos temporales de puntos clave" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -4120,15 +4300,15 @@ "Use %namefile, %i o %s para especificar los archivos de entrada para el " "detector de puntos de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Error en el comando de detección de puntos de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -4142,14 +4322,14 @@ "un nombre más corto" # Has elegido demasiadas imágenes -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Ha elegido demasiadas imágenes" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -4161,38 +4341,38 @@ "\n" " No se pudo ejecutar el comando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Error de wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "buscando puntos de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "No se pudo ejecutar el comando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -4201,9 +4381,9 @@ "Comando: %s\n" "falló con código de error: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4219,13 +4399,13 @@ "\n" "Comando ejecutado: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Fallo en detector de los puntos de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4233,7 +4413,7 @@ "Use %i para especificar los archivos de entrada y %k para especificar el " "fichero de puntos clave para el paso de generación de claves" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4241,11 +4421,11 @@ "USe %k para especificar los archivos de puntos clave y %o para especificar " "el archivo de proyecto de salida para el paso de cálculo de correspondencias" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "generando archivo de claves" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4258,13 +4438,13 @@ "\n" "No se pudo ejecutar el comando: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Predeterminado" # No se puede limpiar el lote en progreso.\n # ¿Quieres cancelarlo? -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4272,276 +4452,276 @@ "No se puede limpiar el lote en progreso.\n" "¿Quiere cancelarlo?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Lote limpiado." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Error: No se pudo obtener estado, el proyecto con índice %d no está en la " "lista." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Error: No se pudo cargar el archivo de lotes." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Lote completado con éxito." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Lote completado con errores." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Inicializando apagado..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Apagando..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Preparándose para hibernar..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Inicializando hibernación..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Preparándose para suspensión" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Inicializando suspensión..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Especificar fichero de proyecto" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "No se indicó un prefijo de salida" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "No se indicó un archivo de proyecto" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Ensamblando" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - asistente" # Error eliminando, el proyecto con id %d no está en la lista. -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Error quitando, el proyecto con id %d no está en la lista." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Error. No se pudo borrar el archivo de proyecto " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Ejecutando lote..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI está ensamblando" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "El lote ya está en progreso." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "Ejecutando comando \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Ensamblando ahora: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Detectando ahora: %s" # Error: no se ha podido establecer estado, el proyecto con índice %d no está en la lista. -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Error. No se pudo establecer estado, el proyecto con índice %d no está en la " "lista." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "No haciendo mucho..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Ha pulsado la tecla de Comando." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Ha pulsado la tecla Control." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 #, fuzzy msgid "Should the loading of the batch queue be skipped?" msgstr "¿Se debería omitir la carga de la cola del lote?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "Nada" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "Cerrar PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Apagar al acabar" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Suspender al acabar" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Hibernar" # Ingresa la aplicación de línea de comandos a ejecutar: -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Introduzca la aplicación de línea de comandos a ejecutar:" # Introduce aplicación -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Introducir aplicación" # Especifica un directorio dónde buscar proyectos -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Especificar un directorio en el que buscar proyectos" # Especifica archivo(s) de proyecto(s) -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Especificar archivo(s) de proyecto(s)" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "Proyectos añadidos desde la carpeta %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Añadir el proyecto %s a la cola de ensamblado." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Añadir el proyecto %s a la cola del asistente." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Lote parado" # &Ejecutar Procesador de Lotes -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Procesador de lotes de Hugin" # Especifica prefijo de salida para el proyecto -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Especificar prefijo de salida para el proyecto " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "No se puede cambiar el prefijo de un objetivo del asistente." # Selecciona un proyecto -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Seleccionar un proyecto" # Selecciona un proyecto -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Seleccionar un proyecto" # Especifica archivo de lotes a abrir -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Especifique archivo de lotes a abrir" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Archivos de lotes (*.ptb)|*.ptb|Todos los archivos (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "No se puede abrir aplicación en Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "No se ha seleccionado proyecto. ¿Abrir Hugin sin proyecto?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Lote parado" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Pausando el procesamiento de la cola de lotes de Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Continuando lote..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Procesando la cola de lotes de Hugin" # Hay proyectos fallidos en la lista.\n # ¿Eliminarlos también? -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4551,7 +4731,7 @@ # No se puede eliminar el proyecto en curso.\n # ¿Quieres cancelarlo? -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4560,19 +4740,19 @@ "¿Quiere cancelarlo?" # Proyecto eliminado -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "Proyecto quitado %s" # Selecciona el proyecto a eliminar -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Seleccione el proyecto para quitar" # No se puede restaurar el proyecto en curso.\n # ¿Quieres cancelarlo? -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4580,18 +4760,18 @@ "No se puede restaurar el proyecto en curso.\n" "¿Quiere cancelarlo?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "Restablecer proyecto" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Selecciona el proyecto a restaurar" # No se pueden restaurar los proyectos en curso.\n # ¿Quieres cancelar el lote? -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4599,15 +4779,15 @@ "No se pueden restaurar los proyectos en curso.\n" "¿Quiere cancelar el lote?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Especifica el archivo de lotes a guardar" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Archivo de lotes (*.ptb)|*.ptb|Todos los archivos (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4617,15 +4797,15 @@ "Puede afectar al rendimiento.\n" "¿Debería limpiar la cola ahora?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Limpiar cola de lotes ahora" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Mantener la cola" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Iniciando lote" @@ -4662,7 +4842,7 @@ msgid "E&xit" msgstr "&Salir" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4672,11 +4852,11 @@ "Si cierra el diálogo las perderá.\n" "¿Quiere continuar?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Aceptado" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4686,11 +4866,11 @@ "Si continua se descartarán.\n" "¿Quiere continuar?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Detener" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4699,7 +4879,7 @@ "La carpeta %s no existe.\n" "Proporcione una carpeta existente." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4707,7 +4887,7 @@ "No ha seleccionado ninguna panorámica.\n" "Seleccione al menos una panorámica e inténtelo de nuevo." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4718,142 +4898,144 @@ "lleno." # Eliminar de este proyecto las imágenes elegidas -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Quitar de este proyecto las imágenes elegidas " -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Dividir en dos panorámicas aquí" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Leyendo archivo %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Iniciar" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Se encontraron %d panorámicas posibles." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "No se encontró ninguna panorámica posible." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d imágenes: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" # Detectado error de sintaxis en los parámetros, interrumpiendo. -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Detectado error de sintaxis en los parámetros. Interrumpiendo." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI iniciado" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Esperando" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "En proceso" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Completo" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Falló" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Falta archivo" # En pausa -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Parado" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Proyecto" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefijo de salida" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Estado" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Última modificación" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Formato de salida" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Proyección" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Tamaño" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Error, no se puede convertir id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Asistente" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Cambiar prefijo" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Restablecer proyecto" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Editar con Hugin" # eliminar -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Quitar" @@ -4889,17 +5071,17 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Archivos de registro (*.log)|*.log|Todos los archivos (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "No se ha podido encontrar el fichero de salida %s." # Indica el archivo fuente del proyecto -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Indicar el archivo fuente del proyecto" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4909,7 +5091,7 @@ "Hugin no lo puede utilizar. Por favor introduce un nombre válido." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Acerca de Hugin" @@ -4942,19 +5124,19 @@ msgstr "Sistema" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "Aceptar" @@ -5038,8 +5220,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Elija..." @@ -5130,7 +5315,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opciones" @@ -5162,10 +5347,6 @@ msgid "Send selected panoramas to queue" msgstr "Enviar las panorámicas seleccionadas a la cola" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Cerrar" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Buscando panorámicas" @@ -5261,12 +5442,12 @@ msgstr "&Minimizar" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Salir" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Salir del programa" @@ -5374,144 +5555,38 @@ msgid "adddir" msgstr "añadir carpeta" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "anterior par de imágenes" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Descripción:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "siguiente par de imágenes" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Tipo:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "modo:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Todas las imágenes a la vez" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "línea vertical" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorámica con pilas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "línea horizontal" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Panorámica de varias filas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Ampliación:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Panorámica de varias filas con pilas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "ajustar a la ventana" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Panorámica prealineado" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Ajuste fino" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "intenta optimizar el punto actualmente activo" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "auto ajus&te fino" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "auto añadir" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "" -"añadir inmediatamente un punto de control cuando seleccione el segundo punto" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "autoestimar" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"intenta calcular el desplazamiento entre las imágenes y usarlo para situar " -"los puntos de control" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 -msgid "&Delete" -msgstr "&Borrar" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 -msgid "&Add" -msgstr "&Añadir" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 -msgid "add a new Point" -msgstr "añadir un nuevo punto" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 -msgid "Create control points for current image pair" -msgstr "Crear puntos de control para el par de imagenes" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 -msgid "Remove control points in clouds" -msgstr "Quitar puntos de control en nubes" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 -msgid "Remove worst control points" -msgstr "Quitar los puntos de control con mayor error" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 -msgid "Control Points" -msgstr "Puntos de control" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:17 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 -msgid "Delete" -msgstr "Borrar" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:24 -msgid "Select by Distance" -msgstr "Seleccionar por distancia" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Descripción:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Tipo:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (por A. Jenny)" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Todas las imágenes a la vez" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorámica con pilas" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Panorámica de varias filas" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Panorámica de varias filas con pilas" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Panorámica prealineado" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detector" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detector" #: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 msgid "One step detector" @@ -5589,10 +5664,128 @@ msgid "Parameters for Control Point Detectors" msgstr "Parametros para Detectores de Puntos de Control" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "anterior par de imágenes" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "siguiente par de imágenes" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "modo:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "línea vertical" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "línea horizontal" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Ampliación:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "ajustar a la ventana" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Ajuste fino" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "intenta optimizar el punto actualmente activo" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "auto ajus&te fino" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "auto añadir" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "" +"añadir inmediatamente un punto de control cuando seleccione el segundo punto" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "autoestimar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"intenta calcular el desplazamiento entre las imágenes y usarlo para situar " +"los puntos de control" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 +msgid "&Delete" +msgstr "&Borrar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 +msgid "&Add" +msgstr "&Añadir" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 +msgid "add a new Point" +msgstr "añadir un nuevo punto" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 +msgid "Create control points for current image pair" +msgstr "Crear puntos de control para el par de imagenes" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 +msgid "Remove control points in clouds" +msgstr "Quitar puntos de control en nubes" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 +msgid "Remove worst control points" +msgstr "Quitar los puntos de control con mayor error" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 +msgid "Control Points" +msgstr "Puntos de control" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:17 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 +msgid "Delete" +msgstr "Borrar" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:24 +msgid "Select by Distance" +msgstr "Seleccionar por distancia" + +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" msgstr "Nombres de archivo inválidos" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" + +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Sí" + +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "No" + #: hugin1/hugin/xrc/edit_script_dialog.xrc:4 msgid "Edit Panorama Tools Script" msgstr "Editar un script de Panorama Tools" @@ -5613,18 +5806,153 @@ msgid "Discard changes and cancel" msgstr "Descartar los cambios y cancelar" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Agrupar por:" + +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Solapamiento mínimo:" + +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Solapamiento mínimo para la detección de la pila de salida" + +# diferencia +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Diferencias Ev máximas:" + +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Diferencias Ev máximas para la detección de capas de salida" + +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Pantalla" + +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "General" + +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Datos EXIF" + +# Fusión de Imagen: +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Posiciones" + +# Parámetros del Objetivo +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parámetros del objetivo" + +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Parámetros fotométricos" + +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Tipo de objetivo" + +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Añadir imágenes..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Tipo de objetivo:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Multiplicador de distancia focal:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Detección de rasgos" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Configuración:" + +# Eliminar los puntos de control conectados a las imágenes elegidas +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "" +"Ejecutar el detector de puntos de control seleccionado en las imágenes " +"elegidas" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimizar" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geométrico:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Calcular" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotométrico:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Imagen elegida" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Cargar datos del objetivo..." + +# Introduce el campo de visión horizontal (CdVH) o la distancia focal y el factor de recorte: +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "" +"Introduzca el campo de visión horizontal (CdVH) o la distancia focal y el " +"factor de recorte:" + +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "CdVH (v):" + +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "grados" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Datos de la cámara y objetivo" + #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Guiñada (izq.-dcha.):" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Cabeceo (arriba-abajo):" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Alabeo (alred. eje óptico):" @@ -5632,35 +5960,11 @@ msgid "Translation parameter" msgstr "Parámetro de traslación" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -# Fusión de Imagen: -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Posiciones" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "grados de visión (v)" @@ -5765,7 +6069,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Ayuda" @@ -5812,8 +6116,8 @@ msgstr "Cargar objetivo" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Guardar" @@ -5826,127 +6130,47 @@ msgid "Manipulate image variables" msgstr "Editar variables de imagen..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Agrupar por:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Solapamiento mínimo:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Solapamiento mínimo para la detección de la pila de salida" - -# diferencia -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Diferencias Ev máximas:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Diferencias Ev máximas para la detección de capas de salida" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Pantalla" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "General" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Datos EXIF" - -# Parámetros del Objetivo -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parámetros del objetivo" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Parámetros fotométricos" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Tipo de objetivo" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Añadir imágenes..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Tipo de objetivo:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Multiplicador de distancia focal:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Detección de rasgos" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Configuración:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "Prefere&ncias" -# Eliminar los puntos de control conectados a las imágenes elegidas -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -"Ejecutar el detector de puntos de control seleccionado en las imágenes " -"elegidas" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimizar" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geométrico:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Calcular" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotométrico:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Argumentos predeterminados:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Imagen elegida" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Cargar datos del objetivo..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Procesando:" -# Introduce el campo de visión horizontal (CdVH) o la distancia focal y el factor de recorte: -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Introduzca el campo de visión horizontal (CdVH) o la distancia focal y el " -"factor de recorte:" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "CdVH (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "grados" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Datos de la cámara y objetivo" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importar" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -6096,14 +6320,6 @@ msgid "Don't ask again" msgstr "No volver a preguntar" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Sí" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "No" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -6167,21 +6383,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importar posiciones de Papywizard XML" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Deshacer" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Deshacer la última acción" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Rehacer" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Rehacer la última acción" @@ -6226,12 +6442,12 @@ msgid "Use only normal control points in optimization." msgstr "Número de puntos de control en esta imagen: " -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimizar" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Ejecutar el optimizador otra vez con los ajustes actuales" @@ -6262,16 +6478,16 @@ msgid "Run a python script" msgstr "Ejecutar un script en Python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Ver" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Pantalla completa" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Muestra la ventana principal de Hugin a pantalla completa" @@ -6353,22 +6569,22 @@ msgid "Show the Stitcher panel" msgstr "Mostrar el panel del ensamblador" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Simple" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Avanzado" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Experto" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "&Interfaz" @@ -6391,86 +6607,86 @@ "Ensamblar con la configuración de una secuencia de salidad definida por el " "usuario" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Alguna información sobre los diferentes botones." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Consejo del día" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Mostrar uno de los consejos del día." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Atajos de &teclado" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "atajos de teclado" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&P+F" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Preguntas más frecuentes" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "Acerca &de" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "Prefere&ncias" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nuevo" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nuevo proyecto" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Abrir" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Abrir proyecto" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Guardar" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Guardar el proyecto actual" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Guardar &como" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Guardar este proyecto en un nuevo archivo" @@ -6487,19 +6703,19 @@ "Escribir este proyecto en un archivo script compatible con PTStitcher, útil " "para procesado por lotes" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "Proyectos &usados más recientemente" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Lista de los archivos de proyecto usados más recientemente" # &Ejecutar Procesador de Lotes #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Ejecutar procesador de lotes" @@ -6586,7 +6802,7 @@ msgid "Show the OpenGL preview image" msgstr "Mostrar la venta de la vista previa OpenGL" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Vista previa de la panorámica" @@ -6644,15 +6860,10 @@ msgstr "Excluir región de todas las imágenes de este objetivo" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exportar" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importar" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Copiar" @@ -6697,11 +6908,11 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" -"Aplica todos los cambios a todas las imágenes con el mismo objetivo que " -"la(s) seleccionada(s)" +"Aplica todos los cambios a todas las imágenes con el mismo objetivo que la" +"(s) seleccionada(s)" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 #: hugin1/hugin/xrc/pano_panel.xrc:376 @@ -6810,7 +7021,8 @@ msgid "execute the PTOptimizer engine" msgstr "ejecutar el motor PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientación de la imagen" @@ -6859,39 +7071,39 @@ msgid "Interpolator (i):" msgstr "Interpolador (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (bicúbico)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineal" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Vecino más próximo" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "aproximación de valores entre los píxeles fuente" @@ -6919,7 +7131,7 @@ msgid "Enfuse options" msgstr "Opciones de Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Campo de visión:" @@ -7086,10 +7298,6 @@ msgid "Image fusion:" msgstr "Fusión de imagen:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Fusionador HDR:" @@ -7192,15 +7400,15 @@ msgid "Output parameters" msgstr "Parámetros de salida" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Modo de fundido con costuras:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "cosido «hard» (más rápido)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "fundido de costuras" @@ -7271,27 +7479,43 @@ msgid "This affects the control points editor and mask editor." msgstr "Quita todos los puntos de control dentro de las áreas con máscara." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Ejecutable enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(dejar vacío para predeterminado por el SO)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Ejecutable enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Ejecutable enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Opciones de archivo" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Carpeta temporal:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(dejar vacío para predeterminado por el SO)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Nombre predetermionado de archivo de proyecto:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Prefijo predeterminado de salida:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7322,45 +7546,45 @@ "%lens - objetivo (de la primera imagen)\n" "%projectname - nombre del fichero de proyecto (solo en el prefijo de salida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Nombres de archivo predeterminados" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Nombres del archivo" # Cargado de imágenes -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "cargado de imágenes" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Alinear automáticamente las imágenes despues de cargarlas" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Detectar líneas verticales" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Detectar líneas verticales en las imágenes para nivelar la panorámica" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Quitar puntos de control en nubes (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Pasos adicionales del asistente" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Auto alinear" # Número de Puntos de Control\n -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7368,67 +7592,67 @@ "Número de puntos de control\n" "por solapamiento" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Reducir escala de panorámica final" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "porcentaje de ancho máx." -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor de puntos de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Modo HDR y pantalla de 16 bit" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Curva" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineal" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logarítmica" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "usado para mostrar en el GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Anchura de parcheo:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "píxeles" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Anchura de área de búsqueda:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "porcentaje del ancho de la imagen" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Ancho del área de búsqueda local:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Umbral de correlación:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7437,11 +7661,11 @@ "1: máxima similitud" # Umbral del Pico de Curvatura: -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Umbral del pico de curvatura:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7449,118 +7673,114 @@ "0: sin pico\n" "0.2: pico distintivo" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Búsqueda rotacional" # Activar búsqueda rotacional (más lenta, pero más precisa) -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Activar búsqueda rotacional (más lenta pero más precisa)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Ángulo de inicio:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Ángulo de paro:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Pasos:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Detectores de puntos de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programas de detección de puntos de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nuevo..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Editar..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Mover arriba" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Mover abajo" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Establecer predeterminados" # El asistente está usando los ajustes predeterminados. -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "El asistente está usando los ajustes predeterminados." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Formato de salida" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Formato de archivo predeterminado:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "formato de salida predeterminado para la panorámica final" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Compresión TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "compresión TIFF predeterminada" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Calidad JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "configuración de compresión JPEG predeterminada" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Mezclador:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Mezclador predeterminado:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Mezclador predeterminado usado para los proyectos nuevos." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Procesador" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&ensamblar&proyecto" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "El motor que ejecutará el ensamblador" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Comenzar tareas de ensamblado inmediatamente" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7570,20 +7790,20 @@ "el procesado se inicia en modo suspendido, y el usuario debe iniciarlo " "manualmente." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Sobreescribir archivos existentes" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" "ADVERTENCIA: se sobreescribirán los archivos existentes sin previo aviso." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Salida detallada" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7591,19 +7811,19 @@ "Activar para obtener los detalles; útil al informar de un error o para " "observar el progreso del proyecto." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Ensamblando" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Copiar los metadatos en los archivos finales usando ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Opciones de ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7612,7 +7832,7 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 #, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to all " @@ -7622,19 +7842,19 @@ "imagen a las imágenes intermedias.\n" "No se reemplazarán los patrones." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Fichero argfile ExifTool intermedio:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "dejar vacío para predeterminado por el SO" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Editar el fichero argfile ExifTool seleccionado" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 #, fuzzy msgid "" "The following argfile will be used to copy tags from the first image to the " @@ -7646,27 +7866,27 @@ "Se aplica además de el argfile seleccionado para las imágenes intermedias.\n" "Se reemplazarán los patrones del argfile antes de ejecutar exiftool." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Fichero argfile ExifTool final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Crear datos Photo Sphere XMP" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Sólo para imágenes de salida equirrectangulares." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Opciones avanzadas" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Número de hebras:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7678,82 +7898,84 @@ "Establezca aquí como máximo el número de procesadores o núcleos disponibles " "en su sistema." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 para detección automática" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Ensamblando (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Interpolador por defecto (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Crear imágenes recortadas de forma predeterminada" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Usar GPU para remapeo (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" +msgstr "Usar GPU para remapeo:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Usar la GPU de la tarjeta gráfica para acelerar el remapeo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Usar un programa Enblend alternativo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Ejecutable enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Argumentos predeterminados:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Estos son los argumentos predeterminados para proyectos nuevos.\n" "Se pueden cambiar para proyectos individuales en la pestaña «Ensamblador».\n" "No establezca los argumentos -w, -o y --compression, ya lo hará Hugin." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Usar un programa Enfuse alternativo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Ejecutable Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programas" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parámetros de Celeste" # Umbral SVM: -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Umbral SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7761,19 +7983,19 @@ "mayor que 0.5: menos sensible\n" "menor que 0.5: más sensible" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Tamaño del filtro Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "pequeño" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "grande" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7783,7 +8005,7 @@ # Las correcciones de viñetas y exposición se hacen según análisis de color en las áreas superpuestas.\n # Para acelerar el cálculo, sólo se usará un subgrupo de puntos al azar. -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7793,75 +8015,75 @@ "color en las zonas de superposición.\n" "Para acelerar el cálculo, sólo se usará un subgrupo de puntos al azar." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Número de puntos por imagen: " -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Optimizador fotométrico" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Advertencias" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Mostrar mensaje de guardado de fichero de proyecto y prefijo de salida" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Mostrar advertencia de diferencias de exposición elevadas al añadir imágenes" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Después de la herramienta \"editar ptos. de control\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Preguntar al usuario" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Reoptimizar panorámica" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "No optimizar panorámica" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "" "Herramienta de edición de ptos. de control (en ventana de previsualización " "rápida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Varios" # Preferencias - hugin -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Preferencias - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Editar argfile ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 #, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" @@ -7898,11 +8120,11 @@ "\n" "Los patrones deben respetar el caso (MAY/min)." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centrar la vista previa horizontalmente" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centrar" @@ -7910,13 +8132,15 @@ msgid "Show the whole panorama" msgstr "Mostrar todo la panorámica" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estimar campo de visión" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Ajustar" @@ -7924,7 +8148,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Enderezar automáticamente un horizonte curvado" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Enderezar" @@ -8028,32 +8253,32 @@ "Configura el valor de exposición de la panorámica a la media de exposición " "de todas las imágenes." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Selector de gris" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corregir el balance de blancos global seleccioanndo un área gris neutral." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Editar Pto. Control" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Crear o borrar puntos de control en el rectángulo seleccionado." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Fondo:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Escala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -8067,162 +8292,150 @@ "* Selecciona una línea para editar las imágenea asociadas en la pestaña de " "Puntos de Control." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Distribución" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guías:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Regla de los tercios" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Proporción áurea" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Método diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Triángulo áureo (abajo)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Triángulo áureo (arriba)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Enderezar automáticamente un horizonte curvado." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Modo de arrastre:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Aplicar" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Mover la panorámica o arrastrar imágenes a la posición" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Mover/arrastrar" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Establecer el área de recorte al máximo rectángulo cubierto por las imágenes" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "Autorecorte HDR" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Establecer el área de recorte al máximo rectángulo cubierto por las pilas de " "imágenes" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "izquierda:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "arriba:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "derecha:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "abajo:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Restaurar el recorte al mayor área posible" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Cambiar la región de recorte de la panorámica" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Editor de panorámicas" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Vista previa" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Muestra la vista previa de la esfera de la panorámica." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Rejilla" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Muestra una rejilla." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Todas las imágenes" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Imagen con la exposición media de cada pila" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "La imagen con más brillo de cada pila" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "La imagen más oscura de cada pila" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Mantener las imágenes seleccionadas" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Restaurar la selección" @@ -8483,8 +8696,7 @@ #: hugin1/hugin/xrc/data/tips.txt:30 msgid "Press \"1\" in the control points tab to zoom out to 100% view." msgstr "" -"Pulse «1» en la pestaña de puntos de control para alejar a una vista del " -"100%." +"Pulse «1» en la pestaña de puntos de control para alejar a una vista del 100%." # Después que enblend haya fundido la panorámica, las imágenes remapeadas producidas (disponibles en el mismo directorio de la imagen de la panorámica) se pueden usar para retocar el panorama desde GIMP o Photoshop. #: hugin1/hugin/xrc/data/tips.txt:31 @@ -8517,9 +8729,9 @@ "The precision of \"fine tuning\" control points can be improved by enabling " "rotation search. This is essential for fisheye and wide angle images." msgstr "" -"La precisión del «ajuste fino» de los puntos de control puede ser mejorada " -"si la búsqueda rotacional está seleccionada. Esto es esencial para las " -"imágenes ojo de pez y de gran angular." +"La precisión del «ajuste fino» de los puntos de control puede ser mejorada si " +"la búsqueda rotacional está seleccionada. Esto es esencial para las imágenes " +"ojo de pez y de gran angular." #: hugin1/hugin/xrc/data/tips.txt:35 #, fuzzy @@ -8549,6 +8761,87 @@ "sentido con imágenes fuertemente solapadas y con muchos puntos de control " "bien distribuidos." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "Prefere&ncias" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "&Imágenes..." + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Añadir imágenes..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Añadir otra imagen al proyecto actual" + +# Eliminar la(s) imagen(es) elegida(s) +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Quitar la(s) imagen(es) elegida(s)" + +# Eliminar la(s) imagen(es) elegida(s) +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Quitar la(s) imagen(es) elegida(s)" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Escala de detección de esquina" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "&Mezclar proyecto..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Mover la panorámica o arrastrar imágenes a la posición" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Cambiar la región de recorte de la panorámica" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Usar GPU para remapeo (EXPERIMENTAL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Todos los archivos de imágenes|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;" +#~ "*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;" +#~ "*.HDR;*.exr;*.EXR|Archivos JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|" +#~ "Archivos TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Archivos PNG (*." +#~ "png)|*.png;*.PNG|Archivos HDR (*.hdr)|*.hdr;*.HDR|Archivos EXR (*.exr)|*." +#~ "exr;*.EXR|Todos los archivos (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (por A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&ensamblar&proyecto" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Interfaz" @@ -9666,10 +9959,6 @@ #~ "Autopano-SIFT not found. Please specify a valid path in the preferences" #~ msgstr "No se encontró Autopano-SIFT. Indique una ruta en las preferencias" -#, fuzzy -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "No se encontró \"%s\". Indique una ruta válida en las preferencias" - #~ msgid "autopano failure" #~ msgstr "fallo de autopano" @@ -10305,10 +10594,6 @@ #~ msgstr "distorsión (c):" #, fuzzy -#~ msgid "Image file:" -#~ msgstr "Tamaño de la imagen:" - -#, fuzzy #~ msgid "center shift x:" #~ msgstr "Desplazar centro de la imagen" @@ -10345,10 +10630,6 @@ #~ msgstr "y" #, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "&Mezclar proyecto..." - -#, fuzzy #~ msgid "PTStitcher:" #~ msgstr "Ensamblador" @@ -10435,10 +10716,6 @@ #~ msgstr "Ensamblador" #, fuzzy -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Seleccionar PTmender" - -#, fuzzy #~ msgid "No PTStitcher.exe selected" #~ msgstr "Escribir script &PTStitcher" @@ -10558,11 +10835,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "Error durante el ensamblado" -# Eliminar la(s) imagen(es) elegida(s) -#, fuzzy -#~ msgid "Remove this image" -#~ msgstr "Quitar la(s) imagen(es) elegida(s)" - #, fuzzy #~ msgid "Stitching Options" #~ msgstr "Ensamblando %s" @@ -10606,10 +10878,6 @@ #~ msgstr "Enblend" #, fuzzy -#~ msgid "Additional Arguments:" -#~ msgstr "Argumentos predeterminados:" - -#, fuzzy #~ msgid "Select autopano program / frontend script" #~ msgstr "Ejecutar programa Autopano externo sobre las imágenes elegidas" diff -Nru hugin-2018.0.0+dfsg/src/translations/eu.po hugin-2019.0.0+dfsg/src/translations/eu.po --- hugin-2018.0.0+dfsg/src/translations/eu.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/eu.po 2019-02-17 15:24:33.000000000 +0000 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: hugin\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2012-07-18 23:13+0100\n" "Last-Translator: Maider Likona Santamarina \n" "Language-Team: Basque \n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 #: hugin1/hugin/PapywizardImport.cpp:460 @@ -49,16 +49,16 @@ msgid "Searching for best crop..." msgstr "Hodei-itxurako kontrol puntuak bilatzen..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Paketean ez da %s kanpo programa topatu, sistemaren defektuzko baliora " "itzultzen" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -86,9 +86,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "%s fitxategia existitzen da. Gainidatzi?" @@ -125,7 +125,7 @@ msgstr "Mozketa faktorea positiboa izan behar du." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -135,24 +135,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -173,8 +177,8 @@ msgstr "" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Laukizuzenberdina" @@ -205,11 +209,13 @@ msgid "builtin" msgstr "" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineala" @@ -234,16 +240,16 @@ msgid "Error loading lens parameters" msgstr "Lentearen parametroak kargatzean errorea" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Lenteen parametro fitxategia gorde" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Lenteen Proiektu Fitxategiak (*.ini)|*.ini|All files (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Proiektua gorde" @@ -275,22 +281,23 @@ msgid "Error pausing process %ld, code 2" msgstr "%ld prozesua pausatzean errorea, 2 kodea" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Ezeztatu" @@ -328,12 +335,12 @@ msgid "Panorama Tools" msgstr "Panoramen tresnak" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Ezin da proiektu fitxategia ireki:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "ezin da script-a ireki : %s" @@ -343,8 +350,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "panotools script-a parseatzean errorea: %s" @@ -358,17 +365,17 @@ msgid "Could not create temporary file" msgstr "Ezin izan da aldi baterako fitxategia sortu" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Elkartzean errorea" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -376,11 +383,11 @@ "Existitzen diren irudiak gainidatzi?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Existitzen diren irudiak gainidatzi" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -389,12 +396,12 @@ "Proiektua elkartzean errorea\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Laguntzailea exekutatzean errorea" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -403,293 +410,303 @@ "Laguntzailea exekutatzean errorea\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Panorama Elkartzen" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "Bertsioa: %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "Direktorioa:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "Irteera aurrizkia" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "Barne errorea" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Esposaketa" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Nona aukerak" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Nona aukerak" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "Puntu kopurua irudiko" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "Irteera" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "Oihalaren Tamaina:" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Proiekzioa:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "GPU bermapeatzeko erabili (EXPERIMENTALA)" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panoramaren Irteera:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Esposaketa zuzenduta, hein dinamiko txikia" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Hein dinamiko handia" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Birkokatutako Irudiak:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Zuzendu gabeko esposaketa, hein dinamiko txikia" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Elkartutako instantaneak:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Geruzak:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "Mozketa irudietara egokitu" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "CPU-en kopurua:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Fitxategia:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "Oihalaren Tamaina:" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "Lente mota:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "Esposaketa (Eev)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "Birkokatutako Irudiak:" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "Irudiak gehitu" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "Irteera" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "Aldatu pilaren zenbakia" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "Birkokatutako Irudiak:" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "Aldatu pilaren zenbakia" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Elkartzen %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 #, fuzzy msgid "first image" msgstr "Mozketa irudietara egokitu" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 #, fuzzy msgid "last image" msgstr "Irudia gehitu" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 #, fuzzy msgid "directory" msgstr "Direktorioa:" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 #, fuzzy msgid "Camera maker" msgstr "Kamararen Egilea:" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 #, fuzzy msgid "Camera model" msgstr "Kamararen Modeloa:" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -697,36 +714,70 @@ msgid "Lens" msgstr "Lenteak" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 #, fuzzy msgid "unknown projection" msgstr "Thoby proiekzioa" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Irudiak gehitu" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "%s fitxategia irakurtzen" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Errorea" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -737,26 +788,11 @@ "Hugin-ek ezin du fitxategi horiekin lan egin. Aldatu fitxategi(ar)en izenak " "eta saiatu berriro" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Irudi fitxategi guztiak|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" -"*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF fitxategiak " -"(*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR " -"fitxategiak (*.hdr)|*.hdr;*.HDR|EXR fitxategiak (*.exr)|*.exr;*.EXR|All " -"fitxategiak (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -768,27 +804,27 @@ msgstr "%srako \"%s\" sarrera ez da baliozko zenbakia\n" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Abisua" @@ -807,7 +843,7 @@ msgid "Could not save information into database." msgstr "Ezin da %s proiektu fitxategia ireki." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -818,11 +854,11 @@ "%s\n" "Abortatuta" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Euskarririk gabeko fitxategi formatua" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -831,7 +867,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -842,77 +878,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -920,44 +956,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "Proiektua berrabiarazi" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "Komando lerroko aukerak" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "Existitzen diren irudiak gainidatzi" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Irudi fitxategia ez da topatu" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Irudi editorea hautatu" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -968,16 +1004,17 @@ "\n" "OK sakatu borratzeko." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Errorea topatu da" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Irudiak gehitu" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -986,32 +1023,32 @@ "Errorea, txantiloiak %d irudi espero zituen,\n" "oraingo proiektuak %d irudi dauzka\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Ezin da txantiloia aplikatu" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Errorea proiektu fitxategia kargatzean" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Emaitza" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "Paketean ez da xrc katalogoa topatu" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Errore Larria" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1045,7 +1082,7 @@ " (%s) irudien EXIF informazioa ez dator bat gehituta dauden irudien " "informazioarekin Irudia aztertu berriro mesedez, irudi egokia hautatu baduzu" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Irudia gehitu: ezeztatu" @@ -1058,9 +1095,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1077,7 +1114,7 @@ msgstr "Lerroak bilatzen..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Bukatuta" @@ -1092,11 +1129,11 @@ "\"Lerroak topatu\" exekutatu lehenengo. Lerrorik ez bada topatzen, " "parametroak aldatu" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Lenteen distortsio parametroak optimizatzen" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1106,150 +1143,150 @@ "\"Lerroak topatu\" eta \"Optimizatu\" exekutatu lenteen informazioa gorde " "baino lehen. Lerrorik ez bada topatzen, parametroak aldatu" -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 #, fuzzy msgid "Save lens parameters to ini file" msgstr "Lenteen parametroak fitxategi batean gorde" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "Lenteen parametroak fitxategi batean gorde" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #, fuzzy msgid "Saving lens data" msgstr "Lenteen datuak kargatu..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Lenteak gorde" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Proiektu fitxategia gorde" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Proiektu fitxategiak (*.pto)|*.pto|All files (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "Laguntzailea exekutatzen" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "Hari kopurua:" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "Komandoa exekutatzen \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Sistema eragilea: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arkitektura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "Memoria libre: %ld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Bertsioa: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Dataren bidea: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "Kamara eta Lenteen datuak" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "Ezin da %s proiektu fitxategia ireki." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Liburutegiak" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 #, fuzzy msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "" "http://autopano.kolor.com webguneko Autopano ez dago erabilgarri OSX-entzako" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Autopano-Sift erabiliko da bere ordez" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1257,89 +1294,94 @@ "Gutxienez sarrera eremu bat hutsik dago.\n" "Zure sarrerak birpasatu mesedez." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Kontrol punturik gabeko irudi bikoteetan bakarrik funtzionatzen du." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Kontrol puntuak topatzeko programa hautatu" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Exekutagarriak (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "ezkerreko x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "ezkerreko y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "eskubiko x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "eskubiko y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Lerrokatze" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distantzia" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Kontrol puntu berria gehituta" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "Antzeko puntuak bilatzen..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "puntuak aldatu, edo saguaren eskubiko botoia sakatu bikotea gehitzeko." -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Kalkulatutako puntua irudiaren kanpokaldean" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Ez da antzeko punturik topatu" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1350,31 +1392,37 @@ "Korrelazio koefizientea (%.3f) hobespenetan definitutako atalasea baino " "txikiagoa da." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Lerro berria gehitu" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "%d. lerroa" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Korrelazio Atalasea:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normala" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "lerro bertikala" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "lerro horizontala" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1383,95 +1431,96 @@ "Sortu kontrol puntuak.\n" "Puntu gutxiago sortzeko, zenbaki handiagoa idatzi" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Ertzak topatzeko atalasea" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Kontrol puntuak sortu" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Ertzak topatzeko eskala" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Kontrol puntuak sortzean errorea:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 #, fuzzy msgid "Select point in right image" msgstr "Eskubiko irudiak puntua hautatu" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 #, fuzzy msgid "Select point in left image" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "" "Ezin da celeste exekutatu bi irudiak lotzeko kontrol punturik ez badago" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste exekutatzen" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Ereduaren fitxategia kargatzen" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "%lu kontrol puntuak borratuta" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste-ren emaitza" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Garbitzen" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Sortu" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Kontrol puntuak hodeietatik kentzen saiatu" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Lotea garbitu" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Metodo estatistikoak erabiliz kanpokaldeko kontrol puntuak borratu" @@ -1483,23 +1532,23 @@ msgid "Could not process event!" msgstr "Ezin da ebentua prozesatu!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Ezk. irudia" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Esk. irudia" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1507,7 +1556,7 @@ "Kontrol puntuen errore minimoa sartu.\n" "Errore altuagoa duten puntuak hautatuko dira." -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Kontrol Puntuak hautatu" @@ -1579,60 +1628,60 @@ msgstr "" "Irudiak mugitzeko arrastatu (shift erabil daiteke), edo kontrol-arrastatu" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Panoramaren aurrebista azkarra" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fitxategia" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Erakutsitako irudiak" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Dena" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Ezer" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Izkutatu" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "Ikuspuntu bertikala aldatzeko arrastatu" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "Ikuspuntu horizontala aldatzeko arrastatu" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Aurrebista" @@ -1640,84 +1689,89 @@ msgid "Overview" msgstr "Gainbista" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Proiekzioaren parametroak defektuzko balioetara itzuli." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 #, fuzzy msgid "No images loaded." msgstr "Ez da irudirik kargatu" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu irudi kargatu dira" -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Irudiak %lu kontrol puntuen bidez lotuta daude\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Lotu gabeko %d irudi talde topatu dira" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "Irudiak edo kontrol puntuak aldatu dira, berriro lerrokatu behar dira" -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Optimizatu eta gero MEAN ERROR egon da: %.1f pixel, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Laukizuzena" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Zilindrikoa" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Biratze balioa zenbakizkoa izan behar du." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X balioa zenbakizkoa izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y balioa zenbakizkoa izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z balioa zenbakizkoa izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Balioa zenbakizkoa izan behar du." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1725,55 +1779,55 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "ezberdintasuna" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Mozketa automatikoa" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Mozketa optimoa kalkulatzen" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Goikaldea 0 baino handiagoa den zenbaki bat izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "ezkerraldea 0 baino handiagoa den zenbaki bat izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "eskubialdea 0 baino handiagoa den zenbaki bat izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "azpikaldea 0 baino handiagoa den zenbaki bat izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "Ezker muga eskubikoa baino txikiagoa izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "Goiko muga azpikoa baino txikiagoa izan behar du" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "HFOV balio desegokia. Proiekzio honetarako HFOV balio handiena %lf da." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "VFOV balio desegokia. Proiekzio honetarako VFOV balio handiena %lf da." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1781,7 +1835,7 @@ "Ikuspuntu zabal batekin, laukizuzen motako proiekzioa erabiltzenduten " "panoramen ertzak asko luzatzen dira\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1789,15 +1843,15 @@ "Ikuspuntua oso zabala denez horizontalki bakarrik, saiatu " "proiekziozilindrikoa erabiltzen" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Panorama oso zabal batentzako, proiekzio laukizuzenberdina froga ezazu" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Panini proiekzioa ere froga dezakezu." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1808,7 +1862,7 @@ "luzatzen dira goi eta behekaldean.Proiekzio laukizuzenberdina erabiliz eduki " "bera sartzen da toki bertikal gutxiagoan" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1819,7 +1873,7 @@ "Proiekzio zilindrikoak marra bertikalak mantentzen ditu, laukizuzenberdinak " "ez bezala" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1827,7 +1881,7 @@ "easier on the eye." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1839,7 +1893,7 @@ "Arrain-begi proiekzioak konprimitzen du, horregatik ikuspuntu zabal " "bateansar daiteke eta erdialdean arrazoizko estaldura izan" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1847,7 +1901,7 @@ "Panoramaren proiekzioa laukizuzenberdinekoa ezarriz gero marra zuzenak " "zuzenizaten jarraituko dute." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1857,27 +1911,27 @@ "eskaintzenduena.\n" "Barra berriro ikusi nahi izanez gero, hobespenetan aktiba daiteke berriro." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normala, banakakoa" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaikoa" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaikoa" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panoesfera" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mosaiko planoa" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1885,24 +1939,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1911,31 +1965,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "Kontrol puntuak garbitu" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "Prozesatzen:" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "Antzeko puntuak bilatzen..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "Bikoteak konprobatzen" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1943,7 +1997,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1951,7 +2005,7 @@ "GLEW hasieratzean errorea\n" "Aurrebista azkarra ezin da ireki." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 #, fuzzy msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " @@ -1996,7 +2050,7 @@ msgstr "Maskara kopurua" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "" @@ -2032,7 +2086,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 #, fuzzy msgid "Stacks" @@ -2231,7 +2285,7 @@ msgid "Shutter speed" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 #, fuzzy msgid "ISO" msgstr "ISO:" @@ -2400,101 +2454,101 @@ msgid "Camera response parameter" msgstr "Kamararen Erantzuna" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "Lenteak" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr ":" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "Irteera" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Irteera" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Esteka" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 #, fuzzy msgid "Select all" msgstr "Berrabiarazi dena" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 #, fuzzy msgid "Unselect all" msgstr "Hautatu gabea" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 #, fuzzy msgid "Edit image variables..." msgstr "Irudi aldagaiak:" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Maskara gorde" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Maskara gorde" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "Erakutsitako irudiak" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Puntu kopurua irudiko" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 #, fuzzy msgid "Control points" msgstr "Kontrol Puntuak" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2527,12 +2581,24 @@ msgid "Did you know..." msgstr "Badakizu..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "%s bertsioa" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2540,75 +2606,75 @@ "Instalazioan errore fatala egon da\n" "Data/splash.png fitxategia ez da hemen topatu:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Help" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Ekintzak" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Irteera" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Editatu" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Laguntzailea exekutatzen" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Laguntzailea exekutatzen" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Hasita" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimizatzailea" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Esposaketa" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Itxi baino lehen panoramaren aldaketak gorde?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Itxi baino lehen panoramaren aldaketak gorde?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Itxi baino lehen panoramaren aldaketak gorde?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2617,7 +2683,7 @@ "Gorde gabe itxiz gero, gorde duzun azken puntutik hona egindako aldaketak " "galduko dira" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2626,7 +2692,7 @@ "Gorde gabe itxiz gero, gorde duzun azken puntutik hona egindako aldaketak " "galduko dira" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " @@ -2635,41 +2701,41 @@ "Gorde gabe itxiz gero, gorde duzun azken puntutik hona egindako aldaketak " "galduko dira" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Ez gorde" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Itxi gorde gabe" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Behartu ixtera" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "%s proiektua gordeta" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Panorama Elkartzailea" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 #, fuzzy msgid "Panorama editor" msgstr "Panoramaren aurreikuspena" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2682,36 +2748,36 @@ "\n" "(Errore kodea: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "PTmender script fitxategia gorde" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender fitxategiak (*.txt) |*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Proiektua ireki:\t" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Proiektua irekita" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Irudiak kargatzen" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Errorea proiektua irekitzean:\t" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Proiektu fitxategia ireki" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, fuzzy, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2722,11 +2788,11 @@ "Fitxategi hau ezin da Fitxategia, Ireki komandoarekin ireki.\n" "Oraingo proiektuari gehitu nahi duzu?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Proiektua ireki: ezeztatu" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2734,7 +2800,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2742,35 +2808,35 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Ezin da %s proiektu fitxategia ireki." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Ireki proiektu fitxategia" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Maskara fitxategiak (*.msk)|*.msk|Fitxategi guztiak(*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Txantiloi proiektua hautatu" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Puntu guztiak doitzen" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 #, fuzzy msgid "Fine-tuning" msgstr "Doitzen" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2797,23 +2863,23 @@ "0ra zehaztuko da.\n" "Kontrol Puntuen zerrenda (F3) erabili proiektuaren puntu guztiak ikusteko.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Doiketaren emaitza" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Maskaretako kontrol puntuak borratzen" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Python scripta hautatu" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python scripta (*.py)|*.py|Fitxategi guztiak (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2822,13 +2888,13 @@ "\"%s\" fitxategia ez da topatzen.\n" "Agian fitxategia berrizendatu, mugitu edo borratu da." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Errorea!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2836,54 +2902,54 @@ "%s-n espero zen Celeste eredua ez da topatu, Hugin ongi instalatuta egon " "behar du." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Ezin da Celesteren %s eredu fitxategia topatu" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Laguntzailea exekutatzen" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Abisua lotugabeko %d irudi talde topatu dira: " -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2894,7 +2960,7 @@ "Lotu gabeko irudien artean kontrol puntuak sortu Kontrol Puntuen fitxan.\n" "Puntuak gehitu eta gero, \" Lerrokatu\" botoia sakatu berriro" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2902,23 +2968,23 @@ "Laguntzailea ez du ongi bukatu. Emaitzako proiektu fitxategia errepasatu, " "mesedez." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Proiektu fitxategia ez da topatu" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Ezin da PTBatcherGui exekutatu" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Programa ezegokia exekutatu da" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Maskara mota" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 #, fuzzy msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " @@ -2927,29 +2993,29 @@ "Poligono maskara bat sortu saguaren ezkerreko botoiak klik eginez irudian, " "eta azkenpuntua eskubiko botoiarekin eginez." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Maskara gorde" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Maskara fitxategiak (*.msk)|*.msk|Fitxategi guztiak(*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Maskara kargatu" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Maskara kargatu: ezeztatu" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "%s fitxategitik ezin da maskara parseatu" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Balio duen zenbaki bat sartu mesedez" @@ -3079,7 +3145,7 @@ msgstr "Lerrokatze fotometrikoa" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Irudiak kargatzen" @@ -3125,68 +3191,72 @@ msgid "Photometric optimization finished" msgstr "Optimizazio fotometrikoa bukatuta" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Irudiak banaka gehitu..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Denboran zehar egindago irudiak gehitu..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 #, fuzzy msgid "No matching images found." msgstr "Irudiak kargatzen" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Irudi aldagaiak:" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Hautatuko irudi(ak) borratu" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Irudi hau posiziorako ainguratu" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Irudi hau esposaketarako ainguratu" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 #, fuzzy msgid "New lens" msgstr "Lente Berriak" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Lenteak aldatu..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Lenteen kopuru berria sartu" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Lente kopurua" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Lenteen kopurua aldatu" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "Lenteen datuak kargatu..." -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 #, fuzzy msgid "Load lens from ini file" msgstr "Lenteen parametroak fitxategi batetik kargatu" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 #, fuzzy msgid "" "You selected only one image.\n" @@ -3196,12 +3266,12 @@ "Kargatutako parametroak lente berdina duten irudi guztiei ezarri nahi al " "diezu?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Galdera" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3212,109 +3282,109 @@ "daitezke.\n" "Hobespenak aplikatu dena den?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 #, fuzzy msgid "Save lens to ini file" msgstr "Lenteen parametroak fitxategi batean gorde" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 #, fuzzy msgid "Remove control points" msgstr "%d kontrol puntu borratu dira" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 #, fuzzy msgid "Selected images have no control points." msgstr "Kontrol puntuak garbitu" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, fuzzy, c-format msgid "Really delete %lu control points?" msgstr "Benetan %lu kontrol puntuak borratu?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Kontrol puntuak borratu" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Kontrol puntuak garbitu" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "kontrol Puntuak garbitzen" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Bikoteak konprobatzen" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Proiektu osoa konprobatzen" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Garbiketa bukatzen" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 #, fuzzy msgid "Remove control points on clouds" msgstr "Maskaretan dauden kontrol puntuak borratu" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 #, fuzzy msgid "Reset positions" msgstr "Proiektua berrabiarazi" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "Estekaren parametroak" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 #, fuzzy msgid "Reset lens parameters" msgstr "XYZ parametroak erreseteatu?" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 #, fuzzy msgid "Reset photometric parameters" msgstr "XYZ parametroak erreseteatu?" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Pila berria" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Pila aldatu..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Pilaren zenbaki berria sartu" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Pila zenbakia" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Aldatu pilaren zenbakia" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 #, fuzzy msgid "Set stack size..." msgstr "Pila aldatu..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Kalitatea" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3385,64 +3455,64 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Lambert-en azalera azimutal berdina" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "zabalera 0 baino handiagoa den zenbaki bat izan behar du" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "altuera 0 baino handiagoa den zenbaki bat izan behar du" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 #, fuzzy msgid "Left boundary must be smaller than right." msgstr "Ezker muga eskubikoa baino txikiagoa izan behar du" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 #, fuzzy msgid "Top boundary must be smaller than bottom." msgstr "Goiko muga azpikoa baino txikiagoa izan behar du" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "PTmender aukerak oraindik ez daude inplementatuta" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "PTblender aukerak ez daude oraindik inplementatuta" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "HDRMerge programa honetarako aukerak oraindik ez daude inplementatuta" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Ezin izan da behin-behineko proiektua sortu" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Emaitzako aurrizkia definitu" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3452,7 +3522,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3465,7 +3535,7 @@ "txikitu, eta Elkarketa fitxan elkartu. Tamaina horretako panorama bat " "sortzeak denbora luzea eta memoria asko okupatuko du." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3473,26 +3543,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Ziur zaude panorama hain handia elkartu nahi duzula?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Elkartu hala ere" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Utzi hau konpontzen" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3522,184 +3592,202 @@ msgid "Miscellaneous" msgstr "Denetarik" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Sistemaren defektuzkoa" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Katalaniera" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Txinera (Sinplifikatuta)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Txinera (Betikoa)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Txekiera" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Danesa" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Alemaniera" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Ingelesa" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Frantsesa" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Alemaniera" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Hungariera" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italianera" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japonesa" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polakoa" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugesa (Brasiliera)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Errusiera" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Eslobakiera" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Gaztelania" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Enblend hautatu" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Exekutagarriak (*.exe|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Enfuse hautatu" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Berrabiarazi dena" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Berrabiarazi dena" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Log fitxategiak (*.log)|*.log|Fitxategi guztiak (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "Ezin da %s proiektu fitxategia ireki." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Benetan aurkeztutako hobespenak defektuzko balioetara berrezarri?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Defektuzkoak kargatu" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Hasteko sarrera bat hautatu mesedez" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Sarrera Hautatu" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3707,30 +3795,30 @@ "Azken ezarpena ezin da borratu.\n" "Ezarpen bat behar da behintzat." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Benetan kontrol puntuen detektorearen \"%s\" ezarpena borratu nahi duzu?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Borratu kontrol puntuen detektorearen ezarpena" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Kargatu kontrol puntuen detektorearen ezarpena" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Kontrol puntuen detektorearen ezarpenak (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Kontrol puntuen detektorearen ezarpenak gorde" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3757,50 +3845,55 @@ msgid "Remove %lu control points" msgstr "%lu kontrol puntuak borratuta" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panoramaren aurreikuspena" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Aurreikuspenaren hobespenak" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "proiekzioa (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Blend modua:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Irteera:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Konpresioa:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Proiekzioaren parametroak" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Ezkerreko klik eginez erdiguneko puntu berria definitzen da, eskubiko klik " "eginez puntua horizontera mugituko da" -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Panorama erdiratu saguaren ezkerreko botoiarekin, horizontea ezarri eskubiko " @@ -3820,7 +3913,7 @@ msgid "Click a connection to edit control points." msgstr "Konexioan klik egin kontrol puntuak editatzeko." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3828,34 +3921,116 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Orain %s detektatzen" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Itxi" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, fuzzy, c-format msgid "Directory '%s' does not exists" msgstr "" "%s direktorioa ez da existitzen.\n" "Existitzen den direktorio bat ezarri mesdez." -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "Loteen Prozesatzailea" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" "PTBatcher irekitzen du, Hugin proiektu fitxategiak loteka prozesatzeko tresna" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Hugin-en Lenteak Kalibratzeko GUI-a" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3869,11 +4044,11 @@ "Ezin da \"%s\" bidean topatu.\n" "Agian gaizki instalatu duzu edo hobespenetan bide desegokia ezarri duzu." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, fuzzy, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3882,15 +4057,15 @@ "%namefile, %i edo %s erabili kontrol puntuen detektatzailerantzako sarrera " "fitxategientzat" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Errorea kontrol puntuen detektatzailearen komandoan" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 #, fuzzy msgid "" "Command line for control point detector too long.\n" @@ -3903,14 +4078,14 @@ "Mesedez, irudi gutxiago hautatu, edo irudiak izen bide motzagoa duen karpeta " "batean sartu\n" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Irudi gehiegi hautatu dira" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3921,38 +4096,38 @@ "\n" "Ezin izan da %s komandoa exekutatu." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExekuzio Errorea" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "kontrol puntuak bilatzen" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Ezin da komandoa exekutatu: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3961,9 +4136,9 @@ "%s komandoak\n" "%d errore kodea eman du." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, fuzzy, c-format msgid "" "Could not open %s for reading\n" @@ -3978,13 +4153,13 @@ "\n" "Exekutatutako komandoa: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Kontrol puntuen detektatzailearen errorea" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 #, fuzzy msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " @@ -3993,7 +4168,7 @@ "Mesedez, %i erabili sarrera fitxategiak definitzeko eta %k gako-puntuen " "fitxategiarentzako" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4001,11 +4176,11 @@ "Mesedez, %k erabili gako-puntuen fitxategia definitzeko eta %o betetzen " "dutenirteerako pausuen proiekzio fitxategiarentzako" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "gako fitxategia sortzen" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4018,11 +4193,11 @@ "\n" "Ezin da komandoa exekutatu: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Defektuzkoa" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4030,261 +4205,261 @@ "Ezin da martxan dagoen lotea garbitu.\n" "Ezeztatu nahi duzu?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Lotea garbituta." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Errorea: ezin da egoera lortu, %d indizedun proiektua ez dago zerrendan." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Errorea: ezin da lote fitxategia kargatu." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Lotea ondo bukatu da." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Lotea erroreekin bukatu da." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Itzaltzea hasten..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Itzaltzen" -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Itzaltzea hasten..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Itzaltzea hasten..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Proiektu fitxategia gorde" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Ez da irteerako aurrizkia definitu" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Ez da proiektuarentzako izenik definitu" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Elkartzen" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Asistentea" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Errorea borratzean, %d id-a duen proiektua ez dago zerrendan." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Errorea: ezin da proiektu fitxategia borratu" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Lotea martxan jartzen..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Lotea iadanik martxan dago." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "Komandoa exekutatzen \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Orain %s elkartzen" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Orain %s detektatzen" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Errorea: Ezin da egoera ezarri, %d indizedun proiektua ez dago zerrendan." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Ezer gutxi egiten..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "Ezer" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Itzali bukatzean" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Mesedez exekutatuko denkomando-lerroko aplikazioa sartu:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Sartu aplikazioa" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Proiektuak bilatzeko direktorioa definitu" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Proiektuaren iturburu fitxategi(ak) definitu" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "Proiektuak gehitu dira " -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "%s proiektua elkartze zerrendan sartu da." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "%s proiektua asistentearen zerrendan sartu da." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Lotea geldituta" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugin lote prozesadorea" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Proiektuarentzako irteera aurrizkia definitu" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 #, fuzzy msgid "The prefix of an assistant target cannot be changed." msgstr "Asistentearen helburu aurrizkia ezin da aldatu." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Mesedez proiektua hautatu" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Mesedez proiektua hautatu" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Ireki nahi den lote fitxategia definitu" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Lote fitxategiak (*.ptb)|*.ptb;|Fitxategi guztia (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Ezin da Hugin-en aplikazioa ireki." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Proiektua hautatu gabe. Ireki Hugin proiekturik gabe?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Lotea geldituta" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Lotea jarraitzen..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 #, fuzzy msgid "" "There are failed projects in the list.\n" @@ -4293,7 +4468,7 @@ "Zerrendan errorea eman duten proiektuak daude.\n" "Borratu baita ere?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4301,16 +4476,16 @@ "Martxan dagoen proiektua ezin da borratu.\n" "Ezeztatu nahi duzu?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "Proiektua borratuta" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Borratu nahi duzun proiektua hautatu mesedez" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4318,16 +4493,16 @@ "Martxan dagoen proiektua ezin da berrabiarazi.\n" "Ezeztatu nahi duzu?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "Proiektua berrabiarazi " -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Berrabiarazi nahi duzun proiektua hautatu mesedez" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4335,31 +4510,31 @@ "Martxan dauden proiektuak ezin dira berrabiarazi.\n" "Lotea ezeztatu nahi duzu?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Gorde nahi duzun lote fitxategia ezarri" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Lote fitxategia (*.ptb)|*.ptb;|Fitxategi guztiak (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Lotea garbitu" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Lotea hasten" @@ -4395,7 +4570,7 @@ msgid "E&xit" msgstr "Irten &x" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4405,11 +4580,11 @@ "Leiho hau itxiz gero, galduko dira.\n" "Jarraitu hala ere?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Onartuta" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4419,11 +4594,11 @@ "Jarraitzen baduzu, banatuko dira.\n" "Jarraitu hala ere?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Gelditu" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4432,7 +4607,7 @@ "%s direktorioa ez da existitzen.\n" "Existitzen den direktorio bat ezarri mesdez." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4440,7 +4615,7 @@ "Egin ezin den panorama bat aukeratu duzu.\n" "Hautatu panorama bat behintzat eta probatu berriro, mesedez." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 #, fuzzy msgid "" "Not all project files could be written successfully.\n" @@ -4450,142 +4625,144 @@ "Ezin izan dira proiektu fitxategi guztiak ongi idatzi.\n" "Agian ez duzu idazteko baimenik edo zure disko gogorra beteta dago." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "Hautatutako irudiak proiektu honetatik borratu" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "Panoramak bilatzen" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "%s fitxategia irakurtzen" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Hasi" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "%d panorama posible topatu dira." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Ez da panorama posiblerik topatu." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d irudi: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Parametroetan sintaxi errorea topatu da, abortatzen." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 #, fuzzy msgid "PTBatcherGUI started" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Itxaroten" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Prozesatzen" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Osatuta" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Errorea" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fitxategia faltan" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Geldituta" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Proiektua" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Irteera aurrizkia" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Egoera" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Azken aldiz aldatuta" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Irteera formatua" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Proiekzioa" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Tamaina" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Errorea, ezin da id-a moldatu" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Laguntzailea" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Aurrizkia aldatu" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Proiektua berrabiarazi" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Huginekin editatu" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Borratu" @@ -4620,16 +4797,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Log fitxategiak (*.log)|*.log|Fitxategi guztiak (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Ezin da %s proiektu fitxategia ireki." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Proiektu fitxategiarentzako proiektu erroa definitu" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4640,7 +4817,7 @@ "fitxategi izen bat." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Hugini buruz" @@ -4673,19 +4850,19 @@ msgstr "Sistema" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4765,8 +4942,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Hautatu..." @@ -4857,7 +5037,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Hobespenak" @@ -4891,10 +5071,6 @@ msgid "Send selected panoramas to queue" msgstr "Hautatutako panoramak zerrendara bidali" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Itxi" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Panoramak bilatzen" @@ -4997,12 +5173,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "Itxi (&Q)" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Programa itxi" @@ -5107,47 +5283,156 @@ msgid "adddir" msgstr "gehdir" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "aurreko irudi bikotea" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "hurrengo irudi bikotea" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "modua:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Deskribapena:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "lerro bertikala" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Mota:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "lerro horizontala" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Irudi guztiak batera" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "Leihoaren tamaina hartu" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Zerrenda anitzeko panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Momentuak gaituta dagoen puntua optimizatzen saiatuko da" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Aurretik zerrendatutako panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programa:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumentuak:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Garbitzeko argumentuak:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Ezaugarrien deskribatzailea:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Ezaugarrien topatzailea:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +#, fuzzy +msgid "Leave empty when no control point detector should run on stacks." +msgstr "Kontrol puntuen detektorearen ezarpenak gorde" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Aukera aurreratua" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Hobespen honek ez du aukera aurreraturik." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +#, fuzzy +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Exekutatu baino lehen patroi hauek aldatuko dira:\n" +"%o -- irteera proiektua (0.oto atzizkia erabiliko da Autopano erabiltzean)%" +"p -- bikoteen arteko kontrol puntu kopurua\n" +"%v -- lehengo irudiaren HFOV\n" +"%f -- Lehengo irudiaren proiekzioa (0-4, panotools-en bezala)%i -- irudi " +"fitxategiak\n" +"%n -- irudi fitxategiak dituen fitxategia\n" +"%s -- panotools-en sarrera scripta\n" +"%k -- erdiko gako fitxategia(k)" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Kontrol puntuen DETECTORearen parametroak" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "aurreko irudi bikotea" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "hurrengo irudi bikotea" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "modua:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "lerro bertikala" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "lerro horizontala" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "Leihoaren tamaina hartu" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Momentuak gaituta dagoen puntua optimizatzen saiatuko da" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" msgstr "" #: hugin1/hugin/xrc/cp_editor_panel.xrc:267 @@ -5201,7 +5486,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Borratu" @@ -5209,156 +5494,194 @@ msgid "Select by Distance" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Deskribapena:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Defektuzko Fitxategi Formatua:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Mota:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (A. Jennyren egina)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Irudi guztiak batera" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +#, fuzzy +msgid "No" +msgstr "Ezer" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Panorama Tresnen Script-a editatu" + +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." msgstr "" +"Script hau Panorama Tresnen motorrera bidaliko da. Lerro hauek " +"aldatzeateknika aurreratua da." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Zerrenda anitzeko panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Aldaketa hauekin jarraitu" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Aldaketak atzera bota eta ezeztatu" + +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Aurretik zerrendatutako panorama" +#: hugin1/hugin/xrc/images_panel.xrc:42 +#, fuzzy +msgid "Minimum overlap:" +msgstr "Lerroaren tamaina minimoa:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:67 +#, fuzzy +msgid "Maximum Ev difference:" +msgstr "ezberdintasuna" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programa:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumentuak:" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Garbitzeko argumentuak:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Orokorra" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Ezaugarrien deskribatzailea:" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +#, fuzzy +msgid "Positions" +msgstr "Irudiaren Posizioa" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Ezaugarrien topatzailea:" +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Lenteen parametroak" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:96 +#, fuzzy +msgid "Photometric parameters" +msgstr "Lerrokatze fotometrikoa" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +#: hugin1/hugin/xrc/images_panel.xrc:130 #, fuzzy -msgid "Leave empty when no control point detector should run on stacks." -msgstr "Kontrol puntuen detektorearen ezarpenak gorde" +msgid "Lens type" +msgstr "Lente mota:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Aukera aurreratua" +#: hugin1/hugin/xrc/images_panel.xrc:145 +#, fuzzy +msgid "Add images..." +msgstr "Irudiak gehitu" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Hobespen honek ez du aukera aurreraturik." +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Lente mota:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Luzera fokalaren biderkatzailea" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Ezaugarrien XXX" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Hobespenak" + +#: hugin1/hugin/xrc/images_panel.xrc:254 #, fuzzy -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"Exekutatu baino lehen patroi hauek aldatuko dira:\n" -"%o -- irteera proiektua (0.oto atzizkia erabiliko da Autopano " -"erabiltzean)%p -- bikoteen arteko kontrol puntu kopurua\n" -"%v -- lehengo irudiaren HFOV\n" -"%f -- Lehengo irudiaren proiekzioa (0-4, panotools-en bezala)%i -- irudi " -"fitxategiak\n" -"%n -- irudi fitxategiak dituen fitxategia\n" -"%s -- panotools-en sarrera scripta\n" -"%k -- erdiko gako fitxategia(k)" +msgid "Run selected control point detector on the selected images" +msgstr "Hautatutako irudiak lotzen duten kontrol puntuak borratu" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Kontrol puntuen DETECTORearen parametroak" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimizatu" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +#, fuzzy +msgid "Geometric:" +msgstr "Geometrikoa" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 +#: hugin1/hugin/xrc/images_panel.xrc:314 #, fuzzy -msgid "Invalid filenames" -msgstr "Defektuzko Fitxategi Formatua:" +msgid "Photometric:" +msgstr "Fotometrikoa" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Panorama Tresnen Script-a editatu" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Hautatutako Irudia" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Lenteen datuak kargatu..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Script hau Panorama Tresnen motorrera bidaliko da. Lerro hauek " -"aldatzeateknika aurreratua da." +"Ikuspegi horizontala (HFOV) edo lente fokala eta mozketa faktorea sartu:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Aldaketa hauekin jarraitu" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Aldaketak atzera bota eta ezeztatu" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "graduak" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Kamara eta Lenteen datuak" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Biratzea:" @@ -5367,35 +5690,11 @@ msgid "Translation parameter" msgstr "Estekaren parametroak" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -#, fuzzy -msgid "Positions" -msgstr "Irudiaren Posizioa" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "ikuspegiaren graduak (v):" @@ -5495,7 +5794,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Laguntza" @@ -5539,8 +5838,8 @@ msgstr "Maskara kargatu" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Gorde" @@ -5553,128 +5852,47 @@ msgid "Manipulate image variables" msgstr "Irudi aldagaiak:" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:42 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Minimum overlap:" -msgstr "Lerroaren tamaina minimoa:" +msgid "WB reference:" +msgstr "Hobes&penak" -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:67 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 #, fuzzy -msgid "Maximum Ev difference:" -msgstr "ezberdintasuna" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Orokorra" +msgid "Additional dcraw parameters:" +msgstr "Estekaren parametroak" -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Lenteen parametroak" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -#, fuzzy -msgid "Photometric parameters" -msgstr "Lerrokatze fotometrikoa" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -#, fuzzy -msgid "Lens type" -msgstr "Lente mota:" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -#, fuzzy -msgid "Add images..." -msgstr "Irudiak gehitu" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Lente mota:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Luzera fokalaren biderkatzailea" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Ezaugarrien XXX" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Hobespenak" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -#, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "Hautatutako irudiak lotzen duten kontrol puntuak borratu" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimizatu" - -#: hugin1/hugin/xrc/images_panel.xrc:293 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 #, fuzzy -msgid "Geometric:" -msgstr "Geometrikoa" +msgid "Processing profile:" +msgstr "Prozesatzen:" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -#, fuzzy -msgid "Photometric:" -msgstr "Fotometrikoa" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Hautatutako Irudia" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Lenteen datuak kargatu..." - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" msgstr "" -"Ikuspegi horizontala (HFOV) edo lente fokala eta mozketa faktorea sartu:" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "graduak" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Kamara eta Lenteen datuak" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Inportatu" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5828,15 +6046,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -#, fuzzy -msgid "No" -msgstr "Ezer" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5897,21 +6106,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "Desegin (&U)" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Azkenengo ekintza desegin" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "Be&rregin" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Azkenengo ekintza berregin" @@ -5958,12 +6167,12 @@ msgid "Use only normal control points in optimization." msgstr "Puntu kopurua irudiko" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimizatu" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Optimizatzailea oraingo hobespenekin berrexekutatu" @@ -5994,16 +6203,16 @@ msgid "Run a python script" msgstr "Python script bat exekutatu" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "Ikusi &V" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Pantaila Osoa" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 #, fuzzy msgid "Shows Hugin's main window on full-screen" msgstr "Huginen leiho nagusia pantaila osoan ikusi" @@ -6088,20 +6297,20 @@ msgid "Show the Stitcher panel" msgstr "Elkartzailearen panela ikusi" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Aukera aurreratua" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Erabiltzaile Interfazea" @@ -6123,86 +6332,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Botoi ezberdinen zenbait informazio eta abar" -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "Eguneko aholkua (&T)" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Eguneko aholkuren bat bistaratu." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Te&klatuaren laster-teklak" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "teklatuaren laster-teklak" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Maiz Egindako Galderak" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "Honi buruz (&A)" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "Hobes&penak" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "Berria (&N)" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Proiektu berria" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "Ireki (&O)" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Ireki proiektua" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "Gorde (&S)" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Oraingo proiektu fitxategia gorde" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Gorde honela (&a)" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Oraingo proiektua fitxategi berri batean gorde" @@ -6219,19 +6428,19 @@ "Oraingo proiektua PTStitcher-ekin bateragarria den script fitxategi batean " "idatzi,loteka prozesatzeko baliagarria" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Oraintsu erabilitako proiektuak" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Oraintsu gehien erabilitako proiektu fitxategiak" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Lote Prozesatzailea exekutatu (&R)" @@ -6317,7 +6526,7 @@ msgid "Show the OpenGL preview image" msgstr "OpenGL-ren aurrebista irudia ikusi" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Aurrebistaren panorama" @@ -6374,15 +6583,10 @@ msgstr "Eskualdea lente hauen irudi guztietatik kendu" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Esportatu" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Inportatu" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopiatu" @@ -6427,8 +6631,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6535,7 +6739,8 @@ msgid "execute the PTOptimizer engine" msgstr "PTOptimizatzaile motorra exekutatu" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Irudi orientazioa" @@ -6581,39 +6786,39 @@ msgid "Interpolator (i):" msgstr "Interpolazioa (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bikubikoa)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sink 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Lerro bikoitza" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Hurbileko auzokidea" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sink 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Iturburuko pixelen balioen arteko hurbilketa" @@ -6642,7 +6847,7 @@ msgid "Enfuse options" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Ikuspegia:" @@ -6785,10 +6990,6 @@ msgid "Image fusion:" msgstr "Irudien fusioa:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR elkartzailea:" @@ -6889,16 +7090,16 @@ msgid "Output parameters" msgstr "Azpiko parametroak" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Blend modua:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "" @@ -6967,29 +7168,43 @@ msgid "This affects the control points editor and mask editor." msgstr "Maskaretan dauden kontrol puntuak borratu" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(hutsik utzi SE-ren defektuzko balioarentzako" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Exekuzio paraleloa" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Fitxategi Hobespenak" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Behin-behineko dir:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(hutsik utzi SE-ren defektuzko balioarentzako" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 #, fuzzy msgid "Default project filename:" msgstr "Ireki proiektu fitxategia" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 #, fuzzy msgid "Default output prefix:" msgstr "Emaitzako aurrizkia definitu" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7007,45 +7222,45 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 #, fuzzy msgid "Default filenames" msgstr "Defektuzko Fitxategi Formatua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 #, fuzzy msgid "Filenames" msgstr "Fitxategia" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Irudia kargatzen" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Kargatu eta gero irudiak automatikoki zerrendatu." -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Lerro bertikalak topatu" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Irudietan lerro bertikalak topatu panorama lerrokatzeko" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Hodei-itxurako kontrol puntuak borratu (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Laguntzailearen aukerazko pausuak" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Lerrokatze automatikoa" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7053,67 +7268,67 @@ "Gainjartze bakoitzeko\n" "kontrol puntu kopurua" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "zabalera max. portzentaia" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Kontrol Puntuen Editorea" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR eta 16 Bitetako bistaratzea" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Kurba" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineala" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmikoa" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "GUIan bistaratzeko erabilia" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Zabalera partxeatu:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixel" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Azaleraren zabalera bilatu:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "Irudi zabaleraren portzentaia" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Korrelazio Atalasea:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7121,128 +7336,124 @@ "0: antzekotasunik ez\n" "1: antzekotasun maximoa" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Biraketaren bilatzailea" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Biraketaren bilatzailea aktibatu (geldoagoa, baina finagoa)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Hasiera angelua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Bukaera angelua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Pausuak:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Kontrol Puntuen Igartzaileak" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Kontrol Puntuak Topatzeko Programak" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Berria..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Editatu..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Mugitu gora" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Mugitu behera" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Defektuzkoa bezala ezarri" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Laguntzaileak defektuzko hobespenak erabiltzen ari da." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Irteera Formatua" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Defektuzko Fitxategi Formatua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "Helburuko panoramaren defektuzko formatua" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF Konpresioa:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "defektuzko TIFF konpresioa" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG Kalitatea:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "Defektuzko JPEG konpresio ezarpena" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "Blend modua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "Defektuzko Fitxategi Formatua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Prozesadorea" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&proiektua" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Elkarketa exekutatuko duen motorea" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Orain hasi lanak elkartzen" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7252,38 +7463,38 @@ "zerrendako lanak egiten.Bestela prozesadorea geldituta bezala jartzen da " "martxan eta erabiltzaileaizan behar du prozesua eskuz martxan jartzen duena" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Existitzen diren fitxategiak gainidatzi" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "KONTUZ: existitzen diren fitxategiak abisatu gabe gainidatziko dira." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Irteera Berritsua" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "Xehetasunak ikusteko aktibatu, proiektuaren " -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Elkartzen" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Metadatuak helburu fitxategietara kopiatu ExifTool erabiliz" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Nona aukerak" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7292,56 +7503,56 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "(hutsik utzi SE-ren defektuzko balioarentzako" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Aukera aurreratuak" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Hari kopurua:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7353,83 +7564,85 @@ "Zenbaki hau zure sisteman eskuragarri dauden prozesadore edo nukleotara " "egoki ezazu." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 igartze automatikorako" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "Elkartzen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Defektuzko Interpolatzailea (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Defektuz moztutako irudiak sortu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "GPU bermapeatzeko erabili (EXPERIMENTALA)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Txartel grafikoaren GPU-a erabili birmapeatzea azkartzeko" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Defektuzko Parametroak:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Proiektu berrientzako defektuzko argumentuak dira hauek.\n" "Elkartzeko fitxan proiektu konkretuetarako alda daitezke.\n" "-w, -o eta --compression parametroak ez dira ezarri behar, huginek egiten " "baitu." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programak" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celesteren parametroak" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM atalasea:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7437,19 +7650,19 @@ "0.5 baino handiagoa: sentikortasun txikiagoa\n" "0.5 baina txikiagoa: sentikorragoa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor filtro tamaina" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "txikia" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "handia" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7457,7 +7670,7 @@ "Handia zehatzagoa\n" "txikiak irudiaren ertzetik hurbil dauden kontrol puntuak azter ditzake" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7467,78 +7680,78 @@ "koloreakaztertuz ezartzen da.\n" "Konputazioa azkartzeko, ausazko puntu batzuk bakarrik erabiltzen dira." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 #, fuzzy msgid "Number of points per image: " msgstr "Puntu kopurua irudiko" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 #, fuzzy msgid "Photometric optimizer" msgstr "Optimizazio fotometrikoa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "Abisua" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "Panorama optimizatzen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "Optimizatu orain!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "Pistak bakarrik aurrebista azkarraren leihoan ikus daitezke" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Hobespenak - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "Ezkerreko irudian puntua hautatu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7558,11 +7771,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Aurreikuspena horizontalki erdiratu" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Erdialdea" @@ -7570,13 +7783,15 @@ msgid "Show the whole panorama" msgstr "Panorama osoa ikusi" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Ikuspegia kalkulatu" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Egokitu" @@ -7584,7 +7799,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Horizonte irregularra automatikoki zuzendu" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "" @@ -7681,33 +7897,33 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Gris hautatzailea" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Txuri balantze globala zuzendu azalera gris neutral bat hautatuz." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "&Editatu" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "Borratu kontrol puntuen detektorearen ezarpena" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Atzeko planoa:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Eskala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7720,166 +7936,154 @@ "zehazten dute.\n" " * Lerroan klikatu erlazionatutako irudiak Kontrol Puntuen fitxan ikusteko." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "x" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Gidak" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Hirukote erregela" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Metodo diagonala" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Urrezko hirukia (behera)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Urrezko hirukia (gora)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Horizonte irregularra automatikoki zuzendu." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Arrastatze modua:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Aplikatu" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Panorama mugitu edo irudiak posiziora arrastatu" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Mugitu/Arrastatu" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Mozketa azalera irudiek betetzen duen errektangelurik luzeenarekin ezarri" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 #, fuzzy msgid "HDR Autocrop" msgstr "Mozketa automatikoa" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 #, fuzzy msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Mozketa azalera irudiek betetzen duen errektangelurik luzeenarekin ezarri" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "ezkerra:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "goi:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "eskubi:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "behea:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Mozketa posible den azalerarik maximora berrabiarazi." -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Panoramaren mozketa azalera aldatu" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 #, fuzzy msgid "Panorama &editor" msgstr "Panoramaren aurreikuspena" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 #, fuzzy msgid "&Overview" msgstr "Gainbista" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 #, fuzzy msgid "Shows the overview of the panorama sphere." msgstr "Panorama osoa ikusi" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Sareta" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Irudiak gehitu" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Pila honetako posizioak estekatu" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Pila honetako posizioak estekatu" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Pila honetako posizioak estekatu" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "hautatutako irudien lenteak aldatu" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Proiektua berrabiarazi" @@ -8168,6 +8372,72 @@ "irudiekinbakarrik dauka zentzua, kontrol puntu askorekin eta ondo banatuta" #, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "Hobes&penak" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Irudiak" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Irudiak gehitu" + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Oraingo proiektuari beste irudi bat gehitu" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Maskara gorde" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Hautatuko irudi(ak) borratu" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Ertzak topatzeko eskala" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Panorama mugitu edo irudiak posiziora arrastatu" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Panoramaren mozketa azalera aldatu" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "GPU bermapeatzeko erabili (EXPERIMENTALA)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Irudi fitxategi guztiak|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" +#~ "*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;" +#~ "*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF " +#~ "fitxategiak (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*." +#~ "png;*.PNG|HDR fitxategiak (*.hdr)|*.hdr;*.HDR|EXR fitxategiak (*.exr)|*." +#~ "exr;*.EXR|All fitxategiak (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (A. Jennyren egina)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&proiektua" + +#~ msgid "×" +#~ msgstr "x" + +#, fuzzy #~ msgid "Interface" #~ msgstr "Erabiltzaile Interfazea" @@ -8319,9 +8589,6 @@ #~ "\n" #~ "(Errore kodea: %s)" -#~ msgid "Parallel execution" -#~ msgstr "Exekuzio paraleloa" - #~ msgid "Stitch several projects parallel." #~ msgstr "Proiektu batzuk paraleloan elkartu" diff -Nru hugin-2018.0.0+dfsg/src/translations/extract-messages.pl hugin-2019.0.0+dfsg/src/translations/extract-messages.pl --- hugin-2018.0.0+dfsg/src/translations/extract-messages.pl 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/extract-messages.pl 2018-02-03 14:34:28.000000000 +0000 @@ -0,0 +1,86 @@ +#!/usr/bin/env perl +use warnings; +use strict; +use v5.10; # for say +use File::Which; +use File::Find; +use File::Spec; +use File::Temp; +use Cwd; + +# define some variables +my $project='hugin'; +my $bugaddr='https://bugs.launchpad.net/hugin/'; +my $copyright='Pablo dAngelo'; + +# safety checks +my $xgettext=which 'xgettext'; +if(!defined $xgettext) {die 'ERROR: xgettext not found';} +my $wxrc=which 'wxrc'; +if(!defined $wxrc) { die 'ERROR: wxrc not found'; } +my $msgmerge=which 'msgmerge'; +if(!defined $msgmerge) { die 'ERROR: msgmerge not found'; } +# store current directory +my $basedir=getcwd; +say 'Found all necessary programs'; + +# create temp directory for all temporary files +my $temp_dir=File::Temp::tempdir(CLEANUP => 1); +# temp file which stores all files which should be searched by xgettext +my ($file_list_handle, $file_list)=File::Temp::tempfile(DIR => $temp_dir); +# store some absolute file names +my $path_potfiles_in=File::Spec->rel2abs('POTFILES.in', $basedir); +my $path_project_pot=File::Spec->rel2abs("$project.pot", $basedir); + +# parse all xrc files with wxrc +chdir ".."; +my @xrc_to_cpp; +find({wanted => sub { if (-f and /\.xrc$/) + { + my $filename=File::Spec->abs2rel($File::Find::name); + say("Processing $filename"); + my $path_temp; + (undef, $path_temp) = File::Temp::tempfile(DIR => $temp_dir, OPEN => 0); + system($wxrc, '-g', $filename, '-o', $path_temp); + push @xrc_to_cpp, $path_temp; + }}, no_chdir => 1}, getcwd); + +#create array of all C++ files +my @cfiles; +my $cstartdir=getcwd; +find({wanted => sub { if (-f) { + my $filename=File::Spec->abs2rel($File::Find::name); + if ($^O eq 'MSWin32') {$filename =~ tr#\\#/#;}; + push(@cfiles, $filename) if /\.(cpp|c|h)$/; + }}, no_chdir => 1}, getcwd); +@cfiles=sort @cfiles; +push @cfiles, @xrc_to_cpp; + +# create input file list for xgettext +say 'Extracting messages'; +# first write all C++ files in file +foreach (@cfiles) {say $file_list_handle $_;}; +# then add files from POTFILES.in (e.g. tips) +open(my $potfilein, '<', $path_potfiles_in) or die "ERROR: Could not open file $path_potfiles_in"; +while(<$potfilein>){say $file_list_handle $_;}; +close $potfilein; +close $file_list_handle; + +# run xgettext +chdir $basedir; +system($xgettext, '--from-code=UTF-8', '--c++', '--keyword=_', '--copyright-holder='.$copyright, + '--msgid-bugs-address='.$bugaddr, '--files-from='.$file_list, '--directory='.$cstartdir, + '--output='.$path_project_pot)==0 or die "ERROR during running $xgettext"; +say 'Done extracting messages'; + +# update all po files with new template +say 'Merging translations'; +find(sub{if (-f and /\.po$/) { + system($msgmerge, '--verbose', '-o', "$_.new.po", $_, $path_project_pot)==0 or die "ERROR during running $msgmerge"; + rename("$_.new.po", $_); + }}, '.'); +say 'Done merging translations'; +# unify line breaks to unix +say 'Unify line breaks'; +system('perl', 'unix_linebreaks.pl', $path_project_pot, '*.po', 'outdated/*.po'); +say 'All done'; diff -Nru hugin-2018.0.0+dfsg/src/translations/extract-messages.sh hugin-2019.0.0+dfsg/src/translations/extract-messages.sh --- hugin-2018.0.0+dfsg/src/translations/extract-messages.sh 2016-06-12 15:28:57.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/extract-messages.sh 2018-02-03 14:34:28.000000000 +0000 @@ -21,10 +21,6 @@ cd ${WDIR} echo "Done preparing rc files" -echo "Filtering out ignored strings" -./filter-ignored-strings.py xrc.cpp -echo "Done filtering" - echo "Extracting messages" cd ${BASEDIR} # we use simple sorting to make sure the lines do not jump around too much from system to system diff -Nru hugin-2018.0.0+dfsg/src/translations/filter-ignored-strings.py hugin-2019.0.0+dfsg/src/translations/filter-ignored-strings.py --- hugin-2018.0.0+dfsg/src/translations/filter-ignored-strings.py 2011-07-17 08:39:30.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/filter-ignored-strings.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -#!/usr/bin/env python - -import sys - -ignored = [] -for line in open("ignored-strings.txt"): - ignored.append(line) - -filtered = [] -for string in open(sys.argv[1]): - if string not in ignored: - filtered.append(string) - -output = open(sys.argv[1], "w") -for string in filtered: - output.write(string) diff -Nru hugin-2018.0.0+dfsg/src/translations/fi.po hugin-2019.0.0+dfsg/src/translations/fi.po --- hugin-2018.0.0+dfsg/src/translations/fi.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/fi.po 2019-02-17 15:24:33.000000000 +0000 @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: fi\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2010-06-17 12:45+0200\n" "Last-Translator: Juha Helminen \n" "Language-Team: <@>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Generator: Lokalize 1.0\n" "X-Poedit-Language: Finnish\n" "X-Poedit-Country: FINLAND\n" @@ -51,14 +51,14 @@ msgid "Searching for best crop..." msgstr "etsitään pilven tyyppisiä kohdistuspisteitä" -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "Ulkoista ohjelmaa %s ei löydetty paketista, palautuu systeemin polkuun" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -84,9 +84,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Tiedosto %s on jo olemassa. Ylikirjoita?" @@ -123,7 +123,7 @@ msgstr "Rajauskertoimen pitää olla positiivinen." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -133,24 +133,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 #, fuzzy msgid "Hugin" msgstr "Unkari" @@ -172,8 +176,8 @@ msgstr "Täysden ruudun kalansilmä" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Suorakulmaistettu" @@ -205,11 +209,13 @@ msgid "builtin" msgstr "" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineaarinen" @@ -233,16 +239,16 @@ msgid "Error loading lens parameters" msgstr "Virhe objektiivin parametrien haussa" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Tallenna objektiiviparametritiedosto" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Tallenna projekti" @@ -274,22 +280,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Virhe prosessin %ld pysäytyksessä, code 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Peruuta" @@ -327,12 +334,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Projektitiedostoa ei voitu avata:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "ei voi avata skriptiä : %s" @@ -342,8 +349,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "virhe panotools skriptin jäsentelyssä: %s" @@ -357,17 +364,17 @@ msgid "Could not create temporary file" msgstr "Ei voi avata tilapäistiedostoa" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Virhe työstämisessä" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -375,11 +382,11 @@ "Ylikirjoitetaanko olemassa olevat kuvat?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Ylikirjoitetaan olemassa olevat kuvat" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -388,311 +395,321 @@ "Virhe projektin kuvien yhdistämisessä\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 #, fuzzy msgid "Error during running assistant" msgstr "Virhe työstämisessä" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, fuzzy, c-format msgid "" "Error while running assistant\n" "%s" msgstr "virhe panotools skriptin jäsentelyssä: %s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Koostaa panoraamaa" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "Versio %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "Tuloksen etuliite" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Sekoitin:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "Sisäinen virhe" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Valotus:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Nona valinnat" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Nona valinnat" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "Pisteiden lukumäärä kuvalle" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "Sekoitetut valosustasot" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "Panoraaman pohjan koko" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 #, fuzzy msgid "Projection:" msgstr "Projektio" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "Käytä GPU:ta sijoituslaskentaan (KOKEELLINEN)" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 #, fuzzy msgid "Panorama Outputs:" msgstr "Normaali tuloste:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 #, fuzzy msgid "Exposure fused from stacks" msgstr "Valotuksen yhdistäminen" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 #, fuzzy msgid "High dynamic range" msgstr "Matala valoisuuden vaihtelu" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 #, fuzzy msgid "Remapped Images:" msgstr "Kohde skaalatut kuvat" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 #, fuzzy msgid "Exposure fused stacks" msgstr "Valotuksen yhdistäminen" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "Tallenna rajatut kuvat" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "CPUn ydinten lukumäärä:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Tiedoston nimi:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "Panoraaman pohjan koko" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "Objektiivin tyyppi:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "Valotus (EV)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "Kohde skaalatut kuvat" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "Kohdistetaan kuvia" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "Vinjentointi ja valotuskorjaukset" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "Sekoitetut valosustasot" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "Muuta pinon numero" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "Kohde skaalatut kuvat" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "Muuta pinon numero" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Yhdistetään %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 #, fuzzy msgid "first image" msgstr "Tallenna rajatut kuvat" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 #, fuzzy msgid "last image" msgstr "Lisää kuva" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 #, fuzzy msgid "Camera maker" msgstr "Kameran valmistaja:" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 #, fuzzy msgid "Camera model" msgstr "Kameran malli:" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -700,36 +717,70 @@ msgid "Lens" msgstr "Objektiivi" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 #, fuzzy msgid "unknown projection" msgstr "Projektio" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Kuva tiedosto:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Ladataan kuvaa %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Virhe" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -737,25 +788,11 @@ "again." msgstr "" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Kaikki tiedostot|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Kaikki tiedostot (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -767,27 +804,27 @@ msgstr "Syöte \"%s\" kohteelle %s ei ole oikea numero\n" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Varoitus" @@ -806,7 +843,7 @@ msgid "Could not save information into database." msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -817,11 +854,11 @@ "%s\n" "Poistu" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Kuvan muotoa ei tueta" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -830,7 +867,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -841,77 +878,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -919,44 +956,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "Palauta projekti" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "Komentorivivalinnat" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "Ylikirjoitetaan olemassa olevat kuvat" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Kuvatiedosto ei löydy" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Valitse kuvan muokkain" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -967,16 +1004,17 @@ "\n" "Paina OK poistaaksesi." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Virhe havaittu" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Lisää kuvia" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -985,32 +1023,32 @@ "Virhe, malli odottaa %d kuvaa,\n" "mutta nykyisessä projektissa on %d kuvaa\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Virhe projektin latauksessa" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc hakemisto ei löydy paketoinnista" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Vakava virhe" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1040,7 +1078,7 @@ "Please check the image again, if you selected the correct images." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Lisää kuvia: peruttu" @@ -1053,9 +1091,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 #, fuzzy msgid "" "There are invalid values in the input boxes.\n" @@ -1074,7 +1112,7 @@ msgstr "Vaihda objektiivi..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 #, fuzzy msgid "Finished" msgstr "Suomi" @@ -1086,160 +1124,160 @@ "parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " "there are no lines found, change the parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 #, fuzzy msgid "Save lens parameters to ini file" msgstr "Tallenna objektiivin parametrit tiedostoon" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "Tallenna objektiivin parametrit tiedostoon" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #, fuzzy msgid "Saving lens data" msgstr "Lataa objektiivien tiedot..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 #, fuzzy msgid "Save lens" msgstr "Tallenna objektiivi..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Tallenna projektitiedosto" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "Celeste ajossa" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "Maskien lukumäärä" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "Ajetaan komento \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, fuzzy, c-format msgid "Operating System: %s" msgstr "Luodaan harmaasävyasteikko %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, fuzzy, c-format msgid "Architecture: %s" msgstr "Arkkitehtoninen" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, fuzzy, c-format msgid "Version: %s" msgstr "Versio %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "Kamera ja objektiivien tiedot" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano lähteestä http://autopano.kolor.com ei ole saatavissa OSX:lle" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Käyttää Autopano-Sift toisen sijaan" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1247,65 +1285,66 @@ "Ainakin yksi syötekenttä on tyhjä.\n" "Tarkista syötteet." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Yritä yhdistää kaikki päällekäiset kuvat." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Työskentele vain kuvaparien kanssa joille ei ole kohdistuspisteitä." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Valitse kohdistuspisteiden tunnistusohjelma" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Suoritettavat (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "vasen x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "vasen y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "oikea x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "oikea y" # Kohdistuspiste-välilehdellä alaosaan -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Kohdistus" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Etäisyys" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "uusi kohdistuspiste lisätty" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "etsitään samanlaisia pisteitä..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Virhe hienosäädön aikana" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1314,26 +1353,30 @@ "Piste hienosäädetty, kulma: %.0f astetta, korrelaatiokerroin: %0.3f, " "kaarevuus: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "vaihda pisteitä tai paina hiiren oikeata näppäintä parin lisäämiseksi" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Arvioitu piste on kuvan ulkopuolella" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 #, fuzzy msgid "No similar point found." msgstr "Samanlaista pistettä ei löydetty" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, fuzzy, c-format msgid "" "Check the similarity visually.\n" @@ -1343,31 +1386,37 @@ "Samanlaista pistettä ei löydetty. Tarkista samanlaisuus visuaalisesti.\n" "Korrelaatiokerroin (%.3f) on vähemmän kuin kynnysarvo asetuksissa." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Lisää uusi linjaus" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linja %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Vastaavuussuhteen kynnys:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normaali" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "pystylinja" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "vaakalinja" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1377,38 +1426,38 @@ "Syötä isompi numero,\n" "niin luodaan vähemmän pisteitä." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Kulman tunnistuksen kynnysarvo" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Luo kohdistuspisteitä" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Kulman tunnistuksen skaala" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Virhe kohdistuspisteen luonnissa:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Valitse piste oikeassa kuvassa" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1416,56 +1465,57 @@ "Tarvitaan vähintään yksi kohdistuspiste yhdistämään kaksi kuvaa, jotta " "voidaan ajaa celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste ajossa" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 #, fuzzy msgid "Loading model file" msgstr "Ladataan kuvaa %s" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, fuzzy, c-format msgid "Removed %lu control points" msgstr "Poista %d kohdistuspistettä" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste tulos" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Puhdistaa" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Luo" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Yrittää poistaa kohdistuspisteet pilvistä" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Tyhjennä eräajot" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "" "Poista äärialueilla olevat kohdistuspisteet tilastollisella menetelmällä" @@ -1478,23 +1528,23 @@ msgid "Could not process event!" msgstr "Ei voi työstää tapahtumaa!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Vasen kuva" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Oikea kuva" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1502,7 +1552,7 @@ "Syötä minimi kohdistuspistevirhe.\n" "Kaikki pisteet, joissa on suurempi virhearvo, valitaan" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Valitse kohdistuspisteet" @@ -1577,60 +1627,60 @@ "Vedä siirtääksesi kuvia (lisäksi voit käyttää vaihtonäppäintä/shift) tai " "kieritä oikealla vedolla tai ctrl-vedolla." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Pikaesikatselu " -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Tiedosto" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "näytetyt kuvat" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Kaikki" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Ei ole" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "pystysuuntainen kuvakulma muuttuu vetämällä" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "vaakasuuntainen kuvakulma muuttuu vetämällä" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Esikatselu" @@ -1639,88 +1689,93 @@ msgid "Overview" msgstr "Esikatselu" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 #, fuzzy msgid "Resets the projection's parameters to their default values." msgstr "Palauta projektin asetukset niiden oletusarvoihin." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "parametri:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 #, fuzzy msgid "No images loaded." msgstr "ei kuvia ladattuna" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, fuzzy, c-format msgid "%lu images loaded." msgstr "%d kuvaa ladattu." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, fuzzy, c-format msgid "Images are connected by %lu control points.\n" msgstr "Kuvat on yhdistetty %d kohdistuspisteellä.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%d yhdistämätöntä kuvaryhmää löydetty:" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "Kuvat tai kohdistuspisteet ovat muuttuneet, uusi kohdistus tarvitaan." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Keskivirhe optimoinnin jälkeen: %.1f pikseliä, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Suorakulmainen" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Lieriö" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Suunnan pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Kallistusarvon pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Kiertoarvon pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 #, fuzzy msgid "X value must be numeric." msgstr "Suunnan pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 #, fuzzy msgid "Y value must be numeric." msgstr "Suunnan pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 #, fuzzy msgid "Z value must be numeric." msgstr "Suunnan pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Arvon pitää olla numeerinen." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1728,75 +1783,75 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "erotus" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autom.rajaus" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Laske optimirajaus" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Yläosan pitää olla nollaa suurempi kokonaisluku" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "vasemman pitää olla nollaa suurempi kokonaisluku" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "oikean pitää olla nollaa suurempi kokonaisluku" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "alaosan pitää olla nollaa suurempi kokonaisluku" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "vasemman rajan pitää olla pienempi kuin oikea" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "ylärajan pitää olla pienempi kuin alaraja" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Virheellinen HFOV arvo. Maksimi HFOV tälle projektille on %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Virheellinen HFOV arvo. Maksimi HFOV tälle projektille on %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1804,14 +1859,14 @@ "space." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" "Cylindrical projection preserves vertical lines, unlike equirectangular." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1819,7 +1874,7 @@ "easier on the eye." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1827,41 +1882,41 @@ "field of view and still have a reasonable coverage of the middle." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" "If you want to see the bar again, activate the bar in the preferences again." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaiikki" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 #, fuzzy msgid "Mosaic plane" msgstr "Kaksitasoinen" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1869,24 +1924,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1895,31 +1950,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "Puhdista kohdistuspisteet" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "Käsittelee" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "etsitään samanlaisia pisteitä..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "Tarkistaa pareittain" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1927,7 +1982,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 #, fuzzy msgid "" "Error initializing GLEW\n" @@ -1936,7 +1991,7 @@ "Virhe GLEW:n alustuksessa\n" "Pikaesikatseluikkunaa ei voi avata." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 #, fuzzy msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " @@ -1981,7 +2036,7 @@ msgstr "Maskien lukumäärä" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Rajaus" @@ -2017,7 +2072,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "" @@ -2218,7 +2273,7 @@ msgid "Shutter speed" msgstr "Suljin aika:" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "" @@ -2393,101 +2448,101 @@ msgid "Camera response parameter" msgstr "Kameran herkkyys" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "Objektiivi" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr "Pinon numero" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "Tuloste" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Sekoitetut valosustasot" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 #, fuzzy msgid "Select all" msgstr "Palauta kaikki" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 #, fuzzy msgid "Unselect all" msgstr "Valitsematta" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 #, fuzzy msgid "Edit image variables..." msgstr "Kuvamuuttujat:" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Tallenna maski" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Tallenna maski" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "näytetyt kuvat" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Pisteiden lukumäärä kuvalle" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 #, fuzzy msgid "Control points" msgstr "Kohdistuspisteet" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2520,12 +2575,24 @@ msgid "Did you know..." msgstr "Tiesitkö..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versio %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2533,126 +2600,126 @@ "Vakava asennusvirhe\n" "Tiedosto data/splash.png ei löytynyt paikasta:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Apua" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 #, fuzzy msgid "&Actions" msgstr "Valinnat" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Tuloste" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Muokkaa" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Celeste ajossa" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Celeste ajossa" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Aloitettu" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimoija" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Valotus" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 #, fuzzy msgid "Don't Save" msgstr "Älä muuta" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "pakotettu sulku" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "tallenna projekti %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Panoraaman kokoaja" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 #, fuzzy msgid "Panorama editor" msgstr "Panoraaman esikatselu" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2661,36 +2728,36 @@ "(Error code: %s)" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Tallenna PTmender komentotiedosto" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Avaa projekti:" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekti avattu" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Ladataan kuvia" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Virhe projektin avauksessa" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Avaa projekti tiedosto" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2698,11 +2765,11 @@ "Do you want to add this image file to the current project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Projektin avaus: peruttu" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2710,7 +2777,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2718,34 +2785,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Avaa projektitiedosto" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Maski tiedostot (*.msk)|*.msk|Kaikki (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Valitse malliprojekti" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Hienosäädä kaikki pisteet" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Hienosäätö" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2772,24 +2839,24 @@ "\n" "Käytä Kontolipisteet listaa (F3) nähdäksesi projektin kohdistuspisteet\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Hienosäädön tulokset" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Poistaa kohdistuspisteitä maskissa" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 #, fuzzy msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Eräajot (*.ptb)|*.ptb;|Kaikki (*)|*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2798,68 +2865,68 @@ "Tiedostoa \"%s\" ei löytynyt.\n" "Ehkä se on nimetty uudelleen, siirretty tai poistettu." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Virhe!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, fuzzy, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." msgstr "" "Celeste mallitiedostoa ei löydetty, Hugin pitää olla kunnolla asennettu." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, fuzzy, c-format msgid "Could not load Celeste model file %s" msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 #, fuzzy msgid "Running assistant" msgstr "Celeste ajossa" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Varoitus %d liittämätöntä kuvaryhmää löytynyt:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2872,30 +2939,30 @@ "\n" "Pisteiden lisäyksen jälkeen paina \"Linjaus\" näppäintä uudestaan" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 #, fuzzy msgid "Project file not found" msgstr "Kuvatiedosto ei löydy" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Maskin tyyppi" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2903,29 +2970,29 @@ "Luo monikulmio maski hiiren vasemman näppäimen klikkauksilla kuvassa. Aseta " "viimeinen piste hiiren oikealla näppäimellä." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Tallenna maski" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Maski tiedostot (*.msk)|*.msk|Kaikki (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Ladataan maski" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Lataa maski: peruttu" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, fuzzy, c-format msgid "Could not parse mask from file %s." msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Anna validi numero" @@ -3061,7 +3128,7 @@ msgstr "Valoisuuden sovitus" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Ladataan kuvia" @@ -3106,188 +3173,192 @@ msgid "Photometric optimization finished" msgstr "Valoisuuden optimointi lopetettu" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Lisää yksittäisiä kuvia" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Lisää aikasarja kuvia..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 #, fuzzy msgid "No matching images found." msgstr "Ladataan kuvia" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Kuvamuuttujat:" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Poista valitut kuvat" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ankkuroi tämä kuva paikalle" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ankkuroi tämä kuva valotukselle" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 #, fuzzy msgid "New lens" msgstr "Uusi objektiivi" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Vaihda objektiivi..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Syötä uusi objektiivinumero" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Objektiivinumero" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Vaihda objektiivinumero" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "Lataa objektiivien tiedot..." -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 #, fuzzy msgid "Load lens from ini file" msgstr "Lataa objektiivin parametrit tiedostosta" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Kysymys" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" "Apply settings anyway?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 #, fuzzy msgid "Save lens to ini file" msgstr "Tallenna objektiivin parametrit tiedostoon" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 #, fuzzy msgid "Remove control points" msgstr "Poista %d kohdistuspistettä" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 #, fuzzy msgid "Selected images have no control points." msgstr "Vähintään yhdellä kuvalla ei ole yhtään kohdistuspistettä." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, fuzzy, c-format msgid "Really delete %lu control points?" msgstr "Poistetaanko todellakin %d kohdistuspistettä?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Poista kohdistuspisteitä" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Puhdista kohdistuspisteet" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Puhdistaa kohdistuspisteet" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Tarkistaa pareittain" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Tarkistetaan koko projekti" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Puhdistun lopetettu" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 #, fuzzy msgid "Remove control points on clouds" msgstr "Poista maskissa olevat kohdistuspisteet" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 #, fuzzy msgid "Reset positions" msgstr "Palauta projekti" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "Linkitä parametrit" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 #, fuzzy msgid "Reset lens parameters" msgstr "Objektiivin parametrit" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 #, fuzzy msgid "Reset photometric parameters" msgstr "Objektiivin parametrit" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Uusi pino" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Vaihda pinoa..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Syötä pinon numero" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "pinon numero" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Muuta pinon numero" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 #, fuzzy msgid "Set stack size..." msgstr "Vaihda pinoa..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Laatu:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3359,64 +3430,64 @@ msgid "Hammer-Aitoff Equal Area" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "leveyden pitää olla nollaa suurempi kokonaisluku" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "korkeuden pitää olla nollaa suurempi kokonaisluku" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 #, fuzzy msgid "Left boundary must be smaller than right." msgstr "vasemman rajan pitää olla pienempi kuin oikea" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 #, fuzzy msgid "Top boundary must be smaller than bottom." msgstr "ylärajan pitää olla pienempi kuin alaraja" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " PTmender valintoja ei ole toteutettu" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " PTblender valintoja ei ole toteutettu" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Ei voi luoda tilapäistä projektitiedostoa" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Määrittele tulosteen pääte" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3426,7 +3497,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3435,7 +3506,7 @@ "a long time and a large amount of memory." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3443,27 +3514,27 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 #, fuzzy msgid "Stitch anyway" msgstr "Koosta nyt!" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3494,185 +3565,203 @@ msgid "Miscellaneous" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Käyttöjärjestelmän oletus" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Katalaani" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Kiina (yksinkertaistettu)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Kiina (perinteinen)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Tšekki" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 #, fuzzy msgid "Danish" msgstr "Espania" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Hollanti" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Englanti" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Ranska" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Saksa" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Unkari" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italia" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japani" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Puola" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugali (Brasilia)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Venäjä" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovakia" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Espania" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Ruotsi" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Suomi" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Valitse Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Valitse Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Palauta kaikki" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Palauta kaikki" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Maski tiedostot (*.msk)|*.msk|Kaikki (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Palautetaanko asetukset oletuksiin ihan varmasti?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Ladataan oletukset" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Valitse sisääntulo ensin" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Valitse sisääntulo" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3680,33 +3769,33 @@ "Viimeistä asetusta ei voi poistaa.\n" "Vähintään yksi asetus tarvitaan." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Tahdotko todella poistaa kohdistuspisteen tunnistuksen asetuksen \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Poista kohdistuspisteiden tunnistimen asetus" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 #, fuzzy msgid "Load control point detector settings" msgstr "Poista kohdistuspisteiden tunnistimen asetus" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 #, fuzzy msgid "Control point detector settings (*.setting)|*.setting" msgstr "Poista kohdistuspisteiden tunnistimen asetus" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 #, fuzzy msgid "Save control point detector settings" msgstr "Poista kohdistuspisteiden tunnistimen asetus" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3731,50 +3820,55 @@ msgid "Remove %lu control points" msgstr "Poista %d kohdistuspistettä" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panoraaman esikatselu" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Esikatselun asetukset" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projektio (f)" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Sekoitustila:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Tulos:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Pakkaus:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Projisointi parametrit" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Vasen klikkaus määrittelee uuden keskipisteen ja oikea klikkaus siirtää " "pisteen horisonttiin." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Keskitä panoraama vasemmalla näppäimellä ja aseta horisontti oikealla " @@ -3793,7 +3887,7 @@ msgid "Click a connection to edit control points." msgstr "Yhteyden klikkaaminen vie kohdistuspisteen muokkaukseen." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3801,30 +3895,112 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Sulje" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "Eräajokäsittelijä" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Avaa BTBatcherin, joka on Huginin eräajotiedostojen käsittelijä" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3838,11 +4014,11 @@ "\"%s\" ei löydy polusta.\n" "Ehkä asennus ei ole kunnollinen tai väärä polku on asetuksissa." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3851,15 +4027,15 @@ "Käytä %namefile, %i tai %s määrittelemään syötetiedostoa " "kohdistuspistetunnistimelle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Virhe kohdistuspistetunnistimen komennossa" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3871,14 +4047,14 @@ "Käytä vähemmän kuvia tai sijoita kuvat hakemistoon,\n" "jolla on lyhyt polun nimi." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Liikaa kuvia valittu" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3889,38 +4065,38 @@ "\n" " Ei voi ajaa komentoa: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute virhe" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "etsii kohdistuspisteitä" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Ei voi suorittaa komentoa: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3929,9 +4105,9 @@ "Komento: %s\n" "epäonnistui virhekoodilla: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3946,13 +4122,13 @@ "\n" "Ajettu komento: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Kohdistuspistetunnistimen virhe" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3960,7 +4136,7 @@ "Käytä %i syötetiedoston määrittelyyn ja %k määrittelemään avaintiedostoa " "avaintiedoston generointiaskeleessa" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3968,11 +4144,11 @@ "Käytä %k määrittelemään avainpistetiedostoa ja sovitusaskeleessa %o " "määrittelemään projektin tulostiedostoa " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "luo avaintiedostoa" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3985,11 +4161,11 @@ "\n" " Ei voi ajaa komentoa: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Oletus" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -3997,261 +4173,261 @@ "Toiminnassa olevaa eräajoa ei voi poistaa.\n" "Tahdotoko perua sen?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 #, fuzzy msgid "PTBatcherGUI" msgstr "PTStitcher:" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Eräajo tyhjennetty." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "Virhe: Statusta ei löydy, projekti %d indeksillä ei ole listassa." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Virhe: ei voi ladata eräajotiedostoa." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Eräajo valmistui onnistuneesti." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Eräjon suorituksessa virheitä." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Alustaa sammutusta..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Sammutetaan..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Alustaa sammutusta..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Alustaa sammutusta..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Tallenna projektitiedosto" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Tulosteen päätettä ei ole määritelty" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Projektia ei ole määritelty" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Koostaminen" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, fuzzy, c-format msgid "%s - Assistant" msgstr "Avustaja" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Virhe poistossa, projektia id:llä %d ei ole listassa." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Virhe: Ei voi voistaa projektitiedostoa" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Eräajo toiminnassa..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTStitcher:" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Eräajo ennestään käynnissä." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "Ajetaan komento \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, fuzzy, c-format msgid "Now stitching: %s" msgstr "Yhdistetään %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "Virhe: Ei voi asettaa statusta, projekti numerolla %d ei ole listassa." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Ei juuri tehtävää..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "Ei mitään" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTStitcher:" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Sammuta kone (shutdown) kun valmis" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Syötä komentorivi sovellukselle suorittaaksesi:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Syötä sovellus" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Määrittele hakemisto projektien haulle" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Määrittele projektin lähde tiedostot" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "Lisätty projektit hakemistosta" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, fuzzy, c-format msgid "Add project %s to stitching queue." msgstr "Lisää projekti eräajolistaan" -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 #, fuzzy msgid "Batch stopped" msgstr "Eräajo pysäytetty" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 #, fuzzy msgid "Hugin's Batch processor" msgstr "Aja &eräajot" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Määrittele projektin tulosteen pääte" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Valitse projekti" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Valitse projekti" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Määrittele avattava eräajotiedosto" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Eräajot (*.ptb)|*.ptb;|Kaikki (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Sovellus ei aukea Huginissa." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Projektia ei ole valittu. Avaa Hugin ilman projektia?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Eräajo pysäytetty" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Jatketaan eräajoa..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4259,7 +4435,7 @@ "Listassa on epäonnistuneita projekteja.\n" "Poista ne myös?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4267,16 +4443,16 @@ "Ei voi poistaa ajossa olevaa projektia.\n" "Tahdotko perua sen?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "Projekti poistettu" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Valitse poistettava projekti" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4284,16 +4460,16 @@ "Ei voi nollata ajossa olevaa projektia.\n" "Haluatko poistaa sen?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "Nollaa projekti" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Valitse nollattava projekti" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4301,31 +4477,31 @@ "Ei voi nollata ajossa olevaa projektia.\n" "Haluatko lopettaa eräajon?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Määrittele tallennettava eräajotiedosto" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Tyhjennä eräajot" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 #, fuzzy msgid "Starting batch" msgstr "Aloita eräajo" @@ -4368,187 +4544,189 @@ msgid "E&xit" msgstr "Poistu\tAlt-&X" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" "Continue anyway?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" "Do you still want to continue?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 #, fuzzy msgid "Stop" msgstr "yläosa:" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" "Please give an existing directory." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " "full." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "Poista valitut kuvat projektista" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "Koostaa panoraamaa" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, fuzzy, c-format msgid "Reading file %s" msgstr "Ladataan kuvaa %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 #, fuzzy msgid "Start" msgstr "Aloitettu" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, fuzzy, c-format msgid "Found %d possible panoramas." msgstr "Yhdistetty ja sekoitettu panoraama" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 #, fuzzy msgid "No possible panoramas found." msgstr "Samanlaista pistettä ei löydetty" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, fuzzy, c-format msgid "%d images: %s" msgstr "Lisää kuvia" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Syntaksivirhe parametreissä havaittu, poistutaan." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 #, fuzzy msgid "PTBatcherGUI started" msgstr "PTStitcher:" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Odottaa" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Toiminnassa" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Valmis" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Epäonnistunut" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Tiedosto puuttuu" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pysäytetty" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Tuloksen etuliite" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Tila" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Viimeksi muutettu" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Tuloksen muoto" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projektio" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Koko" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Avustaja" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Muuta etuliite" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Palauta projekti" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 #, fuzzy msgid "Remove" @@ -4583,16 +4761,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Maski tiedostot (*.msk)|*.msk|Kaikki (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Ei voi avata projektitiedostoa %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Määrittele projektin lähdetiedosto" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4600,7 +4778,7 @@ msgstr "" #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Tietoja Huginista" @@ -4634,19 +4812,19 @@ msgstr "Käyttöjärjestelmän oletus" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4727,8 +4905,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Valitse..." @@ -4822,7 +5003,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Valinnat" @@ -4858,10 +5039,6 @@ msgid "Send selected panoramas to queue" msgstr "" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Sulje" - #: hugin1/hugin/xrc/batch_frame.xrc:479 #, fuzzy msgid "Searching panoramas" @@ -4969,12 +5146,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Poistu" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Poistu ohjelmasta" @@ -5080,46 +5257,145 @@ msgid "adddir" msgstr "adddir" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "edellinen kuvapari" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "seuraava kuvapari" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Kuvaus:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "tila:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Tyyppi:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "pystysuora linja" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Kaikki kuvat kerran" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "vaakasuuntainen linja" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Monirivinen panoraama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "sovita ikkunaan" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Monirivinen panoraama pinoilla" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Hienosäätö" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Esisäädetty panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Yritetään optimoida parhaillaan aktiivinen piste" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Ohjelma:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumentit:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +#, fuzzy +msgid "Cleanup arguments:" +msgstr "Oletusparametrit:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Ominaisuuden täsmääjä:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Edistyneet valinnat" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Tällä asetuksella ei ole edistyneitä valintoja." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parametrit kohdistuspisteiden tunnistimille" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "edellinen kuvapari" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "seuraava kuvapari" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "tila:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "pystysuora linja" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "vaakasuuntainen linja" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "sovita ikkunaan" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Hienosäätö" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Yritetään optimoida parhaillaan aktiivinen piste" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 msgid "auto fine-&tune" msgstr "automaattinen &hienosäätö" @@ -5176,7 +5452,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Poista" @@ -5184,146 +5460,193 @@ msgid "Select by Distance" msgstr "Valitse etäisyydellä" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Kuvaus:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Oletusparametrit:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Tyyppi:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Kaikki kuvat kerran" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +#, fuzzy +msgid "No" +msgstr "Ei ole" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Muokkaa Panorama Tools komentosarjaa" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Monirivinen panoraama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Tämä komentosarja lähetetään Panorama Tools ohjelmalle. Näiden rivien " +"muokkaaminen kuuluu edistyneen tekniikan käyttöön." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Monirivinen panoraama pinoilla" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Jatka näillä muutoksilla" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Esisäädetty panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Hylkää muutokset ja peru" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Ohjelma:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumentit:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +#: hugin1/hugin/xrc/images_panel.xrc:67 #, fuzzy -msgid "Cleanup arguments:" -msgstr "Oletusparametrit:" +msgid "Maximum Ev difference:" +msgstr "erotus" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Ominaisuuden täsmääjä:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Yleistä" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +#, fuzzy +msgid "Positions" +msgstr "Kuvan fuusiointi:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Edistyneet valinnat" +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Objektiivin parametrit" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Tällä asetuksella ei ole edistyneitä valintoja." +#: hugin1/hugin/xrc/images_panel.xrc:96 +#, fuzzy +msgid "Photometric parameters" +msgstr "Valoisuuden sovitus" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:130 +#, fuzzy +msgid "Lens type" +msgstr "Objektiivin tyyppi:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parametrit kohdistuspisteiden tunnistimille" +#: hugin1/hugin/xrc/images_panel.xrc:145 +#, fuzzy +msgid "Add images..." +msgstr "Lisää kuvia" + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Objektiivin tyyppi:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Polttovälin kerroin:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 #, fuzzy -msgid "Invalid filenames" -msgstr "Oletusparametrit:" +msgid "Feature Matching" +msgstr "Ominaisuuden täsmääjä:" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Asetukset:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +#, fuzzy +msgid "Run selected control point detector on the selected images" +msgstr "Poista valittuja kuvia yhdistävät kohdistuspisteet" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimoi" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +#, fuzzy +msgid "Geometric:" +msgstr "Geometria" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +#, fuzzy +msgid "Photometric:" +msgstr "Valoisuus" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Valittu kuva" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Muokkaa Panorama Tools komentosarjaa" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Lataa objektiivien tiedot..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Tämä komentosarja lähetetään Panorama Tools ohjelmalle. Näiden rivien " -"muokkaaminen kuuluu edistyneen tekniikan käyttöön." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Jatka näillä muutoksilla" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Hylkää muutokset ja peru" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "astetta" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Kamera ja objektiivien tiedot" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Suunta:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Kallistus:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Kierto:" @@ -5332,35 +5655,11 @@ msgid "Translation parameter" msgstr "Linkitä parametrit" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -#, fuzzy -msgid "Positions" -msgstr "Kuvan fuusiointi:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "kuvakulma (v):" @@ -5464,7 +5763,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 #, fuzzy msgid "Help" msgstr "&Apua" @@ -5510,8 +5809,8 @@ msgstr "Ladataan maski" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Tallenna" @@ -5524,127 +5823,47 @@ msgid "Manipulate image variables" msgstr "Kuvamuuttujat:" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:67 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Maximum Ev difference:" -msgstr "erotus" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Yleistä" +msgid "WB reference:" +msgstr "&Asetukset" -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Objektiivin parametrit" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -#, fuzzy -msgid "Photometric parameters" -msgstr "Valoisuuden sovitus" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -#, fuzzy -msgid "Lens type" -msgstr "Objektiivin tyyppi:" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -#, fuzzy -msgid "Add images..." -msgstr "Lisää kuvia" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Objektiivin tyyppi:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Polttovälin kerroin:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -#, fuzzy -msgid "Feature Matching" -msgstr "Ominaisuuden täsmääjä:" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Asetukset:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -#, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "Poista valittuja kuvia yhdistävät kohdistuspisteet" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimoi" - -#: hugin1/hugin/xrc/images_panel.xrc:293 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 #, fuzzy -msgid "Geometric:" -msgstr "Geometria" +msgid "Additional dcraw parameters:" +msgstr "Linkitä parametrit" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 #, fuzzy -msgid "Photometric:" -msgstr "Valoisuus" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Valittu kuva" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Lataa objektiivien tiedot..." +msgid "Processing profile:" +msgstr "Käsittelee" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "astetta" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Kamera ja objektiivien tiedot" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5805,15 +6024,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -#, fuzzy -msgid "No" -msgstr "Ei ole" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5874,21 +6084,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Palauta" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Peru edellinen toiminto" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Tee uudelleen" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Tee uudelleen edellinen toiminto" @@ -5935,12 +6145,12 @@ msgid "Use only normal control points in optimization." msgstr "Pisteiden lukumäärä kuvalle" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimoi" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Aja optimointi uudelleen nykyisillä asetuksilla" @@ -5971,16 +6181,16 @@ msgid "Run a python script" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Näkymä" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Koko ruutu" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 #, fuzzy msgid "Shows Hugin's main window on full-screen" msgstr "Näyttää huginin pääikkunan kokoruutuna" @@ -6069,20 +6279,20 @@ msgid "Show the Stitcher panel" msgstr "Eräajon ompelijan ohje" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Edistyneet valinnat" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Käyttöliittymä" @@ -6104,86 +6314,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Jotain tietoa erilaisilla näppäimillä ja niin eteenpäin." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Päivän vihje" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Näytä joku päivän vihjeistä." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Näppäin komennot" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "näppäimistön pikalinkit" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Usein kysytyt kysymykset" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "Tietoj&a" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Asetukset" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Uusi" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Uusi projekti" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Avaa" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Avaa projekti" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Tallenna" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Tallenna nykyinen projekti tiedostoon" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Tallenna &nimellä" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Tallenna nykyinen projekti uuteen tiedostoon" @@ -6199,19 +6409,19 @@ "Kirjoita nykyinen projekti PTStitcher yhteensopivaksi " "komentosarjatiedostoksi, käytännöllinen eräajossa" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Viimeksi käytetyt projektit" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Viimeksi käytetyt projektitiedostot" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Aja &eräajot" @@ -6297,7 +6507,7 @@ msgid "Show the OpenGL preview image" msgstr "Näytä OpenGL esikatselukuva" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Panoraman esikatselu" @@ -6357,16 +6567,11 @@ msgstr "Poissulje alua" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 #, fuzzy msgid "Export" msgstr "Valotus" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "" @@ -6412,8 +6617,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6519,7 +6724,8 @@ msgid "execute the PTOptimizer engine" msgstr "" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Kuvan suuntaus" @@ -6565,39 +6771,39 @@ msgid "Interpolator (i):" msgstr "Interpolointi (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubic)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilinear" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Lähin naapuri" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "" @@ -6626,7 +6832,7 @@ msgid "Enfuse options" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 #, fuzzy msgid "Field of View:" msgstr "Kuvakulma" @@ -6798,10 +7004,6 @@ msgid "Image fusion:" msgstr "Kuvan fuusiointi:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR liitos:" @@ -6905,16 +7107,16 @@ msgid "Output parameters" msgstr "Omavalintaiset parametrit alla" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Sekoitustila:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "" @@ -6984,30 +7186,46 @@ msgid "This affects the control points editor and mask editor." msgstr "Poista maskissa olevat kohdistuspisteet" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Enblend ajettava:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(jätä tyhjäksi käyttöjärjestelmän oletukselle)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Enblend ajettava:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Enblend ajettava:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 #, fuzzy msgid "File Options" msgstr "Tiedosto valinnat" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Tilapäishakemisto:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(jätä tyhjäksi käyttöjärjestelmän oletukselle)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 #, fuzzy msgid "Default project filename:" msgstr "Avaa projektitiedosto" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 #, fuzzy msgid "Default output prefix:" msgstr "Määrittele tulosteen pääte" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7025,46 +7243,46 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 #, fuzzy msgid "Default filenames" msgstr "Oletusparametrit:" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 #, fuzzy msgid "Filenames" msgstr "Tiedosto" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Kuvan lataus" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Kohdista kuvat automaattisesti latauksen jälkeen" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 #, fuzzy msgid "Detect vertical lines" msgstr "pystysuora linja" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Poista pilvityyppiset kohdistuspisteet (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Autom. tasaus" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7072,67 +7290,67 @@ "Päällekkäisen alueen\n" "kohdistuspisteiden määrä" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Lopullisen panoraman skaala" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "prosenttia max leveys" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Kohdistuspistemuokkain" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR ja 16 bit näyttä" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Käyrät" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineaarinen" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritminen" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2,2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "käytetään GUIn näytössä" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Tilkun leveys:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pikseliä" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Hakualueen leveys:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "prosenttia kuvan leveydestä" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Paikallisen haun alueen leveys:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Vastaavuussuhteen kynnys:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7140,11 +7358,11 @@ "0: ei samankaltaisuutta\n" "1: maksimi samanlaisuus" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Huipun kaarteen kynnysarvo:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7152,163 +7370,159 @@ "0: ei huippua\n" "0,2: huomiota herättävä huippu" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Kiertohaku" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Salli kiertohaku (hitaampi, mutta tarkempi)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Lähtökulma:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Lopetuskulma:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Askeleet:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Kohdistuspistetunnistimet" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Kohdistuspistetunnistin ohjelmat" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Uusi..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Muokkaa..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Siirrä ylös" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Siirrä alas" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Aseta oletus" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Avustaja käyttää oletusasetusta." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 #, fuzzy msgid "Output Format" msgstr "Tuloksen muoto" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 #, fuzzy msgid "Default File Format:" msgstr "Oletusparametrit:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 #, fuzzy msgid "TIFF Compression:" msgstr "Pakkaus:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 #, fuzzy msgid "JPEG Quality:" msgstr "Laatu:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "Sekoitin:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "Oletusparametrit:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 #, fuzzy msgid "Processor" msgstr "Eräajokäsittelijä" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " "has to start the processing manually." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 #, fuzzy msgid "Overwrite existing files" msgstr "Ylikirjoitetaan olemassa olevat kuvat" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 #, fuzzy msgid "Verbose Output" msgstr "Tuloste" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Koostaminen" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Nona valinnat" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7317,58 +7531,58 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "(jätä tyhjäksi käyttöjärjestelmän oletukselle)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 #, fuzzy msgid "Advanced options" msgstr "Edistyneet valinnat" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 #, fuzzy msgid "Number of threads:" msgstr "Maskien lukumäärä" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 #, fuzzy msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " @@ -7379,84 +7593,85 @@ "Nona pystyy hyödyntään useampaa säiettä prosessointiin.\n" "Aseta tämä prosessoreiden tai prosessorien ytimien lukumäärään systeemissä." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "Koostaminen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Oletus interpolaattori (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Luo rajatut kuvat oletuksena" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "Käytä GPU:ta sijoituslaskentaan (KOKEELLINEN)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Käytä näytönohjaimen GPU:ta kuvan sijoituksen laskennan nopeutukseen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Käytä vaihtoehtoista Enblend ohjelmaa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend ajettava:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Oletusparametrit:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 #, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Nämä ovat oletusparametrit. Ne voidaan muuttaa projektikohtaisesti " "Kokoamisvälilehdellä.\n" "Älä aseta -w, -o and --compression parametrejä, hugin asettaa ne" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Käytä vaihtoehtoista Enfuse ohjelmaa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse ajettava:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 #, fuzzy msgid "Programs" msgstr "Ohjelma:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste parametrit" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM kynnysarvo:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7464,19 +7679,19 @@ "suurempi kuin 0,5: herkempi\n" "vähemmän kuin 0,5: tunnottomampi" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor suotimen koko" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "pieni" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "iso" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7484,7 +7699,7 @@ "isompi on tarkempi\n" "pienempi voi tutkia kohdistuspisteitä lähellä kuvan reunoja" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7494,78 +7709,78 @@ "väriarvojen analyysillä.\n" "Laskennan nopeuttamiseksi vain ratunnaisjoukko pisteistä käytetään." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 #, fuzzy msgid "Number of points per image: " msgstr "Pisteiden lukumäärä kuvalle" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 #, fuzzy msgid "Photometric optimizer" msgstr "Valoisuuden optimointi" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "Varoitus" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "Optimoidaan panoramaa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "Optimoi nyt!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "Pikaesikatseluikkuna" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Asetukset - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "Valitse piste vasemmassa kuvassa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7585,11 +7800,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Keskitä esikatselu vaakasuunnassa" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Keskusta" @@ -7597,13 +7812,15 @@ msgid "Show the whole panorama" msgstr "Näytä koko panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Arvioi kuvakulma" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Sovitus" @@ -7611,7 +7828,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automaattisesti suorista aaltoileva horisontti" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Suorista" @@ -7707,33 +7925,33 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "Asettaa panoraman valotusarvon panoraman kaikkien kuvien keskiarvoon." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "&Muokkaa" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "Poista kohdistuspisteiden tunnistimen asetus" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Mittakaava:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 #, fuzzy msgid "" "* A gray line indicates there are no control points, but the image pair " @@ -7747,164 +7965,152 @@ "huonoa kohdistusta.\n" "* Klikkaa viivaa muokataksesi kuvia Kohdistuspisteet -välilehdellä." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Asettelu" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "x" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 #, fuzzy msgid "Golden ratio" msgstr "Tiedosto" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automaattisesti suorista aaltoileva horisontti." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Siirtotila:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Toteuta" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Siirrä panoraamaa tai vedä kuvat paikkoihinsa" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Siirrä/Vedä" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Aseta rajaus suurimpaan kuvan kattavaan suorakulmioon" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 #, fuzzy msgid "HDR Autocrop" msgstr "Autom.rajaus" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 #, fuzzy msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "Aseta rajaus suurimpaan kuvan kattavaan suorakulmioon" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "vasen:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "yläosa:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "oikea:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "alaosa:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Muuta panoraman rajausaluetta" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 #, fuzzy msgid "Panorama &editor" msgstr "Panoraaman esikatselu" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 #, fuzzy msgid "&Overview" msgstr "Esikatselu" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 #, fuzzy msgid "Shows the overview of the panorama sphere." msgstr "Näytä koko panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Lisää kuvia" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Uudelleen sijoitetut yhdistely pinot" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Uudelleen sijoitetut yhdistely pinot" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Uudelleen sijoitetut yhdistely pinot" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "vaihda valitun kuvan objektiivi" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Palauta projekti" @@ -8183,6 +8389,70 @@ "päällekkäin olevilla ja laajasti jaetuilla kohdistuspisteillä." #, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Asetukset" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Kuvat" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Lisää kuvia" + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Lisää muu kuva nykyiseen projektiin" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Tallenna maski" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Poista valitut kuvat" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Kulman tunnistuksen skaala" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "&Tuo projekti sisään..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Siirrä panoraamaa tai vedä kuvat paikkoihinsa" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Muuta panoraman rajausaluetta" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Käytä GPU:ta sijoituslaskentaan (KOKEELLINEN)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Kaikki tiedostot|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;" +#~ "*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" +#~ "*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*." +#~ "tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR " +#~ "files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Kaikki tiedostot " +#~ "(*)|*" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "×" +#~ msgstr "x" + +#, fuzzy #~ msgid "Interface" #~ msgstr "Käyttöliittymä" @@ -8913,9 +9183,6 @@ #~ msgid "No correction" #~ msgstr "Ei korjausta" -#~ msgid "Image file:" -#~ msgstr "Kuva tiedosto:" - #~ msgid "center shift x:" #~ msgstr "keskipisteen poikkeus x:" @@ -9097,9 +9364,6 @@ #~ msgid "25%" #~ msgstr "25%" -#~ msgid "&Import Project..." -#~ msgstr "&Tuo projekti sisään..." - #~ msgid "TIFF" #~ msgstr "TIFF" diff -Nru hugin-2018.0.0+dfsg/src/translations/fr.po hugin-2019.0.0+dfsg/src/translations/fr.po --- hugin-2018.0.0+dfsg/src/translations/fr.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/fr.po 2019-02-17 15:24:33.000000000 +0000 @@ -3,19 +3,19 @@ # This file is distributed under the same license as the hugin package. # # -# Jean-Luc Coulon (f5ibh) , 2004-2011, 2012, 2014, 2015, 2016, 2017. +# Jean-Luc Coulon (f5ibh) , 2004-2011, 2012, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: Hugin 2012-0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-12-29 16:40+0100\n" -"Last-Translator: Jean-Luc Coulon \n" -"Language-Team: French \n" -"Language: fr\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2018-12-18 07:54+0100\n" +"Last-Translator: Jean-Luc Coulon (f5ibh) \n" +"Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 2.0\n" @@ -45,16 +45,16 @@ msgid "Searching for best crop..." msgstr "Recherche du meilleur recadrage…" -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Le programme externe %s est introuvable dans le paquet, utilisation de la " "version se trouvant sur le chemin du système (PATH)" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -81,9 +81,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|Fichier PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Le fichier %s existe déjà. Faut-il l’écraser ?" @@ -121,7 +121,7 @@ msgstr "Le facteur de recadrage doit être positif." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -135,24 +135,28 @@ "Désirez-vous cependant utiliser une valeur aussi élevée ?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -173,8 +177,8 @@ msgstr "Fisheye plein cadre" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Équirectangulaire" @@ -205,11 +209,13 @@ msgid "builtin" msgstr "intégré" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "personnalisé (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "linéaire" @@ -235,16 +241,16 @@ msgid "Error loading lens parameters" msgstr "Erreur de chargement des paramètres de l’objectif" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Enregistrer le fichier des paramètres de l’objectif" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Fichiers de projet d’objectif (*.ini)|*.ini|Tous les fichiers (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Enregistrer le projet" @@ -280,22 +286,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Erreur lors de la suspension du processus %ld, code 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Abandonner" @@ -329,12 +336,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Impossible d’ouvrir le fichier de projet :" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "Impossible d’ouvrir le script : %s" @@ -344,8 +351,8 @@ msgid "Project %s does not contain any active images." msgstr "Le projet %s ne comporte aucune image active." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "erreur d’analyse du script des outils de panorama : %s" @@ -361,17 +368,17 @@ msgid "Could not create temporary file" msgstr "Impossible de créer le fichier temporaire" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "La file d’attente est vide. Ceci ne devrait jamais se produire." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Erreur lors de l’assemblage" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -379,11 +386,11 @@ "Faut-il écraser les images existantes ?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Écraser les images existantes" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -392,12 +399,12 @@ "Erreur lors de l’assemblage du projet\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Erreur lors de l’exécution de l’assistant" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -406,274 +413,284 @@ "Erreur lors de l’exécution de l’assistant\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Assemblage du panorama…" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Plateforme :" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Version :" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Répertoire de travail :" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Préfixe de sortie :" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Outil de fusion :" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Version inconnue de l’outil de fusion (échec de « enblend --version »)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "interne" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Fusion de l’exposition :" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Fusion de l’exposition inconnue (échec de « enfuse --version »)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Version d’ExifTool :" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool :" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "ÉCHEC" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Nombre d’images actives :" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Valeur de l’exposition en sortie : %1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Taille du canevas : %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "Région d’intérêt : (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "Champ : %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projection :" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Utiliser le GPU pour le reformatage (« remapping ») :" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "vrai" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "faux" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Sorties de panorama :" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Corrigé en exposition, faible plage dynamique" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Fusionné en exposition à partir d’ensembles" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Fusionné en exposition à partir d’un arrangement quelconque" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Haute plage dynamique" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Images reformatées :" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Pas de correction d’exposition, faible plage dynamique" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Ensembles combinés :" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Ensembles fusionnés en exposition" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Calques :" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" "Calques fusionnés ayant une exposition similaire, sans correction " "d’exposition" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Première image en entrée" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Nombre :" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Nom de fichier :" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Taille : %d × %d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Type de réponse :" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "Champ vertical : %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Valeur de l’exposition : %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Reformatage et fusion d’images LDR (faible plage dynamique)…" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Refomatage des image en faible plage dynamique (« LDR ») :" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Fusion des images…" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Reformatage des images LDR et fusion des calques d’exposition…" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Reformatage des images LDR sans correction d’exposition…" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Fusion du calque d’exposition %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fusion de tous les calques d’exposition…" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Fusion de l’ensemble numéro %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Fusion de tous les ensembles…" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Reformatage des images à haute dynamique (« HDR »)…" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Fusion de l’ensemble HDR numéro %u…" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Fusion des ensembles HDR…" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Mise à jour des métadonnées…" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Assemblage en utilisant « %s »" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "première image" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "dernière image" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "répertoire" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Marque de l’appareil photo" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Modèle de l’appareil photo" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -681,35 +698,67 @@ msgid "Lens" msgstr "Objectif" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "projection inconnue" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Toutes les fichiers d’images" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "Fichiers JPEG (*.jpg,*.jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "Fichiers TIFF (*.tif,*.tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "Fichiers PNG (*.png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "Fichiers HDR (*.hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "Fichiers EXR (*.exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "Tous les fichiers (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "Fichiers RAW" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Erreur" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -720,26 +769,11 @@ "Hugin ne peut pas utiliser ces noms de fichiers. Veuillez renommer vos " "fichiers et réessayer." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Le rapport de déboguage a été créé dans « %s »." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Tous les fichiers d’images|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" -"*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." -"exr;*.EXR|Fichiers JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Fichiers " -"TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Fichiers PNG (*.png)|*.png;*." -"PNG|Fichiers HDR (*.hdr)|*.hdr;*.HDR|Fichiers EXR (*.exr)|*.exr;*.EXR|Tous " -"les fichiers (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -751,27 +785,27 @@ msgstr "L’entrée « %s » n’est pas un nombre valable." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Avertissement" @@ -788,7 +822,7 @@ msgid "Could not save information into database." msgstr "Impossible d’enregistrer les informations dans la base de données." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -799,11 +833,11 @@ "%s\n" "Abandon" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Format d’image non pris en charge" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -815,7 +849,7 @@ "Hugin ne prend pas en charge ce type d’image. Image sautée.\n" "Convertissez l’image en nuances de gris et essayez de la charger de nouveau." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -833,32 +867,32 @@ "Convertissez cette image en échelle de gris ou en RVB et essayez de la " "charger de nouveau." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin nne prend en charge que les image RVB ou en nuances de gris (sans ou " "avec un canal alpha)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -"Le fichier « %s » est une image en nuances de gris, mais les autres images " -"du projet sont des images en couleurs." +"Le fichier « %s » est une image en nuances de gris, mais les autres images du " +"projet sont des images en couleurs." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -"Le fichier « %s » est une image en couleurs, mais les autres images du " -"projet sont des images en nuances de gris." +"Le fichier « %s » est une image en couleurs, mais les autres images du projet " +"sont des images en nuances de gris." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -868,7 +902,7 @@ "Convertissez cette image en nuances de gris ou en RVB respectivement et " "essayez de nouveau de la charger." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -877,16 +911,16 @@ "Le fichier « %s » n’a pas de profil ICC intégré, mais d’autres images de ce " "projet on le profil « %s » intégré." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -"Le fichier « %s » possède le profil ICC intégré « %s », mais les autres " -"images de ce projet n’ont pas de profil colorimétrique intégré." +"Le fichier « %s » possède le profil ICC intégré « %s », mais les autres images " +"de ce projet n’ont pas de profil colorimétrique intégré." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -895,7 +929,7 @@ "Le fichier « %s » a le profil intégré « %s », mais les autres images de ce " "projet ont le profil intégré « %s »." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -904,7 +938,7 @@ "Veuillez convertir toutes les images vers le même profil de couleur et " "essayez de nouveau." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -912,7 +946,7 @@ "Des ensembles d’images ont été détectés par Hugin dans les images ajoutées, " "des numéros d’ensembles correspondants vont être assignés aux images." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -922,11 +956,11 @@ "numéros d’ensembles seront réassignés sur les bases de cette détection. Les " "assignations des ensembles existants seront écrasées." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Faut-il lier la position des images dans chacun des ensembles ?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -940,25 +974,25 @@ "de la position (par ex. lors de la prise de vue à main levée), il ne faut " "alors pas lier la position." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Lier la position" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Ne pas lier la position" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Ne pas assigner les ensembles" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Conserver les ensembles existants" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -968,16 +1002,16 @@ "introuvable.\n" "Veuillez sélectionner vous-même l’image correcte." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Fichier image introuvable" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Sélectionner l’image %s" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -988,16 +1022,17 @@ "\n" "Pressez Accepter pour les supprimer." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Erreur détectée" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Ajouter des images" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -1006,32 +1041,32 @@ "Erreur, le modèle attend %d images,\n" "le projet actuel comporte %d images\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Impossible d’appliquer le modèle" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Erreur de chargement du fichier de projet" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Résultat" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "Répertoire xrc introuvable dans le paquet" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Erreur fatale" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1065,7 +1100,7 @@ "Si vous aviez sélectionné les images correctes, veuillez vérifier de nouveau " "l’image." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Ajout d’image : abandon" @@ -1078,9 +1113,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1097,7 +1132,7 @@ msgstr "Recherche des lignes…" #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Terminé" @@ -1111,162 +1146,162 @@ "Veuillez d’abord lancer « Rechercher des lignes ». Si aucune ligne n’est " "trouvée, modifiez les paramètres." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimisation des paramètres de distorsion de l’objectif…" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " "there are no lines found, change the parameters." msgstr "" "Aucune ligne n’a été détectée.\n" -"Veuillez lancer « Rechercher des lignes » et « Optimiser » avant " -"d’enregistrer les données d’objectif. Si aucune ligne n’est trouvée, " -"veuillez modifier les paramètres." +"Veuillez lancer « Rechercher des lignes » et « Optimiser » avant d’enregistrer " +"les données d’objectif. Si aucune ligne n’est trouvée, veuillez modifier les " +"paramètres." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Enregistrer les paramètres de l’objectif dans le fichier ini" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "" "Enregistrer les paramètres de l’objectif dans la base de données des " "objectifs" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Enregistrement des données de l’objectif" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Enregistrer l’objectif" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Enregistrer le fichier de projet" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Fichiers de projets (*.pto)|*.pto|Tous les fichiers (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Suppression des fichiers temporaires…" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "Afficher ce message d’aide" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Exécuter l’assistant" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Effectuer l’assemblage avec un projet donné" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Nombre de processus utilisés" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "Préfixe utilisé pour l’assemblage" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" "Utiliser les commandes définies par l’utilisateur dans le fichier donné" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" "Utiliser les commandes de l’assistant défini par l’utilisateur dans le " "fichier donné" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "Ne faire qu’afficher les commandes" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Système d’exploitation : %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bits" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bits" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architecture : %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Mémoire libre : %lld kio" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Page de code active : %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Version : %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Chemin vers les ressources : %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Chemin vers les données : %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Base de données d’appareils et d’objectifs de Hugin : %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi-processus utilisant C++11 std::thread et OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Profil du moniteur : %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Bibliothèques" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano de http://autopano.kolor.com n’est pas disponible pour OS X" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Utilisation d’Autopano-Sift en remplacement" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1274,88 +1309,95 @@ "Au moins un des champ d’entrée est vide.\n" "Veuillez vérifier vos entrées." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "" "Essayez de connecter toutes les images ayant une zone de superposition." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Ne fonctionne que sur les paires d’images sans point de contrôle." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Sélectionnez le programme de détection des points de contrôle" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Exécutables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "N°" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x gauche" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y gauche" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x droite" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y droite" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Alignement" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distance" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Un nouveau point de contrôle a été ajouté" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "Recherche de points similaires…" -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Erreur lors de l’ajustement précis" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Point ajusté précisément, angle : %.0f deg, coefficient de corrélation : " -"%0.3f, courbure %0.3f %0.3f " +"Point ajusté précisément, angle : %.0f deg, coefficient de corrélation : %" +"0.3f, courbure %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" "modifiez les points ou pressez le bouton droit de la souris pour ajouter la " "paire de points" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Le point estimé est en dehors de l’image" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" +"La distance entre les points de contrôle de la ligne est trop courte, " +"ajustement précis sauté." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Aucun point semblable n’a été trouvé." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1363,7 +1405,7 @@ "Une transformation interne s’est mal déroulée.\n" "Vérifiez que le point se trouve à l’intérieur de l’image." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1374,31 +1416,36 @@ "Le coefficient de corrélation (%.3f) est inférieur au seuil défini dans les " "préférences." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Ajouter une nouvelle ligne" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Ligne %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Corrélation" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "ligne vert." -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "ligne horiz." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1408,38 +1455,38 @@ "Pour créer moins de points,\n" "entrer un nombre plus grand." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Seuil de détection du coin" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Créer des points de contrôle" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Échelle de détection du coin" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Erreur lors de la création du point de contrôle :\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Sélectionnez un point de l’image de droite" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Sélectionnez un point de l’image de gauche" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Créer un point de contrôle (paramètre actuel : %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1447,35 +1494,35 @@ "Impossible de faire tourner Celeste sans au moins un point de contrôle " "reliant les deux images" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Exécution de Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Chargement du fichier de modèle" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "%lu points de contrôle ont été supprimés" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Résultats de Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Nettoyage" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Créer un point de contrôle" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1483,19 +1530,20 @@ "Créer des points de contrôle pour la paire d’images actuelle avec le " "détecteur de points de contrôle sélectionné depuis l’onglet des photos." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Essai de suppression des points de contrôle des nuages" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Nettoyer les points de contrôle" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "" "Supprimer les points de contrôle en périphérie par une méthode statistique" @@ -1508,23 +1556,23 @@ msgid "Could not process event!" msgstr "Impossible de traiter l’événement !" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "N° Pt Ctrl G" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Img. gauche" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Img. droite" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "N° Pt Ctrl P" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1532,7 +1580,7 @@ "Entrez l’erreur minimale pour les points de contrôle.\n" "Tout point dont l’erreur est supérieure sera sélectionné" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Sélectionnez des points de contrôle" @@ -1612,60 +1660,60 @@ "majuscule pour contraindre), ou faites une rotation avec clic-droit-glisser " "ou Ctrl-glisser." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Aperçu rapide du panorama" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fichier" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Images affichées" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Toutes" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Aucune" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Masquer" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "glissez pour changer le champ de vision vertical" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "glissez pour changer le champ de vision horizontal" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Aperçu" @@ -1673,85 +1721,90 @@ msgid "Overview" msgstr "Vue d’ensemble" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Réinitialise les paramètres de projection à leurs valeurs par défaut." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param :" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Aucune image n’a été chargée." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu images ont été chargées." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Les images sont raccordées par %lu points de contrôle.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%lu groupes d’images non connectées ont été trouvés : %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Les images ou les points de contrôle ont changé, il faut refaire " "l’alignement." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Erreur moyenne après optimisation : %.1f pixels, max : %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectilinéaire" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindrique" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "La valeur du lacet doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "La valeur du tangage doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "La valeur du roulis doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "La valeur de X doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "La valeur de Y doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "La valeur de Z doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "La valeur doit être numérique." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "La valeur pour la plage de compression est hors de la plage valable." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1764,59 +1817,59 @@ "les paramètres Tpy et Tpp.\n" "Faut-il réinitialiser les paramètres Tpy et Tpp à zéro ?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "différence" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Recadrage automatique" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Calcul du recadrage optimum" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "le haut doit être un entier positif" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "la gauche doit être un entier positif" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "la droite doit être un entier positif" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "le bas doit être un entier positif" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "la limite gauche doit être plus petite que la droite" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "la limite supérieure doit être plus petite que la basse" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" "Valeur de champ de vision horizontal (HFOV) incorrecte. La valeur maximum de " "HFOV pour cette projection est de %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" "Valeur de champ de vision vertical (VFOV) incorrecte. La valeur maximum de " "VFOV pour cette projection est de %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1824,7 +1877,7 @@ "Avec un champ de vision large, les panoramas utilisant une projection " "rectilinéaire sont très étirés vers les bords.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1832,16 +1885,16 @@ "Comme le champ de vision n’est très large que dans la direction horizontale, " "essayez plutôt une projection cylindrique." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Pour un panorama très large, essayez plutôt une projection équirectangulaire." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " Vous pouvez aussi essayer une projection Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1853,7 +1906,7 @@ "Une projection équirectangulaire permettra de placer le même contenu dans un " "espace vertical plus restreint." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1864,7 +1917,7 @@ "La projection cylindrique préserve les lignes verticales, au contraire de la " "projection équirectangulaire." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1876,7 +1929,7 @@ "Une projection conforme préserve les angles autour d’un point ce qui la rend " "souvent plus agréable à l’œil." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1889,7 +1942,7 @@ "pouvez inclure un large champ de vision tout en conservant une couverture " "raisonnable de la partie centrale." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1897,7 +1950,7 @@ "Définir un panorama avec une projection rectilinéaire permettra de conserver " "les lignes droites rectilignes." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1908,27 +1961,27 @@ "Si vous désirez afficher de nouveau cette barre, vous pouvez la réactiver " "depuis le menu des préférences." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individuel" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaïque" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaïque, individuel" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosphère" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Plan en mosaïque" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1939,12 +1992,12 @@ "\n" "Faut-il optimiser de nouveau le panorama ?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "La stratégie de l’optimiseur actuellement sélectionnée est « %s »." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1952,7 +2005,7 @@ "La région sélectionnée ne contient pas d’image active.\n" "Veuillez sélectionner une région qui soit couverte par au moins deux images." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1960,7 +2013,7 @@ "La région sélectionnée n’est couverte que par une seule image.\n" "Impossible de créer des points de contrôle pour une image unique." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1974,27 +2027,27 @@ "\n" "Faut-il poursuivre cependant ?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Recherche de points de contrôle" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Traitement" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Reformatage de l’image selon la projection du panorama…" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Points d’intérêt correspondants…" -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Vérification des résultats…" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -2005,7 +2058,7 @@ "\n" "Faut-il optimiser de nouveau le panorama ?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -2013,7 +2066,7 @@ "Erreur lors de l’initialisation de GLEW\n" "La fenêtre d’aperçu rapide n’a pas pu être ouverte." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2060,7 +2113,7 @@ msgstr "Nombre de masques" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Recadrer" @@ -2094,7 +2147,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "La différence maximum d’IL doit être supérieure à 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Ensembles" @@ -2273,7 +2326,7 @@ msgid "Shutter speed" msgstr "Vitesse d’obturation" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2420,93 +2473,93 @@ msgid "Camera response parameter" msgstr "Paramètre de réponse de l’appareil photo" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "non active" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "active" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Objectif %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Ensemble %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Ensemble de sortie %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Calque d’exposition en sortie %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Lier" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Délier" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Tout sélectionner pour l’objectif actuel" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Tout dé-sélectionner pour l’objectif actuel" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Tout sélectionner pour l’ensemble actuel" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Tout dé-sélectionner pour l’ensemble actuel" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Tout sélectionner" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Tout dé-sélectionner" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Modifier les variables de l’image…" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Désactiver l’image" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Activer l’image" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Activer les images" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Désactiver les images" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Points de contrôle" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2539,12 +2592,24 @@ msgid "Did you know..." msgstr "Saviez-vous que…" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Version %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2552,76 +2617,76 @@ "Erreur fatale d’installation\n" "Le fichier data/splash.png n’a pas été trouvé sur :" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Aide" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Actions" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "&Sortie" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Séquence définie par l’utilisateur : « %s »" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Séquences de sortie définies par l’utilisateur" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "Édit&er" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "Assistant défini par l’utilisateur : « %s »" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "Assistant défini par l’utilisateur" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Lancé" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimisation" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Exposition" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "" "Faut-il enregistrer les modifications vers le fichier de projet avant " "d’ouvrir un autre projet ?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "" "Faut-il enregistrer les modifications vers le fichier de projet avant de " "démarrer un nouveau projet ?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "" "Faut-il enregistrer les modifications vers le fichier de projet avant de " "fermer ?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2629,7 +2694,7 @@ "Si vous chargez un autre projet sans enregistrer, les modifications " "apportées depuis la dernière sauvegarde seront perdues." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2637,7 +2702,7 @@ "Si vous démarrez un nouveau projet sans enregistrer, les modifications " "apportées depuis la dernière sauvegarde seront perdues." -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2645,40 +2710,40 @@ "Si vous fermez sans enregistrer, les modifications apportées depuis la " "dernière sauvegarde seront perdues." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Ne pas enregistrer" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Fermer sans enregistrer" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Fermeture forcée" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "Projet %s enregistré" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin – Assembleur de panoramas" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Éditeur de panorama" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2691,35 +2756,35 @@ "\n" "(Code erreur : %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Enregistrer le fichier script de PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Fichiers de PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Ouverture du projet : " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projet ouvert" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "Chargement annulé" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Erreur lors de l’ouverture du projet : " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Ouvrir un fichier de projet" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2730,11 +2795,11 @@ "Ce fichier ne peut pas être ouvert par Fichier -> Ouvrir.\n" "Voulez-vous plutôt ajouter ce fichier d’image au projet actuel ?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Ouverture du projet : abandon" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2745,7 +2810,7 @@ "Ce fichier n’est pas un fichier image valable.\n" "Ce fichier va être enlevé du projet." -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2757,32 +2822,32 @@ "accessible.\n" "Ce fichier va être enlevé du projet." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Impossible de lire le fichier de projet %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Ouvrir un fichier xml de Papywizard" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Fichiers xml de Papywizard (*.xml)|*.xml|Tous les fichiers (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Choisir un modèle de projet" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Ajuster précisément tous les points" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Ajustement précis" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2812,23 +2877,23 @@ "Utiliser la liste de points de contrôle (F3) pour visualiser tous les points " "du projet actuel\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Résultat de l’ajustement précis" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Suppression des points de contrôle sur les masques" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Sélectionner un script python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Script python (*.py)|*.py|Tous les fichiers (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2837,13 +2902,13 @@ "Fichier « %s » introuvable.\n" "Le fichier a peut-être été renommé, déplacé ou supprimé." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Erreur !" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2851,12 +2916,12 @@ "Le modèle Celeste attendu dans %s est introuvable, il faut installer Hugin " "correctement." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Impossible de lire le fichier modèle %s de Celeste." -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2866,7 +2931,7 @@ "ensembles et/ou un décalage du centre de vignetage.\n" "Ces fonctionnalités ne sont pas prise en charge par l’interface simple." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2876,7 +2941,7 @@ "paramètres de translation ou de cisaillement.\n" "Ces paramètres ne sont pas prise en charge par l’interface simple." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2886,7 +2951,7 @@ "paramètres de translation ou de cisaillement.\n" "Ces paramètres ne sont pas prise en charge par l’interface avancée." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." @@ -2894,11 +2959,11 @@ "La file d’attente de l’assistant est vide. Ceci indique une erreur dans le " "fichier de l’assistant qui a été défini par l’utilisateur." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Exécution de l’assistant" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2907,12 +2972,12 @@ "lignes verticales dans l’éditeur de panorama et optimiser le projet vous-" "même." -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Attention, %d groupes d’images non connectées ont été trouvés :" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2924,7 +2989,7 @@ "\n" "Après avoir ajouté les points, pressez de nouveau le bouton « Aligner »" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2932,23 +2997,23 @@ "L’assistant ne s’est pas terminé avec succès. Veuillez vérifier le fichier " "de projet résultant." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Fichier de projet introuvable" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Impossible de lancer PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Un programme incorrect a été lancé" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Type de masque" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2956,29 +3021,29 @@ "Créer un masque polygonal par clic gauche sur l’image, définir le dernier " "point avec le bouton de droite de la souris." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Enregistrer le masque" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Fichiers de masque (*.msk)|*.msk|Tous les fichiers (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Charger un masque" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Chargement du masque : abandon" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Impossible d’analyser le masque depuis le fichier %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Veuillez entrer un nombre valable" @@ -3125,7 +3190,7 @@ msgstr "Alignement photométrique" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Chargement des images" @@ -3170,65 +3235,69 @@ msgid "Photometric optimization finished" msgstr "Optimisation photométrique terminée" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Ajouter des images individuelles…" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "" "Ajouter une série d’images\n" "prises au même moment…" -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Aucune image correspondante trouvée." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Manipuler les variables de l’image…" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Supprimer la ou les images sélectionnées" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Définir cette image comme référence de position" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Définir cette image comme référence d’exposition" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nouvel objectif" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Changer d’objectif…" -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Entrer le numéro du nouvel objectif" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Objectif numéro" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Changer de numéro d’objectif" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Charger l’objectif depuis la base de données des objectifs" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Charger l’objectif depuis le fichier ini" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3237,12 +3306,12 @@ "Les paramètres chargés doivent-ils être appliqués à toutes les images " "utilisant le même objectif ?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Question" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3253,100 +3322,100 @@ "résultats non désirés.\n" "Faut-il cependant appliquer le paramétrage ?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Enregistrer l’objectif dans le fichier ini" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Supprimer des points de contrôle" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Les images sélectionnées n’ont pas de point de contrôle." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Faut-il vraiment supprimer %lu points de contrôle ?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Supprimer les points de contrôle" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Nettoyer les points de contrôle" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Nettoyage des points de contrôle" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Vérifications paire par paire" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Vérification de l’ensemble du projet" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Nettoyage terminé" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Supprimer les points de contrôle situés sur des nuages" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Réinitialiser ce qui a été défini par l’utilisateur…" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Réinitialiser les positions" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Réinitialiser les paramètres de translation" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Réinitialiser les paramètres de l’objectif" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Réinitialiser les paramètres photométriques" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nouvel ensemble" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Changer d’ensemble…" -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Entrer le numéro du nouvel ensemble" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "ensemble numéro" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Changer le numéro de l’ensemble" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Définir les dimensions de l’ensemble…" -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Qualité :" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3416,48 +3485,48 @@ msgid "Hammer-Aitoff Equal Area" msgstr "À surface égale de Hammer-Aitoff" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "la largeur doit être un entier positif" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "la hauteur doit être un entier positif" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "La limite gauche doit être plus petite que la droite." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "La limite supérieure doit être plus petite que la basse." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " Les options de PTmender ne sont pas encore implémentées" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " Les options de PTblender ne sont pas encore implémentées" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "" " Les options pour ce programme HDRMerge ne sont pas encore implémentées" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Impossible de créer le fichier temporaire de projet" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Indiquer un préfixe de sortie" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3466,15 +3535,15 @@ "Vous n’avez pas les droits pour écrire dans le dossier « %s ».\n" "Veuillez sélectionner un autre dossier pour la sortie finale." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Sélectionner la sortie définie par l’utilisateur" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Sortie définie par l’utilisateur|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3489,7 +3558,7 @@ "Diminuez les dimensions du canevas sur la fenêtre d’assemblage ou " "sélectionnez un format de sortie TIF ou PNG ." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3504,7 +3573,7 @@ "panorama de cette dimension peut prendre beaucoup de temps et demander " "beaucoup de mémoire." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3518,19 +3587,19 @@ "Si c’est trop gros, veuillez réduire les dimensions du canevas du panorama " "ou de la région recadrée." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Êtes-vous certain de vouloir assembler un panorama aussi volumineux ?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Assembler cependant" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Laissez-moi corriger ceci" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3540,7 +3609,7 @@ "Veuillez vérifier votre paramétrage de manière à ce qu’une image au moins se " "trouve dans la zone de sortie." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3548,9 +3617,9 @@ "folder.\n" "Are you sure that you still want to stitch it?" msgstr "" -"Le dossier « %s » ne possède que % 1f Mio de libres. Ceci n’est pas " -"suffisant pour effectuer l’assemblage du panorama actuel. Diminuez les " -"dimensions en sortie ou sélectionnez un autre dossier de sortie.\n" +"Le dossier « %s » ne possède que % 1f Mio de libres. Ceci n’est pas suffisant " +"pour effectuer l’assemblage du panorama actuel. Diminuez les dimensions en " +"sortie ou sélectionnez un autre dossier de sortie.\n" "Êtes-vous certain de vouloir l’assembler cependant ?" #: hugin1/hugin/PapywizardImport.cpp:341 @@ -3578,122 +3647,137 @@ msgid "Miscellaneous" msgstr "Divers" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Langue par défaut du système" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "basque" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "catalan" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "chinois simplifié" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "chinois (traditionnel)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "tchèque" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "danois" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "hollandais" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "anglais" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "français" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "allemand" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "hongrois" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "italien" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "japonais" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "polonais" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "portugais (Brésil)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "russe" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "slovaque" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "espagnol" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "suédois" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "finnois" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "valencien (catalan méridional)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Choisir Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Exécutables (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Choisir Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "Sélectionner dcraw" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "Sélectionner RawTherapee-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Sélectionner Darktable-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Sélectionner le fichier de paramètres d’ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "" "Fichiers de paramètres d’ExifTool (*.arg)|*.arg|Tous les fichiers (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3702,14 +3786,14 @@ "Le fichier %s n’existe pas.\n" "Faut-il créer le fichier de paramètres avec les mots-clés par défaut ?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Fichier de paramètres d’ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3717,18 +3801,18 @@ "Pas de fichier sélectionné.\n" "Faut-il créer un fichier de paramètres avec les mots-clés par défaut ?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Sélectionnez un nouveau fichier de paramètres d\"ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Impossible d’enregistrer le fichier de projet « %s »." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3737,7 +3821,7 @@ "Le fichier %s n’existe pas.\n" "Faut-il créer un fichier de paramètres d’exemple ?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3745,25 +3829,26 @@ "Pas de fichier sélectionné.\n" "Faut-il créer un fichier de paramètres d’exemple ?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "Faut-il vraiment rétablir les préférence affichées à leurs valeurs par " "défaut ?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Charger les valeurs par défaut" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Veuillez d’abord sélectionner une entrée" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Choisir un entrée" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3771,31 +3856,31 @@ "Vous ne pouvez supprimer le dernier paramètre.\n" "Il faut au moins un paramètre." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Faut-il vraiment supprimer le paramètre « %s » du détecteur de points de " "contrôle ?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Supprimer les paramètres du détecteur de points de contrôle" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Charger les paramètres du détecteur de points de contrôle" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Paramètres du détecteur de points de contrôle (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Enregistrer les paramètres du détecteur de points de contrôle" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3824,50 +3909,54 @@ msgid "Remove %lu control points" msgstr "Supprimer %lu points de contrôle" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Aperçu du panorama" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Options d’aperçu" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Projection (f) :" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Mode de fusion :" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Sortie :" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "Faible plage dynamique (LDR)" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "Haute plage dynamique (HDR)" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "IL :" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Compression de plage :" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Paramètres de la projection" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Clic-gauche pour définir le nouveau point central, clic-droit pour déplacer " "le point sur l’horizon." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centrer le panorama avec le bouton de gauche de la souris, positionner " @@ -3888,7 +3977,7 @@ msgid "Click a connection to edit control points." msgstr "Cliquer sur une connexion pour éditer des points de contrôle." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3899,30 +3988,129 @@ "Erreur :%s\n" "Une cause possible est un fichier image non valable ou manquant." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Exécutable « %s » introuvable.\n" +"Veuillez indiquer un exécutable valable." + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Exécutable « %s » introuvable dans le chemin (« PATH »).\n" +"Veuillez indiquer un exécutable valable." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Exécution : %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "Mise à jour des données EXIF pour %s" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Profil de traitement introuvable « %s » introuvable.\n" +"Veuillez indiquer un fichier valable ou laisser le champ vide pour utiliser " +"les valeurs par défaut." + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Importer des images RAW" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Impossible de traiter la sortie de l’image de référence.\n" +"Impossible de de traiter d’autres images." + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Fermer" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Attention : erreur de lecture" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Les fichiers suivants seront sautés parce les métadonnées de ces fichiers " +"n’ont pas pu être lues." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Attention : images RAW en provenance d’appareils photo différents" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"Les images suivantes ont été prises avec un appareil photo différent de " +"l’autre.\n" +"L’importation RAW ne fonctionne que pour des images provenant du même " +"appareil." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" +"Au moins une image RAW n’a pas été convertie avec succès.\n" +"Cette ou ces images seront sautées." + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Sélectionner le profil de traitement par défaut de RT" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "Profil de traitement de RT|*.pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Le répertoire « %s » n’existe pas" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Impossible de définir la variable d’environnement PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Ouvrir le processeur de traitement par lots" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" "Ouvrir PTBatcher, processeur de lots pour les fichiers de projet de Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Ouvrir l’outil de calibration d’objectif" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Ouvrir Calibrate_lens_gui, interface graphique simple pour la calibration " @@ -3939,11 +4127,11 @@ "Vous ne l’avez peut-être pas installé correctement ou vous avez indiqué un " "chemin erroné dans les préférences." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "nettoyage des fichiers temporaires de points-clés" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3952,15 +4140,15 @@ "Veuillez utiliser %namefile, %i ou %s pour indiquer les fichiers d’entrée du " "détecteur de points de contrôle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Erreur dans la commande du détecteur des points de contrôle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3972,14 +4160,14 @@ "Veuillez sélectionner moins d’images ou placez les images\n" "dans un dossier avec un chemin plus court." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Trop d’images ont été sélectionnées" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3991,38 +4179,38 @@ "\n" " Impossible d’exécuter la commande : %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Erreur de wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "recherche des points de contrôle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Impossible d’exécuter la commande : %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -4031,9 +4219,9 @@ "La commande : %s\n" "a échoué avec un code erreur : %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4048,13 +4236,13 @@ "\n" "Commande exécutée : %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Échec du détecteur de points de contrôle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4062,7 +4250,7 @@ "Veuillez utiliser %i pour indiquer les fichiers d’entrée et %k pour indiquer " "le fichier de points-clés pour l’étape de création des clés" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4070,11 +4258,11 @@ "Veuillez utiliser %k pour indiquer les fichiers de points-clés et %o pour " "indiquer le fichier de projet en sortie pour l’étape de correspondance" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "génération du fichier clé" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4087,11 +4275,11 @@ "\n" " Impossible d’exécuter la commande : %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Valeur par défaut" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4099,256 +4287,256 @@ "Impossible d’effacer le lot en cours de traitement.\n" "Faut-il le planter ?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Lot effacé." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Erreur : impossible d’obtenir l’état, le projet d’index %d n’est pas dans la " "liste." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Erreur : impossible de charger le fichier de traitement par lots." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Le lot s’est terminé avec succès." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Le lot s’est terminé avec des erreurs." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Initialisation de la fermeture…" -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Arrêt en cours…" -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Préparation de la mise en veille prolongée…" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Initialisation de la mise en veille prolongée…" -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Préparation de la mise en veille…" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Initialisation de la mise en veille…" -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Indiquer le fichier de projet" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Pas de préfixe de sortie indiqué" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Pas de fichier de projet indiqué" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s – Assemblage" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s – Assistant" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "" "Erreur de suppression, le projet d’identifiant %d n’est pas dans la liste." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Erreur : impossible de supprimer le fichier de projet " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Lancement du lot…" -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI est en train d’effectuer le travail d’assemblage" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Le lot est déjà en cours de traitement." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Exécution de la commande « %s »" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Assemblage de %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Détection de %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Erreur : impossible d’obtenir l’état, le projet d’index %d n’est pas dans la " "liste." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Ne fait pas grand chose…" -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Vous avez pressé la touche « Commande »." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Vous avez pressé la touche Ctrl." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" "Faut-il sauter le chargement de la file d’attente de traitement par lots ?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Ne rien faire" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Fermer PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Arrêter l’ordinateur" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Mettre l’ordinateur en veille" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Mettre l’ordinateur en veille prolongée" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Veuillez entrer l’application en ligne de commandes à exécuter :" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Entrer l’application" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Indiquer le répertoire où rechercher des projets" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Indiquer le ou les fichiers de projet source" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Projets ajoutés depuis le répertoire %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Ajouter le projet %s à la file de traitement par lots." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Ajouter le projet %s à la file d’attente de l’assistant." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Traitement par lots arrêté" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Processeur de traitement par lots de Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Indiquer un préfixe de sortie pour le projet " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Le préfixe d’une cible de l’assistant ne peut pas être modifié." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Veuillez sélectionner un projet" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Veuillez ne sélectionner qu’un seul projet" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Indiquez le fichier de traitement par lots à ouvrir" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Fichiers de traitement par lots (*.ptb)|*.ptb|Tous les fichiers (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Impossible d’ouvrir l’application dans Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Pas de projet sélectionné. Faut-il ouvrir Hugin sans projet ?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Traitement par lots suspendu" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Suspendre le traitement par lot" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Poursuite du traitement par lots…" -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Exécuter le traitement par lots" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4356,7 +4544,7 @@ "Certains projets de la liste ont échoué.\n" "Faut-il également les supprimer ?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4364,16 +4552,16 @@ "Impossible de supprimer le projet en cours de traitement.\n" "Voulez-vous le planter ?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Projet %s supprimé" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Veuillez sélectionner un projet à supprimer" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4381,16 +4569,16 @@ "Impossible de réinitialiser le projet en cours d’exécution.\n" "Voulez-vous le planter ?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Réinitialiser le projet %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Veuillez sélectionner un projet à réinitialiser" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4398,15 +4586,15 @@ "Impossible de réinitialiser les projets en cours de traitement.\n" "Voulez-vous planter le lot ?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Indiquer le fichier de traitement par lots à fermer" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Fichier de traitement par lots (*.ptb)|*.ptb|Tous les fichiers (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4416,15 +4604,15 @@ "Cela peut avoir un effet négatif sur les performances.\n" "Faut-il vider cette liste maintenant ?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Effacer la liste de traitement par lot" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Conserver la liste de traitement par lots" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Lancement du traitement par lots" @@ -4460,7 +4648,7 @@ msgid "E&xit" msgstr "&Quitter" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4470,11 +4658,11 @@ "Si vous choisissez de fermer la fenêtre, ils seront perdus.\n" "Faut-il poursuivre cependant ?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Accepté" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4484,11 +4672,11 @@ "Si vous poursuivez, il seront ignorés.\n" "Faut-il poursuivre cependant ?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Arrêter" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4497,7 +4685,7 @@ "Le répertoire %s n’existe pas.\n" "Veuillez indiquer un répertoire existant." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4505,7 +4693,7 @@ "Vous n’avez pas sélectionné de panorama possible.\n" "Veuillez sélectionner au moins un panorama et réessayer." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4515,139 +4703,141 @@ "Vous n’avez peut-être pas les permissions en écriture sur ces répertoires ou " "votre disque dur est plein." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Supprimer l’image du projet" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Séparer ici en deux panoramas" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Lecture du fichier %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Lancer" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "%d panoramas possibles ont été trouvés." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Aucun panorama possible n’a été trouvé." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d images : %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Erreur de syntaxe détectée dans les paramètres, abandon." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI lancé" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "En attente" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "En cours de traitement" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Terminé" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Échoué" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fichier manquant" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Suspendu" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projet" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Préfixe de sortie" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "État" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Modifié pour la dernière fois" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Format de sortie" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projection" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Taille" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Erreur, impossible de convertir l’identifiant" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistant" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Modifier le préfixe" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Réinitialiser le projet" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Éditer avec Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Supprimer" @@ -4684,28 +4874,28 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Fichiers de journaux (*.log)|*.log|Tous les fichiers (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Le fichier de sortie utilisateur « %s » est introuvable." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Indiquer le fichier de projet source du projet" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" "Hugin can not work with this filename. Please enter a valid filename." msgstr "" -"Le nom de fichier indiqué contient l’un des caractères non licite suivants :" -"%s\n" +"Le nom de fichier indiqué contient l’un des caractères non licite suivants :%" +"s\n" "Hugin ne peut pas traiter ce nom de fichier. Veuillez entrer un nom de " "fichier valable." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "À propos de Hugin" @@ -4738,19 +4928,19 @@ msgstr "Système" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "Accepter" @@ -4833,8 +5023,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Choisir…" @@ -4926,7 +5119,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Options" @@ -4958,10 +5151,6 @@ msgid "Send selected panoramas to queue" msgstr "Envoyer les panoramas sélectionnés dans la file de traitement" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Fermer" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Recherche de panoramas" @@ -5060,12 +5249,12 @@ msgstr "&Réduire dans la barre des tâches" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Quitter" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Quitter le programme" @@ -5170,70 +5359,179 @@ msgid "adddir" msgstr "aj. rép" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "Paire d’images précédente" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Description :" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "Paire d’images suivante" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Type :" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "Mode :" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Toutes les images d’un coup" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "Ligne verticale" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama avec ensembles d’images" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "Ligne horizontale" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Panorama multi-lignes" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom :" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Panorama multi-lignes avec ensembles d’images" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "Ajuster à la fenêtre" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Panorama préaligné" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Ajustement précis" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Détecteur" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Tenter d’optimiser le point actif actuel" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Détecteur en une étape" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "Ajus&tement précis automatique" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programme :" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "Ajout automatique" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Paramètres :" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "" -"Ajouter immédiatement le point de contrôle lors de la sélection d’un second " -"point" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Paramètres de nettoyage :" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "Estimation automatique" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Détecteur en deux étapes" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"Essaie d’estimer le décalage entre les images et utilise cette valeur lors " -"de la mise en place des points de contrôle" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Outil de description des motifs :" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Outil de correspondance de motifs :" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Outil de détection des ensembles d’images" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Laisser vide lorsqu’aucun détecteur de points de contrôles ne doit être " +"lancé sur les ensembles." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Options avancées" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Ce paramètre n’a pas d’option avancée." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Les modèles suivants seront substitués avant le lancement :\n" +"%o -- sortie du projet (0.oto sera ajouté si Autopano est utilisé)\n" +"%p -- nombre de points de contrôle pour chaque paire d’images\n" +"%v -- largeur de champ (HFOV) de la première image\n" +"%f -- projection de la première image (0-4, comme pour Panotools)\n" +"%i -- fichiers image\n" +"%namefile -- fichier contenant les noms des fichiers images\n" +"%s -- script d’entrée Panotools\n" +"%k -- fichier(s)-clé(s) intermédiaire(s)" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Paramètres pour le générateur de points de contrôle" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "Paire d’images précédente" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "Paire d’images suivante" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "Mode :" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "Ligne verticale" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "Ligne horizontale" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom :" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "Ajuster à la fenêtre" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Ajustement précis" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Tenter d’optimiser le point actif actuel" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "Ajus&tement précis automatique" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "Ajout automatique" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "" +"Ajouter immédiatement le point de contrôle lors de la sélection d’un second " +"point" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "Estimation automatique" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"Essaie d’estimer le décalage entre les images et utilise cette valeur lors " +"de la mise en place des points de contrôle" #: hugin1/hugin/xrc/cp_editor_panel.xrc:288 msgid "&Delete" @@ -5265,7 +5563,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Supprimer" @@ -5273,155 +5571,189 @@ msgid "Select by Distance" msgstr "Sélectionner par distance" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Description :" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Attention : noms de fichiers incorrects" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Type :" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"Les fichiers suivants existent déjà.\n" +"Ils seront écrasés lors de l’exécution de l’importation RAW.\n" +"Voulez-vous écraser ces fichiers ?" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (par A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Oui" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Toutes les images d’un coup" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Non" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama avec ensembles d’images" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Modifier le script des outils de Panorama" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Panorama multi-lignes" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Ceci est le script qui va être passé au moteur des Outils de Panorama " +"(« Panorama Tools »). Modifier ces lignes est une technique avancée." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Panorama multi-lignes avec ensembles d’images" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Poursuivre en utilisant ces modifications" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Panorama préaligné" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Abandonner les modifications" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Détecteur" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Regrouper par :" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Détecteur en une étape" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Recouvrement minimum :" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programme :" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Recouvrement minimum pour la détection d’un ensemble en sortie\n" +"Avec -1, on utilisera les ensembles assignées dans le projet." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Paramètres :" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Différence maximum d’IL :" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Paramètres de nettoyage :" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Différence maximum d’IL pour la détection des calques de sortie" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Détecteur en deux étapes" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Affichage" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Outil de description des motifs :" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Général" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Outil de correspondance de motifs :" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Données EXIF" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Outil de détection des ensembles d’images" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Positions" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Laisser vide lorsqu’aucun détecteur de points de contrôles ne doit être " -"lancé sur les ensembles." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Paramètres de l’objectif" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Options avancées" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Paramètres photométriques" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Ce paramètre n’a pas d’option avancée." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Type d’objectif" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"Les modèles suivants seront substitués avant le lancement :\n" -"%o -- sortie du projet (0.oto sera ajouté si Autopano est utilisé)\n" -"%p -- nombre de points de contrôle pour chaque paire d’images\n" -"%v -- largeur de champ (HFOV) de la première image\n" -"%f -- projection de la première image (0-4, comme pour Panotools)\n" -"%i -- fichiers image\n" -"%namefile -- fichier contenant les noms des fichiers images\n" -"%s -- script d’entrée Panotools\n" -"%k -- fichier(s)-clé(s) intermédiaire(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Ajouter des images…" + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Type d’objectif :" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Coefficient multiplicateur de focale :" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Correspondance de motifs" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Paramètres :" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "Lancer le détecteur de points de contrôle sur les images sélectionnées" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Paramètres pour le générateur de points de contrôle" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimisation" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Noms de fichiers incorrects" +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Géométrique :" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Modifier le script des outils de Panorama" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Calculer" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Photométrique :" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Image sélectionnée" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Charger les données de l’objectif…" + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Ceci est le script qui va être passé au moteur des Outils de Panorama " -"(« Panorama Tools »). Modifier ces lignes est une technique avancée." +"Entrez le champ de vision horizontal (HFOV) ou la distance focale et le " +"facteur de recadrage :" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Poursuivre en utilisant ces modifications" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v) :" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Abandonner les modifications" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "degrés" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Données de l’appareil et de l’objectif" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Lacet :" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Tangage :" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Roulis :" @@ -5429,34 +5761,11 @@ msgid "Translation parameter" msgstr "Paramètre de translation" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X :" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y :" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z :" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpr :" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpt :" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Positions" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "Angle de champ (v) :" @@ -5556,7 +5865,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Aide" @@ -5599,8 +5908,8 @@ msgstr "Charger" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Enregistrer" @@ -5612,121 +5921,45 @@ msgid "Manipulate image variables" msgstr "Manipuler les variables de l’image" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Regrouper par :" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Recouvrement minimum :" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Recouvrement minimum pour la détection d’un ensemble en sortie" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Différence maximum d’IL :" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Différence maximum d’IL pour la détection des calques de sortie" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Affichage" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Général" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Données EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Paramètres de l’objectif" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Paramètres photométriques" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Type d’objectif" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Ajouter des images…" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Type d’objectif :" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Coefficient multiplicateur de focale :" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Correspondance de motifs" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Paramètres :" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "Lancer le détecteur de points de contrôle sur les images sélectionnées" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "Référence de balance du blanc" -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimisation" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "Dcraw" -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Géométrique :" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "Paramètres supplémentaires de dcraw :" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Calculer" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Photométrique :" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Profil de traitement :" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Image sélectionnée" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "Laisser vide pour utiliser les réglages par défaut dans RawTherapee" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Charger les données de l’objectif…" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "Darktable" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" msgstr "" -"Entrez le champ de vision horizontal (HFOV) ou la distance focale et le " -"facteur de recadrage :" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v) :" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "degrés" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Données de l’appareil et de l’objectif" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importer" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5873,14 +6106,6 @@ msgid "Don't ask again" msgstr "Ne plus demander à l’avenir" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Oui" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Non" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5944,21 +6169,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importer les positions depuis le fichier XML de Papywizard" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "A&nnuler" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Annuler la dernière action" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Refaire" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Refaire la dernière action" @@ -6001,12 +6226,12 @@ msgid "Use only normal control points in optimization." msgstr "N’utiliser que les points de contrôle normaux lors de l’optimisation." -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimiser" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Relancer l’optimiseur avec les paramètres actuels" @@ -6035,15 +6260,15 @@ msgid "Run a python script" msgstr "Faire tourner un script python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "Affic&her" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "P&lein écran" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Afficher la fenêtre principale de Hugin en plein écran" @@ -6119,19 +6344,19 @@ msgid "Show the Stitcher panel" msgstr "Afficher la fenêtre d’assemblage" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "&Simple" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "&Avancée" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "&Experte" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "&Interface" @@ -6153,86 +6378,86 @@ "Assembler avec les paramètres depuis une séquence de sortie définie par " "l’utilisateur" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Quelques informations concernant les différents boutons." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "Astuce du &jour" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Afficher l’une des astuces." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Raccourcis clavier" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "Raccourcis clavier" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Questions fréquentes" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "À &propos" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Préférences" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nouveau" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nouveau projet" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Ouvrir" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Ouvrir un projet" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Enregistrer" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Enregistrer le fichier du projet actuel" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Enregistrer &sous" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Enregistrer le projet en cours dans un nouveau fichier" @@ -6248,18 +6473,18 @@ "Écrire le projet actuel sous la forme d’un fichier script compatible avec " "PTStitcher, ceci peut être utile pour un traitement par lots." -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "Liste des pro&jets récents" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Liste des fichiers de projet les plus récemment utilisés" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Lancer le traitement par lots" @@ -6347,7 +6572,7 @@ msgid "Show the OpenGL preview image" msgstr "Afficher l’image d’aperçu OpenGL" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Aperçu du panorama" @@ -6404,15 +6629,10 @@ msgstr "Exclure la zone de toutes les images de cet objectif" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exporter" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importer" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Copier" @@ -6456,8 +6676,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" "Appliquer toutes les modifications à toutes les images ayant été prises avec " "le même objectif que les images sélectionnées." @@ -6561,7 +6781,8 @@ msgid "execute the PTOptimizer engine" msgstr "Exécuter le moteur PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientation de l’image" @@ -6606,39 +6827,39 @@ msgid "Interpolator (i):" msgstr "Interpolateur (i) :" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubique)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilinéaire" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Plus proche voisin" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "approximation des valeurs entre les pixels sources" @@ -6668,7 +6889,7 @@ msgid "Enfuse options" msgstr "Options d’Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Angle de champ :" @@ -6836,10 +7057,6 @@ msgid "Image fusion:" msgstr "Fusion de l’image :" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "Enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Outil d’assemblage en haute plage dynamique (HDR) :" @@ -6944,15 +7161,15 @@ msgid "Output parameters" msgstr "Paramètres de sortie" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Mode de fusion des raccords :" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "raccords durs (plus rapide)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "raccords fusionnés" @@ -7022,27 +7239,40 @@ msgid "This affects the control points editor and mask editor." msgstr "Ceci affecte l’éditeur de points de contrôle et l’éditeur de masque." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "Exécutable Dcraw :" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(laisser vide pour utiliser la valeur par défaut du système)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "Exécutable RT-cli :" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "Exécutable darktable-cl :" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Options des fichiers" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Répertoire temporaire :" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(laisser vide pour utiliser la valeur par défaut du système)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Nom de fichier de projet par défaut :" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Préfixe de sortie par défaut :" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7075,45 +7305,45 @@ "%projectname - nom de fichier du projet (uniquement pour le préfixe de " "sortie)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Noms de fichiers par défaut" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Noms de fichiers" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Chargement d’images" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Aligner automatiquement les images après leur chargement" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Détecter les lignes verticales" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" "Détecte les lignes verticales dans les images afin de mettre de niveau le " "panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Supprimer les points de contrôle ressemblant à des nuages (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Étapes optionnelles de l’assistant" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Aligner automatiquement" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7121,67 +7351,67 @@ "Nombre de points de contrôle\n" "pour chaque recouvrement" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Redimensionner le panorama final à" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "pourcent de la largeur max." -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Éditeur de points de contrôle" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Affichage HDR et 16 bits" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Courbe" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "linéaire" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logarithmique" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "utilisé pour l’affichage dans l’interface graphique" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Largeur des éléments :" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixels" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Largeur de la zone de recherche :" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "% de la largeur de l’image" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Largeur de la zone de recherche locale :" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Seuil de corrélation :" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7189,11 +7419,11 @@ "0 : pas de similitude\n" "1 : maximum de similitude" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Seuil de courbure maximum :" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7201,120 +7431,116 @@ "0  : pas de maximum\n" "0.2 : maximum franc" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Recherche par rotation" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Utiliser la recherche par rotation (plus lente mais plus précise)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Angle de départ :" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Angle de fin :" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Pas :" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Générateur de points de contrôle" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programmes de génération de points de contrôle" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nouveau…" -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Modifier…" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "" "Déplacer\n" "vers le haut" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "" "Déplacer\n" "vers le bas" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Définir comme valeur par défaut" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "L’assistant utilise le paramétrage par défaut." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Format de sortie" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Format de fichier par défaut :" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "format de sortie par défaut pour le panorama final" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Compression TIFF :" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "Compression TIFF par défaut" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Qualité JPEG :" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "paramètres de compression JPEG par défaut" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Outil de fusion" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Outil de fusion par défaut :" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Outil de fusion utilisé pour les nouveaux projets." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processeur" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Moteur qui effectuera l’assemblage" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Démarrer immédiatement les travaux d’assemblage" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7325,21 +7551,21 @@ "démarré dans un état suspendu et l’utilisateur devra lancer le traitement " "lui-même." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Écraser les images existantes" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" "ATTENTION : les fichiers existants seront écrasés sans demande de " "confirmation." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Sortie détaillée" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7347,19 +7573,19 @@ "Activer pour obtenir les détails, utile pour signaler un bogue ou simplement " "pour visualiser l’avancement du projet." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Assemblage" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Copier les métadonnées dans le fichier final en utilisant ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Options d’ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7373,7 +7599,7 @@ "Pour créer un fichier exemple de paramètres, laissez vide la boîte de texte " "et pressez « Éditer… »." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7381,19 +7607,19 @@ "Le fichier de paramètres suivant sera utilisé pour copier des mots-clés à " "partir la première image vers toutes les images intermédiaires." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Fichier intermédiaire de paramètres d’ExifTool :" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Laisser vide pour utiliser les valeurs par défaut" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Modifier le fichier de paramètres d’ExifTool sélectionné" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7404,28 +7630,28 @@ "Il est appliquée en plus du fichier de paramètres ci-dessus pour les images " "intermédiaires." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Fichier de paramètres final d’ExifTool :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Créer les données XMP de la Photo Sphère" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" "Ceci ne sera effectué que pour les images de sortie équirectangulaires." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Options avancées" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Nombre de processus :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7437,83 +7663,83 @@ "Définissez ce nombre au maximum au nombre de processeurs ou de cœurs " "disponibles sur votre système." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 pour détection automatique" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Assemblage (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Interpolateur par défaut (i) :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Créer par défaut les images recadrées" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Utiliser le GPU pour le reformatage (« remapping ») (EXPÉRIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "Utiliser le GPU pour le reformatage (« remapping »)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Utiliser le GPU de la carte vidéo pour accélérer le reformatage" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Programme à utiliser en remplacement d’Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Exécutable Enblend :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Paramètres par défaut :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Voici les paramètres par défaut pour les nouveaux projets.\n" "Ils peuvent être modifiés pour chacun des projets dans l’onglet " "d’assemblage.\n" "Ne pas définir les paramètres -w, -o et --compression, ils sont définis par " -"Hugin" +"Hugin." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Programme à utiliser en remplacement d’Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Exécutable Enfuse :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programme" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Paramètres de Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Seuil de SVM :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7521,19 +7747,19 @@ "plus grand que 0.5 : moins sensible\n" "inférieur à 0.5 : plus sensible" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Largeur du filtre de Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "petite" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "grande" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7541,7 +7767,7 @@ "grande est plus précis\n" "petite peut examiner des points de contrôle proche de la bordure de l’image" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7552,60 +7778,60 @@ "Pour accélérer les calculs, seul un sous-ensemble aléatoire des points est " "utilisé." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Nombre de points par image :" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Optimiseur photométrique" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Avertissements" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" "Afficher les messages concernant l’enregistrement du fichier de projet et le " "préfixe de sortie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Afficher l’avertissement concernant de grandes différences d’exposition lors " "de l’ajout d’images" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Après l’outil « Éditer les points de contrôle »" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Demander à l’utilisateur" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Optimiser de nouveau le panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Ne pas optimiser le panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "" "Outil d’édition des points de contrôle (sur la fenêtre d’aperçu rapide)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Divers" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Préférences – Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." @@ -7613,11 +7839,11 @@ "Ce fichier de paramètres est appelé avec la ligne de commandes\n" "« exiftool -overwrite_original -tagsfromfile image -@ argfile panorama »." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Modifier le fichier de paramètres d’ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." @@ -7625,7 +7851,7 @@ "Ce fichier de paramètres est appelé avec la ligne de commandes\n" "« exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama »." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7662,11 +7888,11 @@ "\n" "Les variables de substitution sont sensibles à la casse." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centrer l’aperçu horizontalement" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centrer" @@ -7674,13 +7900,15 @@ msgid "Show the whole panorama" msgstr "Afficher l’ensemble du panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estimer l’angle de champ" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Remplir" @@ -7688,7 +7916,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Redresser automatiquement un horizon ondulé" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Redresser" @@ -7787,34 +8016,34 @@ "Définir la valeur de l’exposition du panorama à la moyenne de l’exposition " "de toutes les images." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Pipette de gris" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corriger la balance globale des blancs en sélectionnant une zone de gris " "neutre." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Modifier les points de contrôle" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "" "Créer ou supprimer des points de contrôle dans le rectangle sélectionné." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Arrière-plan :" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Échelle :" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7828,156 +8057,144 @@ "* Cliquer sur une ligne pour éditer les images associées dans l’onglet des " "points de contrôle." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Disposition" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guides :" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Règle des tiers" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Nombre d’or" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonale" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Méthode de la diagonale" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Triangle d’or (vers le bas)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Triangle d’or (vers le haut)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Redresser automatiquement un horizon ondulé." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Mode glisser :" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Appliquer" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Déplacer le panorama ou glisser les images à leur position" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Déplacer / Glisser" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Définir la région à recadrer au plus grand rectangle couvert par les images" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "Recadrage automatique HDR" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Définir la région à recadrer au plus grand rectangle couvert par les piles " "d’images" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "gauche :" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "haut :" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "droite :" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "bas :" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Réinitialiser le recadrage à la zone la plus grande possible" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Modifier la zone de recadrage du panorama" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Édit&eur de panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Aperçu" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Afficher l’aperçu de la sphère du panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "&Grille" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Afficher une grille." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "&Toutes les images" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "Image d’exposition &médiane de chaque ensemble" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "Image la &plus lumineuse de chaque ensemble" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "Image la plus &sombre de chaque ensemble" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "&Conserver les images actuellement sélectionnées" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "&Réinitialiser la sélection" @@ -8269,9 +8486,9 @@ "The precision of \"fine tuning\" control points can be improved by enabling " "rotation search. This is essential for fisheye and wide angle images." msgstr "" -"La précision de la commande « ajustement précis » des points de contrôle " -"peut être améliorée en activant la recherche par rotation. Ceci est " -"essentiel pour les images prises avec un fisheye ou un grand angle." +"La précision de la commande « ajustement précis » des points de contrôle peut " +"être améliorée en activant la recherche par rotation. Ceci est essentiel " +"pour les images prises avec un fisheye ou un grand angle." #: hugin1/hugin/xrc/data/tips.txt:35 msgid "" @@ -8296,9 +8513,97 @@ "Optimization of all distortion parameters \"everything\" makes only sense " "with heavily overlapping images and many well distributed control points." msgstr "" -"Optimisation de tous les paramètres, « tout » n’a de sens que pour des " -"images ayant un important recouvrement et des points de contrôle nombreux " -"bien répartis." +"Optimisation de tous les paramètres, « tout » n’a de sens que pour des images " +"ayant un important recouvrement et des points de contrôle nombreux bien " +"répartis." + +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "" +#~ "Veuillez ajouter au moins une image RAW à la liste avant de pouvoir " +#~ "l’importer." + +#~ msgid "Import Raw Files" +#~ msgstr "Importer des fichiers RAW" + +#~ msgid "(WB reference)" +#~ msgstr "(Référence de balance du blanc)" + +#~ msgid "Images" +#~ msgstr "Images" + +#~ msgid "Add image(s)..." +#~ msgstr "Ajouter des images…" + +#~ msgid "Add other images to list" +#~ msgstr "Ajouter une autre image à la liste" + +#~ msgid "Remove image" +#~ msgstr "Enlever l’image" + +#~ msgid "Remove selected image from list" +#~ msgstr "Enlever l’image sélectionnée de la liste" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "" +#~ "Marquer l’image sélectionnée comme image de référence pour la balance du " +#~ "blanc" + +#~ msgid "Converter settings" +#~ msgstr "Paramètres du convertisseur" + +#~ msgid "Import &raw file(s)..." +#~ msgstr "Importer des fichiers &RAW…" + +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "" +#~ "Convertir le fichier RAW en TIFF et ajouter le TIFF au projet actuel" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Déplacer le panorama ou glisser les images à leur position" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Modifier la zone de recadrage du panorama" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Utiliser le GPU pour le reformatage (« remapping ») (EXPÉRIMENTAL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Tous les fichiers d’images|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." +#~ "TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." +#~ "HDR;*.exr;*.EXR|Fichiers JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|" +#~ "Fichiers TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Fichiers PNG (*." +#~ "png)|*.png;*.PNG|Fichiers HDR (*.hdr)|*.hdr;*.HDR|Fichiers EXR (*.exr)|*." +#~ "exr;*.EXR|Tous les fichiers (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (par A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X :" + +#~ msgid "Y:" +#~ msgstr "Y :" + +#~ msgid "Tpy:" +#~ msgstr "Tpr :" + +#~ msgid "Tpp:" +#~ msgstr "Tpt :" + +#~ msgid "enfuse" +#~ msgstr "Enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "×" #~ msgid "Interface" #~ msgstr "Interface" @@ -9438,3 +9743,12 @@ #~ msgid "Change image variables by parsing expression..." #~ msgstr "Modifier les variable de l’image en analysant une expression…" + +#~ msgid "Select default RT history stack" +#~ msgstr "Sélectionner la pile d’historique par défaut de RT" + +#~ msgid "RT history stack|*.pp3" +#~ msgstr "Pile d’historique de RT|*.pp3" + +#~ msgid "Default history stack:" +#~ msgstr "Pile d’historique par défaut :" diff -Nru hugin-2018.0.0+dfsg/src/translations/hugin.pot hugin-2019.0.0+dfsg/src/translations/hugin.pot --- hugin-2018.0.0+dfsg/src/translations/hugin.pot 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/hugin.pot 2019-02-02 10:11:38.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -43,14 +42,14 @@ msgid "Searching for best crop..." msgstr "" -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -73,9 +72,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "" @@ -107,7 +106,7 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -117,24 +116,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "" @@ -155,8 +158,8 @@ msgstr "" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "" @@ -187,11 +190,13 @@ msgid "builtin" msgstr "" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "" @@ -213,16 +218,16 @@ msgid "Error loading lens parameters" msgstr "" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "" @@ -254,22 +259,23 @@ msgid "Error pausing process %ld, code 2" msgstr "" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "" @@ -303,12 +309,12 @@ msgid "Panorama Tools" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "" @@ -318,8 +324,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "" @@ -333,311 +339,321 @@ msgid "Could not create temporary file" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" "%s" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" "%s" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -645,35 +661,67 @@ msgid "Lens" msgstr "" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -681,20 +729,11 @@ "again." msgstr "" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -706,27 +745,27 @@ msgstr "" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "" @@ -741,7 +780,7 @@ msgid "Could not save information into database." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -749,11 +788,11 @@ "Abort" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -762,7 +801,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -773,77 +812,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -851,41 +890,41 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -893,48 +932,49 @@ "Press OK to remove." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" "current project contains %d images\n" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -962,7 +1002,7 @@ "Please check the image again, if you selected the correct images." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "" @@ -975,9 +1015,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -992,7 +1032,7 @@ msgstr "" #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "" @@ -1003,241 +1043,246 @@ "parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " "there are no lines found, change the parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1245,121 +1290,127 @@ "preferences." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" "enter a higher number." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "" @@ -1371,29 +1422,29 @@ msgid "Could not process event!" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" msgstr "" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "" @@ -1457,60 +1508,60 @@ "drag or ctrl-drag." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "" @@ -1518,83 +1569,88 @@ msgid "Overview" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1602,75 +1658,75 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1678,14 +1734,14 @@ "space." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" "Cylindrical projection preserves vertical lines, unlike equirectangular." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1693,7 +1749,7 @@ "easier on the eye." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1701,40 +1757,40 @@ "field of view and still have a reasonable coverage of the middle." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" "If you want to see the bar again, activate the bar in the preferences again." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1742,24 +1798,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1768,27 +1824,27 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1796,13 +1852,13 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." msgstr "" -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -1843,7 +1899,7 @@ msgstr "" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "" @@ -1876,7 +1932,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "" @@ -2053,7 +2109,7 @@ msgid "Shutter speed" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "" @@ -2200,93 +2256,93 @@ msgid "Camera response parameter" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2319,132 +2375,144 @@ msgid "Did you know..." msgstr "" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" msgstr "" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2453,35 +2521,35 @@ "(Error code: %s)" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2489,11 +2557,11 @@ "Do you want to add this image file to the current project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2501,7 +2569,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2509,32 +2577,32 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2550,89 +2618,89 @@ "Use the Control Point list (F3) to see all points of the current project\n" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" "Maybe file was renamed, moved or deleted." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2640,57 +2708,57 @@ "After adding the points, press the \"Align\" button again" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "" @@ -2790,7 +2858,7 @@ msgstr "" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "" @@ -2828,174 +2896,178 @@ msgid "Photometric optimization finished" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" "Apply settings anyway?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "" -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3065,62 +3137,62 @@ msgid "Hammer-Aitoff Equal Area" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3130,7 +3202,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3139,7 +3211,7 @@ "a long time and a large amount of memory." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3147,26 +3219,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3196,209 +3268,225 @@ msgid "Miscellaneous" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3422,48 +3510,52 @@ msgid "Remove %lu control points" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" @@ -3480,7 +3572,7 @@ msgid "Click a connection to edit control points." msgstr "" -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3488,29 +3580,111 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3522,26 +3696,26 @@ "settings." msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " "point detector" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3549,14 +3723,14 @@ "a shorter pathname" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3564,47 +3738,47 @@ " Could not execute command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" "failed with error code: %d" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3614,29 +3788,29 @@ "Executed command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3645,325 +3819,325 @@ " Could not execute command: %s" msgstr "" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "" @@ -3999,181 +4173,183 @@ msgid "E&xit" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" "Continue anyway?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" "Do you still want to continue?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" "Please give an existing directory." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " "full." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "" @@ -4202,16 +4378,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "" -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4219,7 +4395,7 @@ msgstr "" #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "" @@ -4252,19 +4428,19 @@ msgstr "" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "" @@ -4342,8 +4518,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "" @@ -4429,7 +4608,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "" @@ -4461,10 +4640,6 @@ msgid "Send selected panoramas to queue" msgstr "" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "" @@ -4558,12 +4733,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "" @@ -4667,64 +4842,162 @@ msgid "adddir" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " "control points" msgstr "" @@ -4758,7 +5031,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "" @@ -4766,175 +5039,190 @@ msgid "Select by Distance" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" msgstr "" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 -msgid "Yaw:" +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 -msgid "Pitch:" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 -msgid "Roll:" +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:54 -msgid "Translation parameter" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 -msgid "Z:" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:15 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 +msgid "Yaw:" +msgstr "" + +#: hugin1/hugin/xrc/image_variable_dlg.xrc:28 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 +msgid "Pitch:" +msgstr "" + +#: hugin1/hugin/xrc/image_variable_dlg.xrc:41 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 +msgid "Roll:" +msgstr "" + +#: hugin1/hugin/xrc/image_variable_dlg.xrc:54 +msgid "Translation parameter" +msgstr "" + +#: hugin1/hugin/xrc/image_variable_dlg.xrc:95 +#: hugin1/hugin/xrc/preview_frame.xrc:808 +msgid "Z:" msgstr "" #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 @@ -5036,7 +5324,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "" @@ -5076,8 +5364,8 @@ msgstr "" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "" @@ -5089,118 +5377,43 @@ msgid "Manipulate image variables" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" msgstr "" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 @@ -5342,14 +5555,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5406,21 +5611,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "" @@ -5459,12 +5664,12 @@ msgid "Use only normal control points in optimization." msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "" @@ -5492,15 +5697,15 @@ msgid "Run a python script" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "" @@ -5576,19 +5781,19 @@ msgid "Show the Stitcher panel" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "" @@ -5608,86 +5813,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "" @@ -5701,18 +5906,18 @@ "batch processing" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "" @@ -5797,7 +6002,7 @@ msgid "Show the OpenGL preview image" msgstr "" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "" @@ -5854,15 +6059,10 @@ msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "" @@ -5906,8 +6106,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6007,7 +6207,8 @@ msgid "execute the PTOptimizer engine" msgstr "" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "" @@ -6049,39 +6250,39 @@ msgid "Interpolator (i):" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "" @@ -6109,7 +6310,7 @@ msgid "Enfuse options" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "" @@ -6250,10 +6451,6 @@ msgid "Image fusion:" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "" @@ -6350,15 +6547,15 @@ msgid "Output parameters" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "" @@ -6424,27 +6621,40 @@ msgid "This affects the control points editor and mask editor." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 -msgid "File Options" +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 -msgid "Temporary dir:" +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:254 +msgid "File Options" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:261 +msgid "Temporary dir:" +msgstr "" + +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6462,271 +6672,267 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " "has to start the processing manually." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -6735,52 +6941,52 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -6788,173 +6994,173 @@ "available in your system" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" "To speed up the computation, only a random subset of points is used." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -6974,11 +7180,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "" @@ -6986,13 +7192,15 @@ msgid "Show the whole panorama" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "" @@ -7000,7 +7208,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "" @@ -7093,31 +7302,31 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7125,153 +7334,141 @@ "* Click a line to edit the associated images in the Control Points tab." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "" diff -Nru hugin-2018.0.0+dfsg/src/translations/hu.po hugin-2019.0.0+dfsg/src/translations/hu.po --- hugin-2018.0.0+dfsg/src/translations/hu.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/hu.po 2019-02-17 15:24:33.000000000 +0000 @@ -1,16 +1,16 @@ msgid "" msgstr "" -"Project-Id-Version: Hugin 2018.0.0\n" +"Project-Id-Version: Hugin 2019.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-12-31 18:19+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2019-02-10 22:26+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 2.0.5\n" +"Language: hu_HU\n" +"X-Generator: Poedit 2.2.1\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,891,-1,-1,-1,-1,-1\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 @@ -39,15 +39,15 @@ msgid "Searching for best crop..." msgstr "A legjobb kivágás keresése..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Külső program %s nem található a csomagban, visszatérés a rendszer útvonalhoz" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -74,9 +74,9 @@ msgstr "Bitkép (*.bmp)|*.bmp|PNG-Fájl (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Fájl %s létezik. Felülírjam?" @@ -113,7 +113,7 @@ msgstr "A körbevágás tényezőnek pozitívnak kell lennie." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -126,24 +126,28 @@ "Folytatja ennek ellenére a megadott nagyobb értékkel?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -164,8 +168,8 @@ msgstr "Teljes keretes halszem" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Négyzetes hengerv. /equirect./" @@ -196,11 +200,13 @@ msgid "builtin" msgstr "beépített" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "egyedi (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineáris" @@ -224,16 +230,16 @@ msgid "Error loading lens parameters" msgstr "Nem tölthetők be az objektív paraméterei" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Objektív paramétereinek mentése" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Objektív projektfájlok (*.ini)|*.ini|Minden fájl (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Projekt mentése" @@ -269,22 +275,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Hiba a folyamat szüneteltetésekor %ld, kód 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Mégse" @@ -318,12 +325,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Nem nyitaható meg a projektfájl:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "a szkript nem nyitható meg: %s" @@ -333,8 +340,8 @@ msgid "Project %s does not contain any active images." msgstr "A %s projekt nem tartalmaz aktív képeket." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "hiba panotools szkript szintaktikai elemzése közben: %s" @@ -349,17 +356,17 @@ msgid "Could not create temporary file" msgstr "Nem hozható létre átmeneti fájl" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "A feldolgozási sor üres. Ez nem lehetséges." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Hiba fűzés közben" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -367,11 +374,11 @@ "Felülírja a létező képeket?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "A létező képek felülírása" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -380,12 +387,12 @@ "Hiba az összefűzés projekt közben\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Hiba a futtatási segéd közben" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -394,272 +401,282 @@ "Hiba a futtatási segéd használatakor\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Panoráma összefűzése..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Felület:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Verzió:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Munkakönyvtár:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Kimeneti előtag:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Összemosó:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Ismeretlen összemosó (enblend --version hibázott)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "belső" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Expozíció fúzió:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Ismeretlen expozíció fúzió (enfuse --version hibázott)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "ExifTool verzió:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "HIBÁZOTT" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Aktív képek száma:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Kimeneti expozíciós érték: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Rajzvászon mérete: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Vetület:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "GPU használata az áttranszformáláshoz:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "igaz" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "hamis" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panoráma Kimenetek:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Expozíció korrekcióval, kis dinamika tartomány" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Expozíció fúzió kötegekből" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Expozíció fúzió bármely elrendezésből" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Nagy dinamika tartomány" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Áttranszformált képek:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Nincs expozíció korrekció, kis dinamika tartomány" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Kombinált kötegek:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Expozíció fuzionált kötegek" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Rétegek:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Összemosott rétegek hasonló expozícióval, expozíció korrekció nélkül" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Első bemeneti kép" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Szám:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Fájlnév:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Méret: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Válasz típus:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Expozíció érték: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "LDR képek áttranszformálása és összemosása..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "LDR képek áttranszformálása..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Képek összemosása..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "LDR képek áttranszformálása és expozíciós rétegek összemosása..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "LDR képek áttranszformálása expozíció korrekció nélkül..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "%u expozíciós réteg összemosása..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Minden expozíciós réteg fuzionálása..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "%u számú köteg fuzionálása..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Minden köteg összemosása..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "HDR képek áttranszformálása..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "%u számú hdr köteg egyesítése..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Hdr kötegek összemosása..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Metaadatok frissítése..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Összefűzés \"%s\" felhasználásával" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "első kép" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "utolsó kép" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "könyvtár" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Kamera gyártó" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Kamera modell" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -667,65 +684,83 @@ msgid "Lens" msgstr "Objektív" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "ismeretlen vetület" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Minden Kép fájl" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "JPEG fájlok (*.jpg,*.jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "TIFF fájlok (*.tif,*.tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "PNG fájlok (*.png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "HDR fájlok (*.hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "EXR fájlok (*.exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "Minden fájl (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "Raw fájlok" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Hiba" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" "Hugin can not work with these filenames. Please rename your file(s) and try " "again." msgstr "" -"A fájlnév vagy a fájlnevek tartalmazzák az alábbi érvénytelen karaktereket: " -"%s\n" +"A fájlnév vagy a fájlnevek tartalmazzák az alábbi érvénytelen karaktereket: %" +"s\n" "Hugin nem működik helyesen ezekkel a fájlnevekkel. Kérjük, nevezze át a " "fájlait, és próbálja újra." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Nyomkövetési jelentés készült a \"%s\"-ban." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Minden kép fájl|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG fájlok (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF fájlok (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG fájlok (*.png)|*.png;*.PNG|HDR fájlok (*." -"hdr)|*.hdr;*.HDR|EXR fájlok (*.exr)|*.exr;*.EXR|Minden fájl (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -737,27 +772,27 @@ msgstr "A \"%s\" bemenet nem egy érvényes szám." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Figyelmeztetés" @@ -774,7 +809,7 @@ msgid "Could not save information into database." msgstr "Nem sikerült menteni az információt az adatbázisba." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -785,11 +820,11 @@ "%s\n" "Megszakítás" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Nem támogatott kép fájl formátum" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -801,7 +836,7 @@ "A Hugin nem támogatja ezt a képtípust. A kép átugrása.\n" "Konvertálja a képet szürkeárnyalatos képpé és próbálja újra betölteni." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -819,14 +854,14 @@ "Konvertálja ezt a képet szürkeárnyalatos vagy RGB képpé és próbálja " "betölteni újra." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "A Hugin csak szürkeárnyalatos vagy RGB képeket támogat (alfa-csatornával " "vagy anélkül)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -835,7 +870,7 @@ "A \"%s\" fájl egy szürkeárnyalatos kép, de a többi kép a projektben színes " "kép." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -844,7 +879,7 @@ "A \"%s\" fájl egy színes kép, de a többi kép a projektben szürkeárnyalatos " "kép." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -854,7 +889,7 @@ "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 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -863,7 +898,7 @@ "A \"%s\" fájlnak nincs beágyazott ICC profilja, de a többi képnek a " "projektben \"%s\" beágyazott profilja van." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -872,7 +907,7 @@ "A \"%s\" fájlnak \"%s\" beágyazott ICC profilja van, de a többi képnek a " "projektben nincs beágyazott szín profilja." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -881,7 +916,7 @@ "A \"%s\" fájlnak \"%s\" beágyazott ICC profilja van, de a többi képnek a " "projektben \"%s\" beágyazott szín profilja van." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -890,7 +925,7 @@ "Kérjük konvertálja az összes képet ugyanolyan szín profilúvá, és próbálja " "újra." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -898,7 +933,7 @@ "A Hugin képkötegeket érzékelt a hozzáadott képek között és hozzárendeli a " "megfelelő kötegszámot a képekhez." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -908,11 +943,11 @@ "alapján újra hozzá lesznek rendelve. A meglévő köteg hozzárendelések felül " "lesznek írva." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Összeláncolja az minden egyes kötegekben a képek pozícióját?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -925,25 +960,25 @@ "finomhangolni szükséges (pl. ha a felvétel kézi), akkor ne láncolja össze a " "pozíciót." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Pozíciók összeláncolása" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Ne láncolja össze a pozíciókat" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Ne rendeljen hozzá kötegeket" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Meglévő kötegek megtartása" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -952,16 +987,16 @@ "A \"%s\" projektfájl a \"%s\" képre utal, amelyet nem találtunk.\n" "Kérem manuálisan válassza ki a helyes képet." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Nem található képfájl" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Jelölje ki a %s képet" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -972,16 +1007,17 @@ "\n" "Nyomd meg az OK gombot eltávolításhoz." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Hibát Észlelt" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Képek hozzáadása" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -990,32 +1026,32 @@ "Hiba, a sablon %d képet vár,\n" "az aktuális projekt %d képet tartalmaz\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Nem alkalmazható sablon" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Hiba projekt megnyitása közben" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Eredmény" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc könyvtár nincs a csomagban" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Súlyos Hiba" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1049,7 +1085,7 @@ "képeknek.\n" "Kérjük, ellenőrizze újra a képet, ha a megfelelő képeket választotta ki." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Kép hozzáadása: mégse" @@ -1062,9 +1098,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1081,7 +1117,7 @@ msgstr "Vonalak keresése..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Befejezett" @@ -1095,11 +1131,11 @@ "Futtassa le \"Vonalak keresése\"-t előtte. Ha nem talált vonalakat, " "változtassa meg a paramétereket." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Objektív torzítás paraméterek optimalizálása ..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1110,143 +1146,143 @@ "paramétereinek mentése előtte. Ha nem talált vonalakat, változtassa meg a " "paramétereket." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Objektív paraméterek mentése ini fájlba" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Objektív paraméterek mentése objektív adatbázisba" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Objektív adat mentés" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Objektívek mentése" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Projektfájl mentése" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Projektfájlok (*.pto)|*.pto|Minden fájl (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Ideiglenes fájlok eltávolítása..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "ennek a segítség üzenetnek a mutatása" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "futtatási segéd" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "összefűzés futtatása az adott projekt használatával" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "felhasznált szálak száma" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "az összefűzéshez használt előtag" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "felhasználó által megadott parancsok használata a megadott fájlból" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" "felhasználó által megadott segéd parancsok használata a megadott fájlból" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "csak a nyomtatási parancsokat" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Operációs Rendszer: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architektúra: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Szabad memória: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktív kódlap: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Verzió: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Útvonal az erőforrásokhoz: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Útvonal az adatokhoz: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Hugin kamera és objektív adatbázis: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Többszálú feldolgozás C++11 std::thread és OpenMP használatával" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Monitor profil: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Könyvtárak" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Az Autopano a http://autopano.kolor.com -ról nem érhető el OSX-re" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Használja az Autopano-Sift-et helyette" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1254,64 +1290,65 @@ "Legalább egy beviteli mező üres.\n" "Ellenőrizze a beviteleket." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Megpróbálja csatlakoztatni az összes átfedő képeket." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Csak kontroll pont nélküli képpárokon használható." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Kontroll pont kereső program kiválasztása" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Végrehajtható (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "bal x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "bal y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "jobb x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "jobb y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Illesztés" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Távolság" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "új kontroll pont hozzáadva" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "hasonló pontok keresése..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Hiba finomhangolás közben" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1320,19 +1357,25 @@ "Pontok finomhangolva, szög: %.0f fok, korrelációs együttható: %0.3f, " "görbület: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "pontok cseréje, vagy jobb egér gomb kattintással hozzáad egy párt" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "A becsült pont képen kívül" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" +"A vonal kontroll pontok közötti távolság túl rövid, kihagyja a " +"finomhangolást." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Nem található hasonló pont." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1340,7 +1383,7 @@ "Egy belső átalakítás során hiba történt.\n" "Ellenőrizze, hogy a pont a képen belül található." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1350,31 +1393,36 @@ "Ellenőrizze a hasonlóságot vizuálisan.\n" "Korrelációs tényező (%.3f) kisebb a beállításoknál megadott küszöbszintnél." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Új vonal hozzáadása" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Vonal %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Korreláció" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normál" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "függ. vonal" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "vízsz. vonal" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1384,73 +1432,73 @@ "Kevesebb ponthoz,\n" "nagyobb számot kell írni." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Sarok érzékelés szint (corner detection treshold)" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Kontrollpontok létrehozása" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Sarok keresés skála (Corner Detection scale)" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Hiba a kontroll pont készítése közben:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Pont kijelölése a jobb képen" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Pont kijelölése a bal képen" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Kp létrehozása (Aktuális beállítás: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "" "Nem futtatható a celeste, legalább egy kontroll pont pár kell két kép között" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste futtatása" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Modell fájl betöltése" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Eltávolított %lu kontroll pontot" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste eredménye" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Tisztítás" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Kp létrehozása" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1458,19 +1506,20 @@ "Hozzon létre kontroll pontokat a képpárhoz a képek fülön kiválasztott " "kontroll pont keresővel." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Megkísérli eltávolítani a kontroll pontokat a felhőkről" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Kp tisztítása" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Eltávolítja a kilógó kontroll pontokat statisztikai módszerrel" @@ -1482,23 +1531,23 @@ msgid "Could not process event!" msgstr "Nem feldolgozható eset!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "bal kép" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "jobb kép" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1506,7 +1555,7 @@ "Adjon meg minimális kontroll pont hibát.\n" "Minden magasabb hibájú pont ki lesz jelölve" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Kontroll pontok kijelölése" @@ -1582,60 +1631,60 @@ "Húzza a képeket (opció használja a shift-et kényszerítéshez), vagy döntéshez " "(roll) jobb-húzás vagy ctrl-húzás." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Gyors Panoráma előnézet" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fájl" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "megjelenített képek" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Mindegyik" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Egyik sem" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Elrejt" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "húzza a függőleges látóhatár módosításához" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "húzza a vízszintes látóhatár módosításához" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Előnézet" @@ -1643,83 +1692,88 @@ msgid "Overview" msgstr "Áttekintés" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Visszaállítja a vetületek paramétereit az alapértelmezett értékekre." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Nincs betöltött kép." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu kép betöltve." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "A képek összekapcsolva %lu kontroll ponttal.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%lu nem csatlakoztatott kép csoportot találtam: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "A képek vagy a kontroll pontok megváltoztak, új igazítás szükséges." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Átlagos hiba az optimalizálás után: %.1f képpont, max: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Egyenes vonalú /rectl./" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Hengeres /cylindr./" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Forgatás (Yaw) értékének számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Bólintás (Pitch) értékének számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Dőlés (Roll) értékének számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "Az X értékének számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Az Y értékének számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "A Z értékének számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Az értéknek számnak kell lennie." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "A tartomány tömörítés értéke az érvényes tartományon kívülre esik." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1731,55 +1785,55 @@ "De a projekt nem nulla Tpy és Tpp paramétereket tartalmaz.\n" "A Tpy és Tpp paramétereket visszaállítja nullára?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "különbség" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Automatikus képkivágás" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Optimális körbevágás kiszámítása" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "A felső határnak egy 0 nagyobb egész számnak kell lennie" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "a bal oldalnak egy 0 nagyobb egész számnak kell lennie" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "a jobb oldalnak egy 0 nagyobb egész számnak kell lennie" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "az alsó határnak egy 0 nagyobb egész számnak kell lennie" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "a bal határvonalnak kisebbnek kell lennie, mint a jobbnak" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "a felső határvonalnak kisebbnek kell lennie, mint az alsónak" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Érvénytelen HFOV érték. Maximum HFOV ehhez a projekcióhoz %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Érvénytelen VFOV érték. Maximum VFOV ehhez a projekcióhoz %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1787,7 +1841,7 @@ "Széles látómezőnél, panorámaképek egyenes vonalú (rectilinear) projekcióval " "nagyon megnyúlnak a szélek felé.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1795,17 +1849,17 @@ "Mivel a látómező csak vízszintes irányban nagyon széles, próbáljon ki egy " "hengeres (cylindrical) projekciót helyette." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Nagyon széles panorámához, próbáljon ki a négyzetes hengervetületet " "(equirectangular) helyette." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " Kipróbálhatja a Panini projekciót is." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1817,7 +1871,7 @@ "A négyzetes hengervetülettel (equirectangular) ugyanaz a tartalom kevesebb " "függőleges helyet használna." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1828,7 +1882,7 @@ "Hengeres projekció (cylindrical) megőrzi függőleges vonalakat, ellentétben a " "négyzetes hengervetülettel (equirectangular)." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1840,7 +1894,7 @@ "A szögtartó projekció megőrzi szögeket egy pont körül, amit gyakran könnyebb " "nézni szemmel." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1852,7 +1906,7 @@ "A halszem (Fisheye) panoráma projekció betömöríti ezt, így elfér a széles " "látószög és még elfogadható a kiterjedése a közepén." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1860,7 +1914,7 @@ "Egyenes vonalú (rectilinear) projekciójú panoráma megtartja az egyenes " "vonalakat egyenesen." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1870,27 +1924,27 @@ "esetén.\n" "Ha szeretné látni a sávot újra, aktiválja a sávot a beállításoknál újra." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normál, egyéni" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mozaik" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mozaik, egyéni" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panoráma gömb" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mozaik sík" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1901,12 +1955,12 @@ "\n" "A panoráma legyen újra optimalizálva?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "\"%s\" a jelenlegi optimalizálási stratégia." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1914,7 +1968,7 @@ "A kijelölt területben nincs aktív kép.\n" "Jelöljön ki olyan területet, amelyet legalább 2 kép fed le." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1922,7 +1976,7 @@ "A kijelölt terület egyetlen képben van.\n" "Nem lehet kontroll pontot létrehozni egyetlen képhez." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1936,27 +1990,27 @@ "\n" "Folytatja ennek ellenére?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Kontroll pontok keresése" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Feldolgozás" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Képek áttranszformálása a panoráma vetületéhez..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Hasonló pontok keresése..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Eredmények ellenőrzése..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1967,7 +2021,7 @@ "\n" "A panoráma legyen újra optimalizálva?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1975,7 +2029,7 @@ "GLEW inicializálása hibás\n" "Gyors előnézeti ablak nem nyitható meg." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2022,7 +2076,7 @@ msgstr "Maszkok száma" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Vágás" @@ -2056,7 +2110,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "A maximális Ev különbségnek 0-nál nagyobbnak kell lennie." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Kötegek" @@ -2233,7 +2287,7 @@ msgid "Shutter speed" msgstr "Zársebesség" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2380,93 +2434,93 @@ msgid "Camera response parameter" msgstr "Kamera válasz paraméter" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "nem aktív" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "aktív" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Objektív %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Kötegek %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Kimeneti köteg %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Expozíciós réteg kimenet %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Összeláncol" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Szétláncol" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Mindent kijelöl a jelenlegi objektívhez" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Minden kijelöletlen a jelenlegi objektívhez" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Mindent kijelöl jelenlegi köteghez" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Minden kijelöletlen a jelenlegi köteghez" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Mindent kijelöl" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Összes kijelöletlen" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Kép változók szerkesztése..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Kép kikapcsolása" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Kép aktiválása" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Képek aktiválása" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Képek kikapcsolása" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Kontroll pontok" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2499,12 +2553,26 @@ msgid "Did you know..." msgstr "Tudja, hogy..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" +"Csak egy raw fájlt választott ki. Ez nem ajánlott.\n" +"Minden raw fájlt egyszerre kell konvertálni." + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "Konvertáljon mindenképp." + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Verzió %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2512,70 +2580,70 @@ "Súlyos üzembehelyezési hiba\n" "A data/splash.png fájl nem található itt:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Súgó" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Műveletek" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "&Kimenet" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Felhasználó által meghatározott sorrend: %s" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Felhasználó által meghatározott kimeneti sorrendek" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "S&zerkesztés" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "Felhasználó által meghatározott segéd: %s" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "Felhasználó által meghatározott segéd" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Kezdés" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimalizáló" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Expozíció" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "Mentse a változásokat a projekt fájlba mielőtt másik projektet nyitna?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "Mentse a változásokat a projekt fájlba az új projekt megkezdése előtt?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "Mentse a változásokat a projekt fájlba bezárás előtt?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2583,7 +2651,7 @@ "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:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2591,7 +2659,7 @@ "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:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2599,40 +2667,40 @@ "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:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Ne Mentse" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Bezárás mentés nélkül" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "erőltetett bezárás" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "mentett projekt %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Panorama Összefűző" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Panoráma szerkesztő" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2645,35 +2713,35 @@ "\n" "(Hibakód: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "PTmender szkriptfájl mentése" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender fájlok (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Projekt megnyitása: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekt megnyitva" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "A betöltés törölve" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Hiba projekt megnyitása közben: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Projektfájl megnyitása" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2684,11 +2752,11 @@ "Ezt a fájlt nem lehet megnyitni a Fájl, Megnyitás-al.\n" "Szeretné ezt a képfájlt az aktuális projekthez adni?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Projekt megnyitása: mégse" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2699,7 +2767,7 @@ "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:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2711,32 +2779,32 @@ "található.\n" "Ez a fájl törölve lesz a projektbõl." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Nem lehet olvasni a projekt fájlt %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Papywizard xml fájl megnyitása" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Papywizard xml fájlok (*.xml)|*.xml|Minden fájl (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Sablon projekt kiválasztás" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Minden pont finomhangolása" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Finomhangolás" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2766,23 +2834,23 @@ "Használja Kontroll Pont listát (F3) hogy megnézze az összes pontot a " "jelenlegi projektben\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Finomhangolás eredménye" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Kontroll pontok eltávolítása a maszkról" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Python szkript kiválasztása" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python szkript (*.py)|*.py|Minden fájl (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2791,13 +2859,13 @@ "Fájl \"%s\" nem található.\n" "Talán átnevezték, áthelyezték vagy törölték a fájlt." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Hiba!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2805,12 +2873,12 @@ "Celeste modell fájl a várt helyen %s nem található, Hugin-nak szükséges a " "helyes telepítése." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Nem lehet betölteni a Celeste modell fájlt %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2820,7 +2888,7 @@ "és/vagy peremsötétedés közép eltolást használ.\n" "Ezek a funkciók nem támogatottak az egyszerű felhasználói felületen." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2830,7 +2898,7 @@ "és/vagy nyírás paramétereket használ.\n" "Ezek a paraméterek nem támogatottak az egyszerű felhasználói felületen." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2840,7 +2908,7 @@ "vagy nyírás paramétereket használ.\n" "Ezek a paraméterek nem támogatottak a haladó felhasználói felületen." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." @@ -2848,11 +2916,11 @@ "Az segéd sor üres. Ez hibára utal a felhasználó által definiált segéd " "fájlban." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Futtatási segéd" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2860,12 +2928,12 @@ "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:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Figyelmeztetés %d nem összekapcsolt képcsoportot találtam:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2877,7 +2945,7 @@ "\n" "A pontok hozzáadása után, ismét nyomja meg az \"Igazítás\" gombot" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2885,23 +2953,23 @@ "A segéd nem fejeződött be sikeresen. Kérjük, ellenőrizze a létrejövő projekt " "fájlt." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Projekt fájl nem található" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Nem lehet elindítani a PTBatcherGui-t" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Nem megfelelő programot indított" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Maszk típusa" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2909,29 +2977,29 @@ "Hozzon létre egy sokszög maszkot kattintva a bal egérgombbal a képre, az " "utolsó pontot pedig jobb egérgombbal." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Maszk mentése" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Maszk fájlok (*.msk)|*.msk|Minden fájl (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Maszk betöltése" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Maszk betöltése: mégse" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Nem lehet feldolgozni a maszkot %s fájlból." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Adjon meg egy érvényes számot" @@ -3077,7 +3145,7 @@ msgstr "Fotometrikus igazítás" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Képek betöltése" @@ -3120,63 +3188,67 @@ msgid "Photometric optimization finished" msgstr "Fotometrikus optimalizálás véget ért" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Egyéni képek hozzáadása..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "Válasszon ki több raw fájlt." + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Idő-sorozatfotók hozzáadása..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Nem találhatóak összeillő képek." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Képváltozók manipulálása..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "A kiválasztott kép(ek) eltávolítása" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ezen kép pozíciójának rögzítése" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ezen kép expozíciójának rögzítése" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Új Objektív" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Objektív módosítása..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Új objektívszám megadása" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Objektívszám" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Objektívszám módosítása" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Objektív betöltése objektív adatbázisból" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Objektív betöltése ini fájlból" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3184,12 +3256,12 @@ "Csak egy képet választott ki.\n" "A betöltött paramétereket alkalmazza az összes képre azonos objektívvel?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Kérdés" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3199,100 +3271,100 @@ "Objektív paraméter fájl alkalmazása nem kívánt eredményeket okozhat.\n" "Alkalmazza a beállítások mindenképpen?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Objektív mentése ini fájlba" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Kontroll pontok eltávolítása" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "A kiválasztott képeknek nincsenek kontroll pontjai." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Tényleg törli %lu kontroll pontokat?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Kontroll pontok törlése" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Kontroll pontok tisztítása" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Kontroll pontok tisztítása" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Ellenőrzés páronként" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "A teljes projekt ellenőrzése" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Tisztítás befejeződött" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Kontroll pontok eltávolítása felhőkről" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "A felhasználó által meghatározott visszaállítás..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Pozíciók alaphelyzetbe" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Fordítási paraméterek visszaállítása" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Objektív paraméterek alaphelyzetbe" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Fotometrikus paraméterek alaphelyzetbe" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Új köteg" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Köteg módosítása..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Írja be az új köteg számot" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "köteg szám" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Köteg szám módosítása" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Köteg méret beállítása..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Minőség:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3362,47 +3434,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff területtartó /Hammer-Aitoff Equal Area/" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "a szélességnek egy 0 nagyobb egész számnak kell lennie" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "a magasságnak egy 0 nagyobb egész számnak kell lennie" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "A bal határvonalnak kisebbnek kell lennie, mint a jobbnak." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "A felső határvonalnak kisebbnek kell lennie, mint az alsónak." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " PTmender beállítások még nincsenek üzembe helyezve" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " PTblender beállítások még nincsenek üzembe helyezve" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " Beállítások ehhez a HDRMerge programhoz még nincsenek üzembe helyezve" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Nem sikerült létrehozni az ideiglenes projekt fájlt" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Kimeneti előtag megadása" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3411,15 +3483,15 @@ "Nincs jogosultsága, hogy a \"%s\" könyvtárba írjon.\n" "Jelöljön ki másik könyvtárat a végleges kimenethez." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "A felhasználó által megadott kimenet kiválasztása" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "A felhasználó által megadott kimenet| * .végrehajtó" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3434,7 +3506,7 @@ "Csökkentse a rajzvászon méretét az összefűzés panelon vagy válassza a TIFF " "vagy PNG kimeneti formátumot." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3447,7 +3519,7 @@ "méretét és fűzze össze az Összefűző fülön. Ilyen nagy méretű panoráma " "összefűzése sok időt vesz igénybe, és nagy mennyiségű memóriát használ." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3461,19 +3533,19 @@ "Amennyiben ez túl nagy, csökkentse a panoráma Rajzvászon Méretét vagy a " "kivágott területet." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Biztos benne, hogy össze szeretne fűzni egy ilyen nagy panorámát?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Összefűzés mindenképpen" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Hadd javítsam ezt" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3483,7 +3555,7 @@ "Kérjük, ellenőrizze a beállításokat, hogy legalább egy kép legyen a kimeneti " "területen." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3520,121 +3592,136 @@ msgid "Miscellaneous" msgstr "Vegyes" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Rendszer alapértelmezése" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baszk" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Katalán" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Kínai (Egyszerűsített)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Kínai (Hagyományos)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Cseh" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Dán" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holland" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Angol" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francia" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Német" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Magyar" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Olasz" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japán" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Lengyel" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugál (Brazil)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Orosz" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Szlovák" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spanyol" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Svéd" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finn" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valenciai (dél katalán)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Enblend kiválasztása" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Végrehajtható fájlok (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Enfuse kiválasztása" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "dcraw kiválasztása" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "RawTherapee-cli kiválasztása" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Darktable-cli kiválasztása" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "ExifTool arg. fájl kiválasztása" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool Arg. fájlok (*.arg)|*.arg|Minden Fájl(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3643,14 +3730,14 @@ "%s fájl nem létezik.\n" "Hozzon létre arg. fájlt az alapértelmezett címkékből?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool arg. fájl" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3658,18 +3745,18 @@ "Nincs fájl kiválasztva.\n" "Hozzon létre arg. fájlt az alapértelmezett címkékből?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Új ExifTool arg. fájl kiválasztása" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Nem lehet menteni a fájlt \"%s\"." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3678,7 +3765,7 @@ "%s fájl nem létezik.\n" "Hozzon létre egy minta arg fájlt?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3686,25 +3773,26 @@ "Nincs fájl kiválasztva.\n" "Hozzon létre egy minta arg fájlt?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "Tényleg visszaállítja a megjelenített beállításokat az alapértelmezett " "értékekre?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Alapértelmezés betöltése" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Kérjük, válasszon egy bejegyzést először" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Bejegyzés kiválasztása" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3712,30 +3800,30 @@ "Nem törölheti az utolsó beállítást.\n" "Legalább egy beállítás szükséges." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Valóban el akarja távolítani a kontroll pont kereső beállítását \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Kontroll pont kereső beállításainak törlése" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Kontroll pont kereső beállításainak betöltése" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Kontroll pont kereső beállítások (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Kontroll pont kereső beállításainak mentése" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3763,50 +3851,54 @@ msgid "Remove %lu control points" msgstr "%lu kontroll pontok eltávolítása" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panoráma előnézet" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Előnézet Beállításai" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "vetület (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Összemosó mód:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Kimenet:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Tartomány tömörítés::" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Projekció Paraméterek" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Bal kattintás új középpont kijelölése, jobb kattintás a pont mozgatása a " "horizonthoz." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "Panoráma középre igazítás bal egér gomb, horizont beállítás jobb gomb" @@ -3824,7 +3916,7 @@ msgid "Click a connection to edit control points." msgstr "Kattintson az összeköttetésen a kontroll pontok szerkesztéséhez." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3835,29 +3927,126 @@ "Hiba: %s\n" "Az egyik lehetséges ok egy érvénytelen vagy hiányzó képfájl lehet." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"A \"%s\" program nem található.\n" +"Adjon meg egy érvényes program fájlt a beállításoknál." + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"A \"%s\" program a PATH-ban nem található.\n" +"Adjon meg egy érvényes program fájlt a beállításoknál." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Végrehajtás: %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "EXIF-adatok frissítése %s részére" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Feldolgozási profil \"%s\" nem található.\n" +"Adjon meg egy érvényes fájlt vagy hagyja üresen a mezőt az alapértelmezett " +"beállításokhoz." + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Raw Képek Importálása" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Nem sikerült feldolgozni a referenciakép kimenetét.\n" +"Nem dolgozhat fel további képeket." + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Bezárás" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Figyelmeztetés: Olvasási hiba" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Az alábbi fájlok kihagyásra kerülnek, mert a fájlok metaadatai nem " +"olvashatók." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Figyelmeztetés: raw képek különböző fényképezőgépekből" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"A következő képeket más fényképezőgéppel készítették, mint a másik képet\n" +"A raw importálás csak ugyanabból a kamerából származó képekre használható." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" +"Legalább egy raw képet nem sikerült konvertálni.\n" +"Ez(ek) a kép(ek) ki lesz(nek) hagyva" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Válassza ki az alapértelmezett RT feldolgozási profilt" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "RT feldolgozási profil|* .pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "'%s' könyvtár nem létezik" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Nem sikerült beállítani a PYTHONHOME környezeti változót" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Kötegelt feldolgozó megnyitása" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Megnyitja a PTBatcher-t, kötegelt feldolgozó Hugin projekt fájlokhoz" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Objektív kalibrációs eszköz megnyitása" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Megnyitja a Calibrate_lens_gui-t, egy egyszerű GUI az objektív " @@ -3874,11 +4063,11 @@ "Talán nem telepítette azt megfelelően, vagy hibás útvonalat adott meg " "beállításoknál." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "az ideiglenes kulcspont fájlok tisztítása" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3887,15 +4076,15 @@ "Kérem használja a %namefile, %i vagy a %s -t a bementi fájlok megadásához az " "kontroll pont keresőhöz" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Hiba a kontroll pont kereső parancsban" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3907,14 +4096,14 @@ "Válasszon ki kevesebb képet, vagy helyezze a képeket a könyvtárból\n" "egy rövidebb útvonalra" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Túl sok kép kijelölve" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3925,38 +4114,38 @@ "\n" " Nem sikerült végrehajtani a parancsot: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute Hiba" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "kontroll pontok keresése" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Nem sikerült végrehajtani a parancsot: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3965,9 +4154,9 @@ "Parancs: %s\n" "hibázott ezzel a hibakóddal: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3982,13 +4171,13 @@ "\n" "Végrehajtott parancs: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Kontroll pont kereső hiba" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3996,7 +4185,7 @@ "Kérem használja %i a bementi fájlok megadásához és a %k a kulcspont fájlhoz " "a kulcsok létrehozása lépéshez" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4004,11 +4193,11 @@ "Kérjük, használja a %k paramétert a kulcspont fájlokhoz és %o paramétert a " "kimenti projekt fájlhoz az összehasonlító lépéshez" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "kulcs fájl létrehozása" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4021,11 +4210,11 @@ "\n" " Nem sikerült végrehajtani a parancsot: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Alapértelmezett" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4033,255 +4222,255 @@ "Folyamatban lévő kötegelt feldolgozás nem törölhető.\n" "Visszavonja a folyamatban lévő projektet?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Törölt kötegelt feldolgozás." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Hiba: Nem tudom lekérdezni az állapotot, projekt %d indexszáma nincs a " "listában." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Hiba: nem tölthető be a kötegelt fájl." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "A kötegelt feldolgozás sikeresen végetért." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "A kötegelt feldolgozás végetért, hibával." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Leállítás megkezdése..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Leállítás megkezdése..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Felkészülés a hibernálásra..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Hibernálás indítása..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Felkészülés a készenlétre..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Készenléti állapot indítása..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Adja meg a projektfájlt" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Nincs kimeneti előtag megadva" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Nincs projektfájl megadva" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Összefűzés" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Segéd" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "" "Hiba az eltávolítás közben, projekt azonosító (id) %d nincs a listában." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Hiba: Nem törölhető a projekt fájl " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Kötegelt feldolgozás futtatása..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "A PTBatcherGUI összefűz" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Kötegelt feldolgozás már folyamatban." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Parancs futtatása \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Összefűzés alatt: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Felismerés alatt: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Hiba: Nem tudom beállítani az állapotát, projekt indexszáma %d nincs a " "listában." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Nincs teendő..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Megnyomta a Cmd billentyűt." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Megnyomta a CTRL billentyűt." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Kihagyja a kötegelt feldolgozási sor betöltését?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Ne csináljon semmit" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI bezárása" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Számítógép leállítása" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Számítógép készenlétbe" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Számítógép hibernálása" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Kérem adja meg a parancssoros alkalmazást végrehajtásra:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Alkalmazás megadása" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Könyvtár megadása projektek kereséséhez" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Projekt forrás fájl(ok) megadása" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "A könyvtárból hozzáadott projektek %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "%s projekt hozzáadása az összefűzési feldolgozási listáshoz." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "%s projekt hozzáadása a segéd várakozási sorhoz." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Kötegelt feldolgozás megállt" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugin Kötegelt feldolgozó" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Kimeneti előtag megadása a projekthez " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Az segéd cél előtagját nem lehet megváltoztatni." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Válasszon ki egy projektet" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Csak egy projektet jelöljön ki" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Kötegelt fájl megadása megnyitásra" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Kötegelt fájlok (*.ptb)|*.ptb;|Minden fájl (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Nem lehet megnyitni a projektet Hugin-nal." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Nincs projekt kiválasztva. Megnyitja a Hugin-t projekt nélkül?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Kötegelt feldolgozás megállt" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Feldolgozás szüneteltetése a Hugin kötegelt feldolgozási sorban" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Kötegelt feldolgozás folytatása..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Hugin kötegelt feldolgozási sor feldolgozása" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4289,7 +4478,7 @@ "Vannak hibázott projektek a listán.\n" "Eltávolítsam azokat is?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4297,16 +4486,16 @@ "Nem távolítható el folyamatban lévő projekt.\n" "Visszavonja a folyamatban lévő projektet?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Eltávolított projekt %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Kérem válasszon projektet eltávolításhoz" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4314,16 +4503,16 @@ "Folyamatban lévő projekt nem hozható alaphelyetbe.\n" "Visszavonja a folyamatban lévő projektet?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "%s projekt visszaállítása" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Kérem válasszon projektet alaphelyzetbe állításhoz" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4331,15 +4520,15 @@ "Folyamatban lévő projektek nem hozhatók alaphelyetbe.\n" "Visszavonja a folyamatban lévő kötegelt feldolgozást?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Kötegelt fájl megadása mentésre" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Kötegelt fájl (*.ptb)|*.ptb;|Minden fájl (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4349,15 +4538,15 @@ "Ez negatív hatással lehet a teljesítményre.\n" "Törli a kötegelt feldolgozási sort most?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Törli a kötegelt feldolgozási sort most" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Kötegelt feldolgozási sor megtartása" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Kötegelt feldolgozás megkezdése" @@ -4393,7 +4582,7 @@ msgid "E&xit" msgstr "&Kilépés" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4403,11 +4592,11 @@ "Ha bezárja a párbeszédablak, akkor elveszti őket.\n" "Folytatja mindenképpen?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Elfogadott" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4417,11 +4606,11 @@ "Ha folytatja, akkor figyelmen kívül lesznek hagyva.\n" "Mégis folytatni akarja?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Leállítás" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4430,7 +4619,7 @@ "%s könyvtár nem létezik.\n" "Kérjük, adjon meg egy létező könyvtárat." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4438,7 +4627,7 @@ "Az ön által kiválasztott nem lehetséges panoráma.\n" "Kérjük, válasszon legalább egy panorámát, és próbálkozzon újra." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4448,139 +4637,141 @@ "Lehet, hogy nincs írási jogosultsága ezekre könyvtárakra vagy a merevlemez " "megtelt." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Kép eltávolítása a projektből" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Itt válassza szét két panorámává" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Fájl olvasása %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Kezdés" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "%d lehetséges panorámát talált." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Nem talált lehetséges panorámát." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d képek: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S perc" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S mp" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Szintaktikai hiba található a paraméterekben, művelet megszakítása." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI elindult" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Várakozó" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Feldolgozás folyamatban" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Befejezett" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Hibázott" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Hiányzó fájl" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Megállt" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "Azonosító (ID)" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Kimeneti előtag" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Állapot" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Utoljára módosítva" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Kimeneti formátum" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Vetület" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Méret" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Hiba, nem konvertálható azonosító /id/" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Segéd" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Előtag módosítása" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Projektet alaphelyzetbe" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Szerkesztés Hugin-nal" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Eltávolít" @@ -4617,16 +4808,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Naplófájlok (*.log)|*.log|Minden fájl (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Nem található a felhasználó által megadott kimeneti fájl \"%s\"." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Projektforrás projektfájl megadása" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4637,7 +4828,7 @@ "fájlnevet." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Hugin névjegye" @@ -4670,19 +4861,19 @@ msgstr "Rendszer" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4762,8 +4953,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Választás..." @@ -4855,7 +5049,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Beállítások" @@ -4887,10 +5081,6 @@ msgid "Send selected panoramas to queue" msgstr "A kiválasztott panorámákat elküldi a várakozási sorba" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Bezárás" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Panorámák keresése" @@ -4985,12 +5175,12 @@ msgstr "Minimalizálás a tál&cára" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Kilépés" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Kilépés a programból" @@ -5094,6 +5284,115 @@ msgid "adddir" msgstr "könyvtárhozzáadása" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Leírás:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Típus:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Az összes kép egyszerre" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panoráma kötegekkel" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Többsoros panoráma" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Többsoros panoráma kötegekkel" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Előzetesen igazított panoráma" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Kereső" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Egy lépéses kereső" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Program:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Paraméterek:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Tisztítási paraméterek:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Két lépéses kereső" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Jellegzetesség leíró:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Jellegzetesség összehasonlító:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Kereső kötegekhez" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Hagyja üresen, ha nincs kontroll pont kereső ami futthatna a kötegeken." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Speciális beállítás" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Ennek a beállitásnak nincsenek további speciális opciói." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Az alábbi paraméterek helyettesítődni fognak futtatás előtt:\n" +"%o -- kimenti projekt (0.oto hozzá fog fűződni amikor az Autopano-t " +"használja)\n" +"%p -- kontroll pontok száma minden egyes pár között\n" +"%v -- az első kép HFOV-a /vízszintes látóhatár/\n" +"%f -- az első kép vetülete (0-4, mint a panotools-ban)\n" +"%i -- kép fájlok\n" +"%namefile -- fájl, ami tartalmazza a kép fájlok fájlneveit\n" +"%s -- bemeneti panotools szkript\n" +"%k -- közbenső kulcs fájl(ok)" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Kontroll Pont Keresők paraméterei" + #: hugin1/hugin/xrc/cp_editor_panel.xrc:32 msgid "previous image pair" msgstr "előző képpár" @@ -5125,7 +5424,7 @@ msgstr "ablakhoz igazítás" #: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 msgid "Fine-tune" msgstr "Finomhangolás" @@ -5188,7 +5487,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Törlés" @@ -5196,155 +5495,189 @@ msgid "Select by Distance" msgstr "Kijelölés távolság alapján" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Leírás:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Figyelmeztetés: Érvénytelen fájlnevek" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Típus:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"A következő fájlok már léteznek.\n" +"A RAW importálás futtatásakor ezek felül fognak íródni.\n" +"Szeretné felülírni ezeket a fájlokat?" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (A. Jenny által)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Igen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Az összes kép egyszerre" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Nem" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panoráma kötegekkel" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Panorama Tools szkript szerkesztése" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Többsoros panoráma" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Ez a szkript lesz elküldve a Panorama Tools motornak. Szerkessze ezeket a " +"sorokat haladó egyéni módszerhez." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Többsoros panoráma kötegekkel" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Folytatás ezen módosításokkal" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Előzetesen igazított panoráma" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Módosítások elvetése és mégse" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Kereső" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Csoportosít:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Egy lépéses kereső" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimális átfedés:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Minimális átfedés a kimeneti köteg észleléséhez\n" +"-1-el a kijelölt kötegek a projektben használatban vannak." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Paraméterek:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maximális Ev különbség:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Tisztítási paraméterek:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maximális EV különbség kimeneti rétegek kereséséhez" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Két lépéses kereső" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Kijelző" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Jellegzetesség leíró:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Általános" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Jellegzetesség összehasonlító:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF adat" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Kereső kötegekhez" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Pozíciók" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Hagyja üresen, ha nincs kontroll pont kereső ami futthatna a kötegeken." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Objektív paraméterek" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Speciális beállítás" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Fotometrikus paraméterek" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Ennek a beállitásnak nincsenek további speciális opciói." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Objektívtípus" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"Az alábbi paraméterek helyettesítődni fognak futtatás előtt:\n" -"%o -- kimenti projekt (0.oto hozzá fog fűződni amikor az Autopano-t " -"használja)\n" -"%p -- kontroll pontok száma minden egyes pár között\n" -"%v -- az első kép HFOV-a /vízszintes látóhatár/\n" -"%f -- az első kép vetülete (0-4, mint a panotools-ban)\n" -"%i -- kép fájlok\n" -"%namefile -- fájl, ami tartalmazza a kép fájlok fájlneveit\n" -"%s -- bemeneti panotools szkript\n" -"%k -- közbenső kulcs fájl(ok)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Képek hozzáadása..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Objektívtípus:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Fókusztávolság szorzó:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Jellegzetesség Összehasonlítás" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Beállítások:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "A kijelölt képeken a kijelölt kontroll pont kereső futtatása" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimalizál" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometriai:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Kontroll Pont Keresők paraméterei" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Kiszámít" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Érvénytelen fájlnevek" +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometrikus:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Panorama Tools szkript szerkesztése" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Kiválasztott Kép" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Objektív adatok betöltése..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Ez a szkript lesz elküldve a Panorama Tools motornak. Szerkessze ezeket a " -"sorokat haladó egyéni módszerhez." +"A vizszintes látóhatár (HFOV) megadása vagy fókusztávolság és körbevágás " +"tényező:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Folytatás ezen módosításokkal" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Módosítások elvetése és mégse" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "fok" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Kamera és Objektív adatok" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Forgatás (y):" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Bólintás (p):" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Dőlés (r):" @@ -5352,34 +5685,11 @@ msgid "Translation parameter" msgstr "Fordítás paraméter" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Pozíciók" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "látómező fokban (v):" @@ -5479,7 +5789,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Súgó" @@ -5522,8 +5832,8 @@ msgstr "Betöltés" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Mentés" @@ -5535,121 +5845,45 @@ msgid "Manipulate image variables" msgstr "Képváltozók manipulálása" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Csoportosít:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimális átfedés:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimális átfedés kimeneti köteg érzékeléshez" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maximális Ev különbség:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maximális EV különbség kimeneti rétegek kereséséhez" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Kijelző" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Általános" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF adat" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Objektív paraméterek" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Fotometrikus paraméterek" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Objektívtípus" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Képek hozzáadása..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Objektívtípus:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Fókusztávolság szorzó:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Jellegzetesség Összehasonlítás" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Beállítások:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "A kijelölt képeken a kijelölt kontroll pont kereső futtatása" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimalizál" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometriai:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" +msgstr "WB referencia:" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Kiszámít" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "dcraw" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometrikus:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "További dcraw paraméterek:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Kiválasztott Kép" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Objektív adatok betöltése..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Feldolgozási profil:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"A vizszintes látóhatár (HFOV) megadása vagy fókusztávolság és körbevágás " -"tényező:" +"Hagyja üresen az alapértelmezett beállítások használatához RawTherapee-ben" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "darktable" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "fok" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "Raw konvertáló" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Kamera és Objektív adatok" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importálás" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5795,14 +6029,6 @@ msgid "Don't ask again" msgstr "Nem kérdez újra" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Igen" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Nem" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5866,21 +6092,21 @@ msgid "Import positions from Papywizard XML" msgstr "Pozíciók importálása Papywizard XML-böl" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Visszavonás" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Utolsó tevékenység visszavonása" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Ismét" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Utolsó tevékenység ismét" @@ -5922,12 +6148,12 @@ msgid "Use only normal control points in optimization." msgstr "Az optimalizáláshoz csak a normál kontroll pontokat használja." -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimalizál" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Optimalizáló újrafuttatása a jelenlegi beállításokkal" @@ -5955,15 +6181,15 @@ msgid "Run a python script" msgstr "Python szkript futtatása" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Nézet" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "&Teljes Képernyő" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "A Hugin fő ablakának megjelenítése teljes képernyőn" @@ -6039,19 +6265,19 @@ msgid "Show the Stitcher panel" msgstr "Összefűző lap megjelenítése" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "&Egyszerű" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "&Haladó" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "Sza&kértő" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "Fe&lület" @@ -6072,86 +6298,86 @@ msgstr "" "Összefűzés a felhasználó által megadott kimeneti sorrend beállításokkal" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Néhány információ a különböző gombokról és a többi." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&A nap tippje" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "A nap egy tippjének megjelenítése." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Gyors&billentyűk" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "gyorsbillentyűk" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&GYIK" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Gyakran Ismételt Kérdések" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Névjegy" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Beállítások" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Új" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Új projekt" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "Meg&nyitás" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Projekt megnyitása" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Mentés" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Jelenlegi projektfájl mentése" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Menté&s másként" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Jelenlegi projekt mentése új fájlba" @@ -6167,18 +6393,18 @@ "Jelenlegi projekt írása PTStitcher kompatibilis szkriptfájlba, használható " "kötegelt feldolgozáshoz" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "A legutóbb &használt projektek" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "A legutóbb használt projekt fájlok listája" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Kö&tegelt feldolgozó futtatása" @@ -6264,7 +6490,7 @@ msgid "Show the OpenGL preview image" msgstr "OpenGL előnézeti kép megjelenítése" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Panoráma előnézete" @@ -6321,15 +6547,10 @@ msgstr "Terület kizárása az összes ezzel az objektívvel készült képből" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exportálás" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importálás" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Másolás" @@ -6373,8 +6594,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" "Minden változtatás az összes képre vonatkozik, ugyanazzal az objektívvel " "mint a kijelölt kép(ek)." @@ -6478,7 +6699,8 @@ msgid "execute the PTOptimizer engine" msgstr "a PTOptimizer motor végrehajtása" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Képtájolás" @@ -6523,39 +6745,39 @@ msgid "Interpolator (i):" msgstr "Interpolátor (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "kettős köbös (Poly3) /Bicubic/" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineáris" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Legközelebbi szomszéd" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "közelítő értékek forrás képpontok között" @@ -6583,7 +6805,7 @@ msgid "Enfuse options" msgstr "Enfuse beállítások" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Látóhatár:" @@ -6746,10 +6968,6 @@ msgid "Image fusion:" msgstr "Kép fúzió:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR összefésülő:" @@ -6853,15 +7071,15 @@ msgid "Output parameters" msgstr "Kimeneti paraméterek" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Varrat összemosó mód:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "kemény varrat (gyorsabb)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "mossa össze a varratot" @@ -6931,27 +7149,40 @@ msgstr "" "Ez hatással van a kontroll pontok szerkesztőjére és a maszkszerkesztőre." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "dcraw program:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(üresen hagyva az OS alapértelmezése)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "RT-cli program:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "darktable-cli program:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Fáj Beállítások" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Ideiglenes könyvt.:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(üresen hagyva az OS alapértelmezése)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Alapértelmezett projekt fájlnév:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Alapértelmezett kimeneti előtag:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6982,43 +7213,43 @@ "%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:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Alapértelmezett fájlnevek" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Fájlnevek" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Kép betöltés" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Automatikus igazítás betöltés után" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Függőleges vonalak keresése" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Függőleges vonalak keresése a képeken a panoráma szintezéséhez" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Felhőszerű kontroll pontok eltávolítása (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Opcionális segéd lépések" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Automatikus igazítás" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7026,69 +7257,69 @@ "Kontroll Pontok száma\n" "átfedésenként" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Kicsinyített végső pano" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "a max. szélesség százaléka" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Kontroll Pont Szerkesztő" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR és 16 Bit kijelző" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Görbe" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineáris" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmikus" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "a kijelzőhöz használva a GUI-ban" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Folt mérete:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "képpontok" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Keresési terület szélessége:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "" "százaléka a kép\n" "szélességének" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Helyi keresési terület szélessége:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Korrelációs Szint:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7096,11 +7327,11 @@ "0: nincs hasonlóság\n" "1: maximális hasonlóság" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Csúcs Görbület Szint:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7108,116 +7339,112 @@ "0: nincs csúcs\n" "0.2: megkülönböztető csúcs" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Elforgatott keresés" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Elforgatott keresés engedélyezése (lassúbb, de még pontosabb)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Kezdő szög:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Vég szög:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Lépések:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Kontroll Pont Keresők" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Kontroll Pont Kereső Programok" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Új..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Szerkesztés..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Felfelé mozgat" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Lefelé mozgat" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Alapérték" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "A segéd az alapértelmezett beállítást használja." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Kimeneti Formátum" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Alapértelmezett Fájl Formátum:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "a végső panoráma alapértelmezett kimeneti formátuma" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF Tömörítés:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "alapértelmezett TIFF tömörítés" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG Minőség:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "alapértelmezett JPEG tömörítés beállítás" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Összemosó" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Alapértelmezett összemosó:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Alapértelmezett összemosó új projektekhez." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Feldolgozó" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&összefűző&projekt" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "A motor, ami futtatni fogja az összefűzést" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Összefűző munkák azonnali elindítása" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7227,19 +7454,19 @@ "sorban. Ellenkező esetben a feldolgozó felfüggesztett módban indul el és a " "felhasználó indíthatja el a feldolgozás kézzel." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Létező fájlok felülírása" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "FIGYELEM: a meglévő fájlokat csendben felülírja." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Részletes Kimenet" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7247,19 +7474,19 @@ "Engedélyezze, hogy részleteket lásson, hibajelentéshez hasznos, vagy ha csak " "ellenőrizni akarja a projekt előrehaladását." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Összefűzés" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Metaadatok másolása a végső fájlokba ExifTool használatával" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "ExifTool beállítások" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7273,7 +7500,7 @@ "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:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7281,19 +7508,19 @@ "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:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Köztes ExifTool arg. fájl:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Üresen hagyva az alapértelmezett" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Kiválasztott ExifTool arg. fájl szerkesztése" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7303,29 +7530,29 @@ "átmásolja a végleges panorámába.\n" "Ezekkel lesz kiegészítve a fenti arg fájl a köztes képekre." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Végső ExifTool arg. fájl:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Fotó Gömb XMP adat létrehozása" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" "Ez csak négyzetes hengervetületű (equirectangular) kimeneti képeknél " "lehetséges." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Speciális beállítás" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Szálak száma:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7336,82 +7563,82 @@ "feldolgozáshoz.\n" "Állítsa be hány processzor vagy processzor mag elérhető az ön rendszerén" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 az automatikus felismeréshez" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Összefűzés (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Alapértelmezett Interpolátor (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Körbevágott képek készítése alapértelmezetten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Használja a GPU áttranszformálást (KÍSÉRLETI)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "GPU használata az áttranszformáláshoz" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "A videókártya GPU használata, gyorsabb áttranszformálás" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Alternatív Enblend program használata" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend program:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Alapértelmezett paraméterek:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" -"Ezek az alapértelmezett paraméterek új projekthez.\n" +"Ezek az alapértelmezett paraméterek új projektekhez.\n" "Meg lehet változtatni őket az egyéni projektben az Összefűző fülön.\n" "Ne állítsd be a -w, -o és a --compression paramétereket, ezeket a hugin " -"állítja be" +"állítja be." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Alternatív Enfuse program használata" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse program:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programok" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste paraméterek" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM küszöbszint:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7419,19 +7646,19 @@ "nagyobb, mint 0.5: kisebb érzékenység\n" "kisebb, mint 0.5: nagyobb érzékenység" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gábor szűrő mérete" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "kicsi" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "nagy" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7439,7 +7666,7 @@ "nagy pontosabb\n" "kicsi megvizsgálja a kontroll pontokat a kép széléhez közel" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7449,55 +7676,55 @@ "értékek elemzésével határozódik meg.\n" "A számítás gyorsításához, csak véletlen részponthalmazt használ." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Pontok száma képenként: " -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Fotometrikus optimalizáló" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Figyelmeztetések" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Értesítsen projekt fájl mentéséről és kimeneti előtagról" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "Figyelmeztessen a nagy expozíciós különbségre képek hozzáadásakor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "\"kp szerkesztés\" eszköz után" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Kérdezze a felhasználótól" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Panoráma újraoptimalizálása" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Ne optimalizálja a panorámát" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Kp szerkesztő eszköz (a gyors előnézeti ablakban)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Vegyes" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Beállítások - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." @@ -7505,11 +7732,11 @@ "Ezt az arg fájl parancssorral van meghívva\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "ExifTool arg. fájl szerkesztése" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." @@ -7517,7 +7744,7 @@ "Ezt az arg fájl parancssorral van meghívva\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7552,11 +7779,11 @@ "\n" "A mezők kis/nagybetű érzékenyek." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Előnézet középre igazítása vízszintesen" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Középre zár" @@ -7564,13 +7791,15 @@ msgid "Show the whole panorama" msgstr "A teljes panoráma megjelenítése" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Látóhatár kiszámítása" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Illesztés" @@ -7578,7 +7807,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automatikusan kiegyenesíti a hullámzó horizontot" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Kiegyenesít" @@ -7677,33 +7907,33 @@ "Beállítja az expozíciós értékét a panorámának, hogy átlagos expozíciója " "legyen az összes képnek." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Szürke kijelölő" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Globális fehéregyensúly korrigálása egy semleges szürke terület " "kiválasztásával." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "KP szerkesztés" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Kontroll pontok törlése vagy létrehozása a kijelölt téglalapban." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Háttér:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Méret:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7717,154 +7947,142 @@ "* Kattintson a vonalon a hozzá tartozó képek szerkesztéséhez a Kontroll " "Pontok fülön." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Elrendezés" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Vezetők:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Harmadolás" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Aranymetszés" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Átlós" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Átlós módszer" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Arany háromszög (lent)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Arany háromszög (fent)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automatikusan kiegyenesíti a hullámzó horizontot." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Húzás mód:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Alkalmaz" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Helyezze át a panorámát, vagy húzza a képeket pozícióba" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Áthelyezés/Húzás" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Beállítja a képkivágást a legnagyobb téglalapra amit a képek lefednek" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR Automatikus képkivágás" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Beállítja a képkivágást a legnagyobb téglalapra amit a kép kötegek lefednek" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "bal:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "felül:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "jobb:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "alul:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "A körbevágás visszaállítása a legnagyobb lehetséges területre" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "A panoráma képkivágásának megváltoztatása" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Panoráma sze&rkesztő" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "Átte&kintés" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Áttekintő panoráma gömb megjelenítése." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "Rá&cs" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Rács megjelenítése." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "&Minden kép" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "&Kép minden egyes köteg középső expozíciójával" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "Le&gvilágosabb kép minden egyes kötegben" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "L&egsötétebb kép minden egyes kötegben" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "&Aktuálisan kiválasztott képek megtartása" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "Kijelölés &visszaállítása" @@ -8166,6 +8384,78 @@ "értelme, ha nagy részben átlapoltak a képek és több jól szétszórt kontroll " "pont van rajtuk." +#~ msgid "(WB reference)" +#~ msgstr "(WB referencia)" + +#~ msgid "Images" +#~ msgstr "Képek" + +#~ msgid "Add image(s)..." +#~ msgstr "Kép(ek) hozzáadása..." + +#~ msgid "Add other images to list" +#~ msgstr "További képek hozzáadása a listához" + +#~ msgid "Remove image" +#~ msgstr "Kép eltávolítása" + +#~ msgid "Remove selected image from list" +#~ msgstr "A kiválasztott kép eltávolítása a listából" + +#~ msgid "Converter settings" +#~ msgstr "Konvertáló beállításai" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "&raw fájl(ok) importálása..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Helyezze át a panorámát, vagy húzza a képeket pozícióba" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "A panoráma képkivágásának megváltoztatása" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Használja a GPU áttranszformálást (KÍSÉRLETI)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Minden kép fájl|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG fájlok (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF fájlok (*." +#~ "tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG fájlok (*.png)|*.png;*.PNG|HDR " +#~ "fájlok (*.hdr)|*.hdr;*.HDR|EXR fájlok (*.exr)|*.exr;*.EXR|Minden fájl (*)|" +#~ "*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (A. Jenny által)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&összefűző&projekt" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Felület" @@ -9192,9 +9482,6 @@ #~ msgid "Flatfield" #~ msgstr "Világoskép" -#~ msgid "Image file:" -#~ msgstr "Kép fájl:" - #~ msgid "Polynomial" #~ msgstr "Többtagú (Polynomial)" @@ -9412,9 +9699,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#~ msgid "&Import Project..." -#~ msgstr "Pr&ojekt importálása..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9511,11 +9795,6 @@ #~ msgstr "" #~ "Autopano-SIFT nem található. Adja meg a helyes útvonalat a beállításoknál" -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "" -#~ "\"%s\" nem található. Kérem adjon meg egy érvényes elérési utat a " -#~ "beállításoknál" - #~ msgid "Error in Autopano command" #~ msgstr "Hiba az Autopano parancsban" @@ -9605,9 +9884,6 @@ #~ msgid "PTStitcher note" #~ msgstr "PTStitcher jegyzet" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "PTStitcher.exe kiválasztása" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "Nincs PTStitcher.exe kiválasztva" @@ -9810,9 +10086,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "Hiba a kép olvasása közben: %s" -#~ msgid "Remove this image" -#~ msgstr "Kép eltávolítása" - #~ msgid "Stitching Options" #~ msgstr "Összefűzési beállítások" @@ -9928,9 +10201,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend:" -#~ msgid "Additional Arguments:" -#~ msgstr "További paraméterek:" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "Ne add meg a -w és -o paramétereket, ezeket a hugin adja meg" @@ -10045,3 +10315,17 @@ #~ msgid "Clip" #~ msgstr "kilyukaszt" + +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "Adjon hozzá legalább egy raw képet a listához, mielőtt importálná." + +#~ msgid "Import Raw Files" +#~ msgstr "Raw Fájlok Importálása" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "Jelölje ki a kiválasztott képet fehéregyensúly referencia képként" + +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "" +#~ "Konvertálja a raw fájlt TIFF-be, és adja hozzá a TIFF-et az aktuális " +#~ "projekthez" diff -Nru hugin-2018.0.0+dfsg/src/translations/ignored-strings.txt hugin-2019.0.0+dfsg/src/translations/ignored-strings.txt --- hugin-2018.0.0+dfsg/src/translations/ignored-strings.txt 2012-11-15 17:41:32.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/ignored-strings.txt 2018-02-03 14:34:28.000000000 +0000 @@ -34,3 +34,6 @@ _("PNG"); _("#000000"); _("s"); +_("Hugin_stitch_project"); +_("Hugin&stitch&project"); +_("PTBatcherGUI"); \ No newline at end of file diff -Nru hugin-2018.0.0+dfsg/src/translations/it.po hugin-2019.0.0+dfsg/src/translations/it.po --- hugin-2018.0.0+dfsg/src/translations/it.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/it.po 2019-03-17 17:56:34.000000000 +0000 @@ -35,16 +35,17 @@ msgstr "" "Project-Id-Version: hugin 0.8\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-05-07 16:39+0200\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2019-03-17 09:45+0100\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 2.0.6\n" +"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,478,-1,-1,-1,-1\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 #: hugin1/hugin/PapywizardImport.cpp:460 @@ -72,16 +73,16 @@ msgid "Searching for best crop..." msgstr "Ricerca della miglior area di ritaglio..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Il programma esterno %s non è stato trovato nel bundle, viene usato il " "percorso di sistema" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -108,9 +109,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|File-PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Il file %s esiste già. Sovrascriverlo?" @@ -147,7 +148,7 @@ msgstr "Il fattore di ritaglio deve essere positivo." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -160,31 +161,35 @@ "Utilizzare comunque il valore fornito?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" # Tipo di obiettivo #: hugin1/base_wx/LensTools.cpp:38 hugin1/base_wx/LensTools.cpp:81 msgid "Normal (rectilinear)" -msgstr "Normale (rettilineo)" +msgstr "Normale (rettilineare)" # Tipo di obiettivo #: hugin1/base_wx/LensTools.cpp:39 hugin1/base_wx/LensTools.cpp:82 @@ -202,8 +207,8 @@ msgstr "Fisheye full-frame" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirettangolare" @@ -238,11 +243,13 @@ msgid "builtin" msgstr "integrato" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "Personalizzato (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineare" @@ -267,16 +274,16 @@ msgid "Error loading lens parameters" msgstr "Errore nel caricare i parametri dell'obiettivo" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Salva file parametri obiettivo" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "File progetto obiettivo (*.ini)|*.ini|Tutti i file (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Salva il progetto" @@ -312,22 +319,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Impossibile mettere in pausa il processo %ld, codice 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Annulla" @@ -361,12 +369,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Impossibile aprire il file progetto:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "Impossibile aprire lo script: %s" @@ -376,8 +384,8 @@ msgid "Project %s does not contain any active images." msgstr "Il progetto \"%s\" non contiene alcuna immagine attiva" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "Errore nell'analizzare lo script di panotools: %s" @@ -391,17 +399,17 @@ msgid "Could not create temporary file" msgstr "Impossibile creare il file temporaneo" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "La coda è vuota. Questo non dovrebbe mai accadere." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Errore durante l'assemblaggio" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -409,11 +417,11 @@ "Sovrascrivere le immagini esistenti?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Sovrascrivi le immagini esistenti" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -422,12 +430,12 @@ "Errore nell'assemblare il progetto\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Errore durante l'esecuzione dell'assistente" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -436,273 +444,285 @@ "Errore nell'eseguire l'assistente\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Assemblatura panorama..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Piattaforma:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Versione:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Cartella di lavoro:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Prefisso dell'output:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Programma per l'unione:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Programma di unione sconosciuto (enblend --version non riuscito)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "Interno" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Fusione dell'esposizione:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Fusione dell'esposizione sconosciuta (enfuse --version non riuscito)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Versione ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "NON RIUSCITO" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Numero di immagini attive:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Livello di esposizione dell'output: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Dimensione della superficie: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Proiezione:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Utilizzo della GPU per la rimappatura" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "vero" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "falso" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Formati di panorama:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Esposizione corretta, low dynamic range" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Fusione dell'esposizione dalle pile" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Esposizione fusa da qualsiasi disposizione" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "High dynamic range" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Immagini rimappate:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Nessuna correzione dell'esposizione, low dynamic range" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Pile combinate:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Pile con esposizioni fuse" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Livelli:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Livelli fusi con esposizione simile, senza correzione dell'esposizione" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Prima immagine in ingresso" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Numero:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Nome file:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Dimensione: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Tipo risposta:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Valore dell'esposizione: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Rimappatura e unione delle immagini LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Rimappatura delle immagini LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Unione immagini..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Rimappatura delle immagini LDR e fusione dei livelli..." # tooltip -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Rimappatura delle immagini LDR senza correzione dell'esposizione..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Unione del livello di esposizione %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fusione di tutti i livelli di esposizione..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Fusione della pila numero %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Unione di tutte le pile" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Rimappatura delle immagini HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Fusione della pila HDR numero %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Unione pile HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Aggiornamento dei metadati..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Assemblaggio con \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "prima immagine" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "ultima immagine" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "cartella" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +# tooltip +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Produttore fotocamera" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +# tooltip +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Modello fotocamera" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -711,35 +731,67 @@ msgstr "Obiettivo" # Un tipo di proiezione -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "proiezione sconosciuta" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Tutte i file immagine" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "JPEG (*.jpg, *.jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "TIFF (*.tif, *.tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "PNG (*.png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "HDR (*.hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "EXR (*.exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "Tutti i file (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "File Raw" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Errore" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -751,25 +803,11 @@ "Hugin non è in grado di operare con questi nomi di file. Rinominare il (o i) " "file e riprovare." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Informazioni di debug generate in \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Tutti i file immagine|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" -"*.EXR|File JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|File TIFF (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|File PNG (*.png)|*.png;*.PNG|File HDR (*." -"hdr)|*.hdr;*.HDR|File EXR (*.exr)|*.exr;*.EXR|Tutti i file (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -781,27 +819,27 @@ msgstr "L'input \"%s\" non è un numero valido" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Avviso" @@ -818,7 +856,7 @@ msgid "Could not save information into database." msgstr "Impossibile salvare le informazioni nel database." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -829,11 +867,11 @@ "%s\n" "Terminato" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Formato immagine non supportato" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -845,7 +883,7 @@ "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 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -861,14 +899,14 @@ "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 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin supporta solo le immagini RGB o in scala di grigi (con o senza canale " "alfa)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -877,7 +915,7 @@ "Il file «%s» è un'immagine in scala di grigi, ma le altre immagini del " "progetto sono a colori." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -886,7 +924,7 @@ "Il file «%s» è un'immagine a colori, ma le altre immagini del progetto sono " "in scala di grigi." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -896,7 +934,7 @@ "verrà scartata.\n" "Convertire l'immagine in scala di grigi o RGB e ricaricarla di nuovo." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -905,7 +943,7 @@ "Il file \"%s\" non ha un profilo ICC, ma le altre immagini del progetto " "hanno il profilo \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -914,7 +952,7 @@ "Il file \"%s\" ha il profilo ICC \"%s\", ma le altre immagini del progetto " "non hanno alcun profilo colore." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -923,7 +961,7 @@ "Il file \"%s\" ha il profilo ICC \"%s\", ma le altre immagini del progetto " "hanno il profilo colore \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -931,7 +969,7 @@ "Hugin accetta le immagini che hanno lo stesso profilo colore.\n" "Convertire le immagini allo stesso profilo colore e riprovare." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -939,7 +977,7 @@ "Hugin ha rilevato la presenza di pile nelle immagini aggiunte è assegnerà i " "corrispondenti numeri alle immagini." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -949,11 +987,11 @@ "pile verranno assegnati nuovamente sulla base di questa rilevazione; le " "assegnazioni delle pile esistenti saranno sovrascritte." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Collegare la posizione delle immagini in ogni pila?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -966,41 +1004,44 @@ "necessitano di una correzione della posizione (ad esempio quando si scatta a " "mano libera), allora non collegare la posizione." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Collega posizione" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Non collegare posizione" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Non assegnare una pila" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Mantieni le pile esistenti" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" +"Il file di progetto \"%s\" fa riferimento all'immagine \"%s\" che non è " +"stata trovata.\n" +"Selezionare manualmente l'immagine corretta." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Immagine non trovata" -#: hugin1/base_wx/wxPanoCommand.cpp:652 -#, fuzzy, c-format +#: hugin1/base_wx/wxPanoCommand.cpp:571 +#, c-format msgid "Select image %s" -msgstr "Seleziona editor immagini" +msgstr "Seleziona immagine «%s»" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -1011,16 +1052,17 @@ "\n" "Premere «OK» per rimuoverli." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Errore" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Aggiungi immagini" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -1029,32 +1071,32 @@ "Errore, il modello prevede %d immagini,\n" "il progetto attuale ne contiene %d\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Impossibile applicare il modello" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Errore nel caricare il progetto" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Risultato" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "Cartella xrc non trovata nel bundle" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Errore fatale" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1089,7 +1131,7 @@ "quelle delle immagini già presenti.\n" "Assicurarsi di aver selezionato le immagini corrette." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Aggiungi immagine: annulla" @@ -1102,9 +1144,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1122,7 +1164,7 @@ msgstr "Ricerca linee..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Finito" @@ -1136,11 +1178,11 @@ "Eseguire prima «Cerca linee». Se non vengono trovate delle linee, modificare " "i parametri." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Ottimizzazione dei parametri di distorsione dell'obiettivo..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1151,144 +1193,143 @@ "Se non vengono trovate delle linee, modificare i parametri." # tooltip -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Salva i parametri dell'obiettivo in un file ini" # tooltip -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Salva i parametri dell'obiettivo nel databse" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Salvataggio dei dati dell'obiettivo" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Salva obiettivo" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Salva file progetto" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "File progetto (*.pto)|*.pto|Tutti i file (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Eliminazione dei file temporanei..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "Visualizza questa messaggio di aiuto" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Esegui assistente" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Esegue l'unione dei progetti selezionati" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Numero di thread utilizzati" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "Prefisso da usare per l'unione" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "comandi definiti dall'utente nel file fornito" -#: hugin1/executor/hugin_executor.cpp:211 -#, fuzzy +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" -msgstr "comandi definiti dall'utente nel file fornito" +msgstr "usa i comandi dell'assistente definiti dall'utente in un file" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "stampa solo i comandi" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Sistema operativo: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architettura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Memoria libera: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Codifica caratteri attiva: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Versione: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Percorso delle risorse: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Percorso dei dati: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Database delle fotocamere e degli obiettivi di Hugin: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi processo usando C++11 std::thread e OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Profilo schermo: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Librerie" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano da http://autopano.kolor.com non è disponibile per OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Utilizzare invece Autopano-Sift" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1296,88 +1337,95 @@ "Almeno uno dei campi di input è vuoto.\n" "Controllare l'input." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Cerca di collegare tutte le immagini che si sovrappongono." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Elabora solamente le coppie di immagini senza punti di controllo" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" -msgstr "Selezionare il programma di ricerca dei punti di controllo" +msgstr "Selezione del programma di ricerca dei punti di controllo" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Eseguibili (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x sinistra" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y sinistra" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x destra" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y destra" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Allineamento" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distanza" # tooltip -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Punto di controllo aggiunto" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "Ricerca punti simili in corso..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Errore durante la regolazione precisa" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Punto calibrato, angolo: %.0f gradi, coefficiente correlazione: %0.3f, " +"Punto calibrato: angolo: %.0f gradi - coefficiente correlazione: %0.3f - " "curvatura: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" "Modificare i punti o premere il pulsante destro del mouse per aggiungere la " "coppia" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Punto stimato al di fuori dell'immagine" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" +"Distanza tra i punti di controllo troppo ridotta: la regolazione precisa non " +"sarà effettuata." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Nessun punto simile trovato." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1385,7 +1433,7 @@ "Una trasformazione interna non è riuscita.\n" "controllare che il punto sia all'interno dell'immagine." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1396,31 +1444,36 @@ "Il coefficiente di correlazione (%.3f) è più basso della soglia impostata " "nelle preferenze." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "aggiungi nuova riga" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Riga %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Correlazione" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normale" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "Linea vert." -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "Linea orizz." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1430,38 +1483,38 @@ "Per creare meno punti,\n" "inserire un numero maggiore." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Soglia di rilevamento angoli" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Crea punti di controllo" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Scala di rilevamento angoli" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Errore durante la creazione dei punti di controllo:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Selezionare il punto sull'immagine di destra" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Selezionare il punto sull'immagine di sinistra" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Crea PC (impostazione corrente: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1469,37 +1522,37 @@ "È impossibile eseguire Celeste senza avere almeno un punto di controllo che " "connette le due immagini" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste in esecuzione..." -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Caricamento del file modello in corso..." -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Rimossi %lu punti di controllo" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Risultato di Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Rimozione in corso..." # (ndt) è nel dialogo delle preferenze, # identifica una sezione delle preferenze -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Crea PC" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1507,20 +1560,21 @@ "Crea punti di controllo per la coppia di immagini usando il ricercatore di " "punti di controllo selezionato nella scheda «Foto»." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" # tooltip -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Tenta di rimuovere i punti di controllo dalle nuvole" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Elimina PC" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Rimuovi i punti di controllo anomali con un metodo statistico" @@ -1533,23 +1587,23 @@ msgid "Could not process event!" msgstr "Impossibile controllare l'evento." -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Imm. sinistra" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Imm. destra" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1557,18 +1611,17 @@ "Inserire il minimo errore tollerato.\n" "Verranno selezionati tutti i punti di controllo con errore maggiore" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Selezione punti di controllo" #: hugin1/hugin/ChangeImageVariableDialog.cpp:143 msgid "Input name for new preset" -msgstr "" +msgstr "Inserire il nome della nuova preimpostazione" #: hugin1/hugin/ChangeImageVariableDialog.cpp:143 -#, fuzzy msgid "Save preset" -msgstr "Salva il progetto" +msgstr "Salva predefiniti" #: hugin1/hugin/ChangeImageVariableDialog.cpp:158 #, c-format @@ -1576,16 +1629,16 @@ "Preset with name \"%s\" already exists.\n" "Should this preset be overwritten?" msgstr "" +"Preimpostazione con il nome \"%s\" già esistente.\n" +"Sovrascrivere?" #: hugin1/hugin/ChangeImageVariableDialog.cpp:212 -#, fuzzy msgid "Result of expression parsing" -msgstr "impostazioni della compressione JPEG predefinita" +msgstr "Risultato dell'analisi dell'espressione" #: hugin1/hugin/ChangeImageVariableDialog.cpp:218 -#, fuzzy msgid "Errors during expression parsing" -msgstr "Errore durante l'esecuzione dell'assistente" +msgstr "Errore nell'analisi dell'espressione" # Tooltip: mantenre corta altrimenti viene tagliata nella finestra dell'anteprima veloce #: hugin1/hugin/DragTool.cpp:78 @@ -1642,62 +1695,62 @@ "«Ctrl» (o tasto destro del mouse) per variare il rollio" # tooltip -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Anteprima panorama veloce" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&File" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Immagini visualizzate" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Tutte" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Nessuna" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Nascondi" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" # (ndt) suggerimento su un controllo scorrevole -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "Trascinare per modificare il campo inquadrato verticalmente" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" # (ndt) suggerimento su un controllo scorrevole -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "Trascinare per modificare il campo inquadrato orizzontalmente" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Anteprima" @@ -1705,85 +1758,90 @@ msgid "Overview" msgstr "Panoramica" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Ripristina i parametri di proiezione ai rispettivi valori predefiniti." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "Parametro:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Nessuna immagine caricata." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu immagini caricate." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Le immagini sono collegate da %lu punti di controllo.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Trovati %lu gruppi di immagini non connessi: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Le immagini o i punti di controllo sono cambiati; è necessario un nuovo " "allineamento." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Errore medio dopo l'ottimizzazione: %.1f pixel, massimo: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rettilineare" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cilindrica" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Il valore dell'imbardata deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Il valore dell'inclinazione deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Il valore del rollio deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "Il valore X deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Il valore Y deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Il valore Z deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Il valore deve essere numerico." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "Il valore dell'intervallo di compressione non è valido." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1795,55 +1853,55 @@ "Il progetto ha però i parametri Tpy e Tpp non nulli.\n" "Impostare i valori Tpy e Tpp a zero?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "differenza" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autoritaglio" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Calcolo del ritaglio ottimale in corso..." -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "\"Superiore\" deve essere un intero maggiore di 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "\"Sinistra\" deve essere un intero maggiore di 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "\"Destra\" deve essere un intero maggiore di 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "\"Inferiore\" deve essere un intero maggiore di 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "Il limite sinistro deve essere più piccolo del destro" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "Il limite superiore deve essere più piccolo di quello inferiore" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Valore HFOV non valido. Il valore massimo per questa proiezione è %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Valore VFOV non valido. Il valore massimo per questa proiezione è %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1851,7 +1909,7 @@ "Con un campo inquadrato ampio, i panorami in proiezione rettilineare " "risultano stirati verso i bordi.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1859,16 +1917,16 @@ "Dato che il campo inquadrato è ampio solamente in direzione orizzontale, " "provare la proiezione cilindrica." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Per un panorama molto ampio, provare invece la proiezione equirettangolare." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " O anche la proiezione Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1880,7 +1938,7 @@ "Una proiezione equirettangolare potrebbe far stare la stessa immagine in uno " "spazio verticale inferiore." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1891,7 +1949,7 @@ "La proiezione cilindrica mantiene tali le linee verticali, a differenza di " "quella equirettangolare." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1902,7 +1960,7 @@ "Una proiezione conforme conserva gli angoli ed è generalmente più bella da " "vedere." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1914,7 +1972,7 @@ "La proiezione Fisheye li comprime, in modo da ottenere un'immagine più " "contenuta mantenendo comunque un ragionevole dettaglio nella parte centrale." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1922,7 +1980,7 @@ "Impostando il panorama in proiezione rettilineare, le linee rette verranno " "mantenute tali." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1933,27 +1991,27 @@ "Per farla comparire di nuovo, attivare la corrispondente opzione nelle " "preferenze." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normale, individuale" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaico" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaico, individuale" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfera" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Piano del mosaico" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1964,12 +2022,12 @@ "\n" "Ottimizzare di nuovo?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "La strategia di ottimizzazione selezionata è \"%s\"" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1977,7 +2035,7 @@ "La regione selezionata non contiene immagini attive.\n" "Selezionare una regione che comprenda almeno due immagini." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1985,7 +2043,7 @@ "La regione selezionata contiene una sola immagine.\n" "Non è possibile creare dei punti di controllo per una singola immagine." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1999,27 +2057,27 @@ "\n" "Procedere comunque?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Ricerca punti di controllo" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Elaborazione" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Rimappatura dell'immagine nella proiezione del panorama..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Ricerca punti di interesse..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Controllo dei risultati..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -2029,7 +2087,7 @@ "Sono stati aggiunti %lu punti di controllo al panorama.\n" "/nOttimizzare nuovamente il panorama?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -2037,7 +2095,7 @@ "Errore nell'inizializzare GLEW\n" "La finestra dell'anteprima veloce non può essere aperta." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2084,7 +2142,7 @@ msgstr "Numero di maschere" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Ritaglio" @@ -2118,7 +2176,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "La massima differenza Ev deve essere maggiore di 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Pile" @@ -2215,6 +2273,7 @@ msgid "Width" msgstr "Larghezza" +# tooltip #: hugin1/hugin/ImagesTree.cpp:148 msgid "Image width" msgstr "Larghezza immagine" @@ -2223,6 +2282,7 @@ msgid "Height" msgstr "Altezza" +# tooltip #: hugin1/hugin/ImagesTree.cpp:149 msgid "Image height" msgstr "Altezza immagine" @@ -2231,6 +2291,7 @@ msgid "Anchor" msgstr "Ancora" +# tooltip #: hugin1/hugin/ImagesTree.cpp:150 msgid "Anchor image for position and/or exposure" msgstr "Blocca quest'immagine per la posizione e/o per l'esposizione" @@ -2240,6 +2301,7 @@ msgid "# Ctrl Pnts" msgstr "n° P.d.C." +# tooltip #: hugin1/hugin/ImagesTree.cpp:151 msgid "Number of control points in this image" msgstr "Numero di punti di controllo in questa immagine" @@ -2248,6 +2310,7 @@ msgid "Lens no." msgstr "Obiettivo n°" +# tooltip #: hugin1/hugin/ImagesTree.cpp:152 msgid "Assigned lens number" msgstr "Numero obiettivo assegnato" @@ -2256,6 +2319,7 @@ msgid "Stack no." msgstr "Numero pila" +# tooltip #: hugin1/hugin/ImagesTree.cpp:153 msgid "Assigned stack number" msgstr "Numero della pila assegnato" @@ -2268,7 +2332,7 @@ msgid "Model" msgstr "Modello" -# (ndt) pulsante +# tooltip #: hugin1/hugin/ImagesTree.cpp:157 msgid "Used lens" msgstr "Obiettivo usato" @@ -2277,9 +2341,10 @@ msgid "Capture date" msgstr "Data di scatto" +# tooltip #: hugin1/hugin/ImagesTree.cpp:158 msgid "Date, image was taken" -msgstr "Data di scatto" +msgstr "Data di cattura dell'immagine" #: hugin1/hugin/ImagesTree.cpp:159 msgid "Focal length" @@ -2293,14 +2358,16 @@ msgid "Shutter Speed" msgstr "Velocità dell'otturatore" +# tooltip #: hugin1/hugin/ImagesTree.cpp:161 msgid "Shutter speed" msgstr "Velocità dell'otturatore" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" +# tooltip #: hugin1/hugin/ImagesTree.cpp:162 msgid "ISO speed" msgstr "Velocità ISO" @@ -2332,14 +2399,17 @@ msgid "Roll" msgstr "Rollio" +# tooltip #: hugin1/hugin/ImagesTree.cpp:167 msgid "Camera translation X" msgstr "Traslazione fotocamera lungo X" +# tooltip #: hugin1/hugin/ImagesTree.cpp:168 msgid "Camera translation Y" msgstr "Traslazione fotocamera lungo Y" +# tooltip #: hugin1/hugin/ImagesTree.cpp:169 msgid "Camera translation Z" msgstr "Traslazione fotocamera lungo Z" @@ -2348,6 +2418,7 @@ msgid "Plane yaw" msgstr "Imbardata del piano" +# tooltip #: hugin1/hugin/ImagesTree.cpp:170 msgid "Translation remap plane yaw" msgstr "La traslazione rimappa l'imbardata del piano" @@ -2357,6 +2428,7 @@ msgid "Plane pitch" msgstr "Inclinazione del piano" +# tooltip #: hugin1/hugin/ImagesTree.cpp:171 msgid "Translation remap plane pitch" msgstr "La traslazione rimappa l'inclinazione del piano" @@ -2369,6 +2441,7 @@ msgid "Lens type (f)" msgstr "Tipo obiettivo (f)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:174 msgid "Lens type (rectilinear, fisheye, equirectangular, ...)" msgstr "Tipo di obiettivo (rettilineare, fisheye, equirettangolare...)" @@ -2382,55 +2455,68 @@ msgid "Horizontal field of view (v)" msgstr "Campo inquadrato orizzontale (v)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:176 msgid "Radial distortion (a)" msgstr "Distorsione radiale (a)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:177 msgid "Radial distortion (b, barrel)" msgstr "Distorsione radiale (b, barilotto)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:178 msgid "Radial distortion (c)" msgstr "Distorsione radiale (c)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:179 msgid "Horizontal image center shift (d)" msgstr "Spostamento orizzontale del centro dell'immagine (d)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:180 msgid "Vertical image center shift (e)" msgstr "Spostamento verticale del centro dell'immagine (e)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:181 msgid "Horizontal image shearing (g)" msgstr "Stiramento orizzontale dell'immagine (g)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:182 msgid "Vertical image shearing (t)" msgstr "Stiramento verticale dell'immagine (g)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:184 msgid "Exposure value (Eev)" msgstr "Valore dell'esposizione (EeV)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:185 msgid "Red multiplier (Er)" msgstr "Moltiplicatore del rosso (Er)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:186 msgid "Blue multiplier (Eb)" msgstr "Moltiplicatore del blu (Eb)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:187 hugin1/hugin/ImagesTree.cpp:188 #: hugin1/hugin/ImagesTree.cpp:189 msgid "Vignetting (Vb, Vc, Vd)" msgstr "Vignettatura (Vb, Vc, Vd)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:190 msgid "Horizontal vignetting center shift (Vx)" msgstr "Spostamento orizzontale del centro di vignettatura (Vx)" +# tooltip #: hugin1/hugin/ImagesTree.cpp:191 msgid "Vertical vignetting center shift (Vy)" msgstr "Spostamento verticale del centro di vignettatura (Vy)" @@ -2439,108 +2525,106 @@ msgid "Response type" msgstr "Tipo risposta" +# tooltip #: hugin1/hugin/ImagesTree.cpp:192 msgid "Camera response type" msgstr "Tipo di risposta fotocamera" +# tooltip #: hugin1/hugin/ImagesTree.cpp:193 hugin1/hugin/ImagesTree.cpp:194 #: hugin1/hugin/ImagesTree.cpp:195 hugin1/hugin/ImagesTree.cpp:196 #: hugin1/hugin/ImagesTree.cpp:197 msgid "Camera response parameter" -msgstr "Parametro di risposta fotocamera" +msgstr "Parametro di risposta della fotocamera" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "non attivo" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "attivo" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Obiettivo %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Pila %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Output della pila %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Output del livello di esposizione %ld" # Indica che i parametri devono essere collegati tra immagini diverse -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Collega" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Scollega" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Seleziona tutti gli obiettivi correnti" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Deseleziona tutti gli obiettivi correnti" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Seleziona tutta per la pila corrente" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Deseleziona tutta per la pila corrente" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Seleziona tutto" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Deseleziona tutto" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Modifica variabili immagine..." -#: hugin1/hugin/ImagesTree.cpp:1219 -#, fuzzy +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" -msgstr "Salva immagine" +msgstr "Disattiva immagine" -#: hugin1/hugin/ImagesTree.cpp:1223 -#, fuzzy +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" -msgstr "Salva immagine" +msgstr "Attiva immagine" -#: hugin1/hugin/ImagesTree.cpp:1228 -#, fuzzy +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" -msgstr "Immagini visualizzate" +msgstr "Attiva immagini" -#: hugin1/hugin/ImagesTree.cpp:1229 -#, fuzzy +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" -msgstr "Numero di immagini attive:" +msgstr "Disattiva immagini" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Punti di controllo" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2573,12 +2657,26 @@ msgid "Did you know..." msgstr "Sapevate che..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" +"É stato selezionato un solo file RAW: non è consigliato.\n" +"I file RAW dovrebbero essere convertiti tutti in una volta." + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "Converti comunque." + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versione %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2586,75 +2684,70 @@ "Errore di installazione fatale\n" "Il file data/splash.png non è stato trovato in:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "A&iuto" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Azioni" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "&Output" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Sequenza definita dall'utente: %s" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Sequenze di output definite dall'utente" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Modifica" -#: hugin1/hugin/MainFrame.cpp:522 -#, fuzzy, c-format +#: hugin1/hugin/MainFrame.cpp:560 +#, c-format msgid "User defined assistant: %s" -msgstr "Sequenza definita dall'utente: %s" +msgstr "Assistente definito dall'utente: %s" -#: hugin1/hugin/MainFrame.cpp:537 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" -msgstr "Esegui assistente" +msgstr "Assistente definito dall'utente" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Inizio" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Ottimizzatore" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Esposizione" -#: hugin1/hugin/MainFrame.cpp:821 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" -msgstr "Salvare le modifiche al panorama prima di aprire un altro progetto?" +msgstr "Salvare le modifiche al file di progetto prima di aprirne un altro?" -#: hugin1/hugin/MainFrame.cpp:824 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" -msgstr "Salvare le modifiche al panorama prima di iniziare un nuovo progetto?" +msgstr "Salvare le modifiche al file di progetto prima di iniziarne uno nuovo?" -#: hugin1/hugin/MainFrame.cpp:828 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" -msgstr "Salvare le modifiche al panorama prima di chiudere?" +msgstr "Salvare le modifiche al file di progetto prima di chiudere?" -#: hugin1/hugin/MainFrame.cpp:841 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2662,8 +2755,7 @@ "Se si carica un altro progetto senza salvare, i cambiamenti dall'ultimo " "salvataggio saranno perduti" -#: hugin1/hugin/MainFrame.cpp:844 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2671,7 +2763,7 @@ "Se si inizia un nuovo progetto senza salvare, i cambiamenti dall'ultimo " "salvataggio saranno perduti" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2679,41 +2771,41 @@ "Se si chiude senza salvare, i cambiamenti dall'ultimo salvataggio saranno " "perduti" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Non salvare" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Chiudi senza salvare" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Chiusura forzata" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "Progetto %s salvato" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Strumento per panorami" # tooltip -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Editor panorama" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2726,36 +2818,35 @@ "\n" "(Codice errore: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Salva script PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "File PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Apri progetto: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Progetto aperto" -#: hugin1/hugin/MainFrame.cpp:1067 -#, fuzzy +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" -msgstr "Caricamento immagine:" +msgstr "Caricamento annullato" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Errore nell'aprire il progetto: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Apri file progetto" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2766,11 +2857,11 @@ "Questo file non può essere aperto con File->Apri.\n" "Aggiungere questa immagine al progetto corrente?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Apri progetto: annulla" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2781,7 +2872,7 @@ "Il file non è un'immagine valida.\n" "Questo file verrà rimosso dal progetto." -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2793,32 +2884,32 @@ "accessibile.\n" "Questo file verrà rimosso dal progetto." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Impossibile leggere il file di progetto «%s»:" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Apre un file XML Papywizard" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "File XML Papywizard (*.xml)|*.xml|Tutti i file (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Scegliere il progetto modello" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Regolazione precisa di tutti i punti " -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Regolazione precisa" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2848,23 +2939,23 @@ "Usare «Punti di controllo» (F3) per visualizzare tutti i punti del progetto " "attuale.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Risultati regolazione precisa" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Rimozione dei punti di controllo nella maschera in corso..." -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Selezione dello script di Python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Script di Python (*.py)|*.py|Tutti i file (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2873,13 +2964,13 @@ "Il file «%s» non è stato trovato.\n" "Potrebbe essere stato rinominato, spostato o cancellato." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Errore!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2887,12 +2978,12 @@ "File modello di Celeste atteso in %s ma non trovato, Hugin deve essere " "installato correttamente." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Impossibile caricare il file modello di Celeste «%s»" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2902,7 +2993,7 @@ "lo spostamento del centro di vignettatura.\n" "Queste funzionalità non sono supportate nella modalità semplice." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2912,7 +3003,7 @@ "parametri di traslazione o di stiramento.\n" "Queste funzionalità non sono supportate nella modalità semplice." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2922,17 +3013,19 @@ "parametri di traslazione o di stiramento.\n" "Queste funzionalità non sono supportate nella modalità avanzata." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" +"La coda dell'assistente è vuota: questo indica un errore nel file " +"dell'assistente definito dall'utente." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Assistente in esecuzione..." -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2940,12 +3033,12 @@ "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:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Attenzione, trovati %d gruppi non collegati:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2957,7 +3050,7 @@ "\n" "Dopo aver aggiunto i punti, premere nuovamente il pulsante «Allinea»" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2965,23 +3058,23 @@ "L'assistente non ha avuto successo. Controllare il file del progetto " "ottenuto." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "File di progetto non trovato" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Impossibile avviare PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Avviato programma non corretto" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Tipo di maschera" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2989,29 +3082,29 @@ "Per creare una maschera poligonale fare clic con il pulsante sinistro del " "mouse sull'immagine; impostare l'ultimo punto con il tasto destro del mouse." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" -msgstr "Salva maschera" +msgstr "Esportazione maschera" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "File maschera (*.msk)|*.msk|Tutti i file (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" -msgstr "Carica maschera" +msgstr "Importazione maschera" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Carica maschera: annulla" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Impossibile leggere la maschera dal file «%s»." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Inserire un numero valido" @@ -3031,6 +3124,10 @@ "Please add control points before running the optimizer.\n" "Optimization canceled." msgstr "" +"Non ci sono punti di controllo nella configurazione corrente " +"dell'ottimizzatore.\n" +"Aggiungere dei punti di controllo prima di eseguire l'ottimizzatore.\n" +"Ottimizzazione annullata." #: hugin1/hugin/OptimizePanel.cpp:361 msgid "" @@ -3154,7 +3251,7 @@ msgstr "Allineamento fotometrico" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Caricamento delle immagini in corso..." @@ -3199,67 +3296,70 @@ msgid "Photometric optimization finished" msgstr "Ottimizzazione fotometrica completata" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Aggiungi immagini individuali..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "Consenti di selezionare più file RAW" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Aggiungi immagini per data..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Non è stata trovata alcuna immagine corrispondente." -#: hugin1/hugin/PanoOperation.cpp:385 -#, fuzzy +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Modifica variabili immagine..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Rimuovi immagini selezionate" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Blocca quest'immagine per la posizione" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Blocca quest'immagine per l'esposizione" # (ndt) pulsante -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nuovo obiettivo" # (ndt) pulsante -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Cambia obiettivo..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Inserire un nuovo numero di obiettivo" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Obiettivo numero" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Cambia numero obiettivo" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Carica obiettivo dal database" # tooltip -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Carica obiettivo da un file ini" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3268,12 +3368,12 @@ "I parametri caricati devono essere applicati a tutte le immagini con lo " "stesso obiettivo?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Domanda" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3285,100 +3385,100 @@ "Applicare comunque le impostazioni?" # tooltip -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Salva obiettivo in un file ini" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Rimuovi i punti di controllo" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Le immagini selezionate non condividono punti di controllo" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Eliminare veramente %lu punti di controllo?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Elimina punti di controllo" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Rimuovi i punti di controllo anomali" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Rimozione dei punti di controllo in corso..." -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Controllo della coppia in corso..." -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Controllo dell'intero progetto in corso..." -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Rimozione terminata" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Rimuovi i punti di controllo sulle nuvole" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Ripristina predefiniti dell'utente..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Ripristina posizioni" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Ripristina i parametri di traslazione" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Ripristina i parametri dell'obiettivo" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Ripristina i parametri fotometrici" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nuova pila" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Cambia pila..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Inserire un nuovo numero per la pila" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "numero della pila" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Cambia il numero della pila" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Imposta dimensione pila..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Qualità:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3460,47 +3560,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff ad area invariata" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "La larghezza deve essere un intero maggiore di 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "L'altezza deve essere un intero maggiore di 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "Il limite sinistro deve essere più piccolo del destro" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Il limite superiore deve essere più piccolo di quello inferiore" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "Opzioni di PTmender non ancora implementate" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Opzioni di PTblender non ancora implementate" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Opzioni per questo programma HDRMerge non ancora implementate" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Impossibile creare il file di progetto temporaneo" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" -msgstr "Specificare il prefisso dell'output" +msgstr "Specifica del prefisso dell'output" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3509,15 +3609,15 @@ "Non si hanno i permessi per scrivere nella cartella «%s».\n" "Selezionare una nuova cartella per l'output finale" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" -msgstr "Selezionare output definito dall'utente..." +msgstr "Selezione dell'output definito dall'utente..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Output definito dall'utente|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3529,10 +3629,10 @@ "La larghezza e l'altezza delle immagini jpeg deve essere inferiore a 65500 " "pixel. É stata richiesta un'immagine jpeg con %dx%d pixel.\n" "Tale dimensione non è supportata dal formato jpeg.\n" -"Diminuire la dimensione nel pannello di assemblaggio o selezionare il " +"Diminuire la dimensione nella scheda dell'assemblatore o selezionare il " "formato di output TIF o PNG." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3542,10 +3642,10 @@ msgstr "" "Il panorama che si sta tentando di unire ha %.1f gigapixel.\n" "Se questa dimensione è troppo grande, ridurre le dimensioni dell'immagine o " -"la regione di ritaglio dalla scheda dell'«Assemblatore». Unire un panorama " -"di queste dimensione può richiedere molto tempo e memoria." +"la regione di ritaglio dalla scheda dell'«Assemblatore». Unire un panorama di " +"queste dimensione può richiedere molto tempo e memoria." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3559,19 +3659,19 @@ "Se questo è un problema, ridurre la dimensione dell'area del panorama o la " "regione di ritaglio." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Assemblare davvero un panorama così grande?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Assembla comunque" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Fammelo cambiare" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3580,7 +3680,7 @@ "Non ci sono immagini nella regione di output.\n" "Controllare che almeno un'immagine sia nella regione di output." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3618,121 +3718,136 @@ msgstr "Varie" # (ndt) intende la lingua del programma -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Predefinita di sistema" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Basco" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalano" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Cinese (semplificato)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Cinese (tradizionale)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Ceco" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Danese" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Olandese" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Inglese" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francese" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Tedesco" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Ungherese" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiano" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Giapponese" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polacco" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portoghese (Brasiliano)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Russo" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovacco" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spagnolo" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Svedese" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finlandese" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valenciano (Catalano del sud)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" -msgstr "Selezionare enblend" +msgstr "Selezione di enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Eseguibili (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" -msgstr "Selezionare enfuse" +msgstr "Selezione di enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "Selezione di dcraw" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "Selezione di RawTherapee-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Selezione di darktable-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Selezione dell'argfile ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Argfile ExifTool (*.arg)|*.arg|Tutti i file (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3741,14 +3856,14 @@ "Il file «%s» non esiste.\n" "Creare un argfile con i tag predefiniti?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Argfile ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3756,18 +3871,18 @@ "Nessun file selezionato.\n" "Creare un argfile con i tag predefiniti?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Selezione del nuovo argfile ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Impossibile salvare il file «%s»." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3776,7 +3891,7 @@ "Il file «%s» non esiste.\n" "Creare un argfile di esempio?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3784,23 +3899,24 @@ "Nessun file selezionato.\n" "Creare un argfile di esempio?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Ripristinare le preferenze visualizzate ai valori predefiniti?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Carica predefiniti" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Prima selezionare un elemento" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Selezionare un elemento" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3808,32 +3924,32 @@ "Impossibile cancellare l'ultima impostazione.\n" "È richiesta almeno una impostazione." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Rimuovere davvero l'impostazione \"%s\" del programma di ricerca dei punti " "di controllo?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Cancella le impostazioni di ricerca dei punti di controllo" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Carica le impostazioni del ricercatore di punti di controllo" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "" "Impostazioni del ricercatore di punti di controllo (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Salva le impostazioni del ricercatore di punti di controllo" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3864,44 +3980,48 @@ msgstr "Elimina %lu punti di controllo" # tooltip -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Anteprima panorama" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opzioni anteprima" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Proiezione (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Modalità di unione:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Output:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Intervallo compressione:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parametri di proiezione" # tooltip -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" @@ -3909,7 +4029,7 @@ "all'orizzonte" # tooltip -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centra il panorama col pulsante sinistro, imposta l'orizzonte col destro" @@ -3934,7 +4054,7 @@ msgstr "" "Fare clic sulla linea di collegamento per modificare i punti di controllo" -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3945,29 +4065,124 @@ "Errore: %s\n" "Un apossibile causa potrebbe essere una immagine mancante o non valida." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Eseguibile \"%s\" non trovato.\n" +"Specificarne uno valido nelle preferenze." + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Eseguibile \"%s\" non trovato in PATH.\n" +"Specificarne uno valido nelle preferenze." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Esecuzione: %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "Aggiornamento dei dati EXIF per %s" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Profilo di elaborazione \"%s\" non trovato.\n" +"Specificare un nome valido o lasciare vuoto per le impostazioni predefinite." + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Importa immagini RAW" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Impossibile elaborare l'output dell'immagine di riferimento.\n" +"Non saranno elaborate ulteriori immagini" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Chiudi" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Attenzione: errore di lettura" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"I seguenti file saranno esclusi perché i metadati non possono essere letti." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Attenzione: immagini RAW di fotocamere differenti" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"Le immagini seguenti sono state scattate con una fotocamera diversa dalle " +"altre.\n" +"L'importazione di file RAW funziona solamente con immagini della stessa " +"fotocamera." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "Almeno un'immagine RAW non è stata convertita." + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Selezione del file di elaborazione RT predefinito" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "Profilo di elaborazione RT|*.pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "La cartella «%s» non esiste" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Impossibile impostare la variabile PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Apre l'elaboratore in serie di Hugin" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" -msgstr "Apre PTBatcher, l'elaboratore in serie dei file di progetto di Hugin." +msgstr "Apre PTBatcher, l'elaboratore in serie dei file di progetto di Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Apre lo strumento di calibrazione dell'obiettivo" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Apre Calibrate_lens_gui, una semplice interfaccia per la calibrazione degli " @@ -3984,11 +4199,11 @@ "Potrebbe non essere stato installato correttamente o potrebbe essere stato " "fornito un percorso errato nelle impostazioni." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "pulitura dei file temporanei dei punti chiave" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3997,15 +4212,15 @@ "Usare %namefile, %i o %s per specificare i file di input per il programma di " "ricerca dei punti di controllo" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Errore nel comando per il programma di ricerca dei punti di controllo" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -4018,14 +4233,14 @@ "Usare meno immagini o posizionare le immagini in una cartella\n" "con un percorso più corto" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Troppe immagini selezionate" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -4037,38 +4252,38 @@ "\n" " Impossibile eseguire il comando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Errore di wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Ricerca dei punti di controllo in corso..." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Impossibile eseguire il comando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -4077,9 +4292,9 @@ "Comando: %s\n" "non riuscito con codice di errore: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4095,13 +4310,13 @@ "\n" "Comando eseguito: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Errore del programma di ricerca dei punti di controllo" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4109,7 +4324,7 @@ "Usare %i per specificare i file di input e %k per specificare i file dei " "punti chiave per i passi chiave generati" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4117,11 +4332,11 @@ "Utilizzare %k per specificare i file dei punti chiave e %o per indicare il " "file del progetto di output per i passi corrispondenti" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "Generazione del file chiave in corso..." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4134,11 +4349,11 @@ "\n" " Impossibile eseguire il comando: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Predefinito" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4146,258 +4361,258 @@ "Impossibile pulire una serie in elaborazione.\n" "Annullarla?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Serie ripulita." # parte della frase "Error: Could not get status, project # with index doesn't exist". -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Errore: impossibile acquisire lo stato, il progetto con indice %d non è in " "elenco." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Errore: impossibile caricare il file della serie." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Serie completata con successo." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Serie completata con errori." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Inizializzazione dell'arresto in corso..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Arresto in corso..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Preparazione all'ibernazione..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Inizializzazione dell'ibernazione..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Preparazione della sospensione" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Inizializzazione della sospensione..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Specifica file progetto" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Nessun prefisso di output specificato" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Nessun file di progetto specificato" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Assemblaggio" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Assistente" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Errore di rimozione: il progetto con ID %d non è in elenco." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Errore: impossibile eliminare il file progetto " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Serie in elaborazione..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI sta unendo" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Serie già in elaborazione..." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Esecuzione del comando \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Assemblaggio di %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Ricerca in: %s" # parte della frase "Error: Could not set status, project # with index doesn't exist". -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Errore: impossibile impostare lo stato, il progetto con indice %d non è in " "elenco." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "In attesa..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "É stato premuto il il tasto comando" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." -msgstr "É stato premuto il il tasto controllo" +msgstr "É stato premuto il tasto Ctrl" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Saltare il caricamento della coda?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" -msgstr "Non fare nulla" +msgstr "non fare nulla" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" -msgstr "Chiude PTBatcherGUI" +msgstr "chiudi PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" -msgstr "Spegni il computer" +msgstr "spegni il computer" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Sospendi il computer" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Iberna il computer" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Inserire l'applicazione da linea di comando da eseguire:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" -msgstr "Inserire l'applicazione" +msgstr "Inserimento dell'applicazione" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" -msgstr "Specificare una cartella in cui ricercare i file di progetto" +msgstr "Selezione della cartella in cui ricercare i file di progetto" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" -msgstr "Specificare i file sorgenti del progetto" +msgstr "Specifica dei file sorgenti del progetto" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Progetto aggiunto dalla cartella «%s»" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Aggiunge il progetto \"%s\" alla coda di assemblaggio" -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Aggiunge il progetto \"%s\" alla coda dell'assistente" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Serie fermata" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Elaboratore in serie di Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " -msgstr "Specificare il prefisso dell'output per il progetto" +msgstr "Specifica del prefisso dell'output per il progetto" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Il prefisso dell'obiettivo di un assistente non può essere cambiato." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Selezionare un progetto" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Selezionare un solo progetto" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Specificare il file della serie da aprire" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "File della serie (*.ptb)|*.ptb;|Tutti i file (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Impossibile aprire il progetto in Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Nessun progetto selezionato. Aprire comunque Hugin?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Serie in pausa" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Pausa dell'elaborazione della coda di Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Proseguimento dell'elaborazione in serie..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Elaborazione della coda di Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4405,7 +4620,7 @@ "Sono presenti progetti non riusciti nell'elenco.\n" "Rimuovere anche questi?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4413,16 +4628,16 @@ "Impossibile rimuovere un progetto in elaborazione.\n" "Annullarlo?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Progetto rimosso dalla cartella «%s»" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Selezionare un progetto da rimuovere" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4430,16 +4645,16 @@ "Impossibile ripristinare un progetto in elaborazione.\n" "Annullarlo?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Progetto «%s» ripristinato" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Selezionare un progetto da ripristinare" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4447,15 +4662,15 @@ "Impossibile ripristinare un progetto in elaborazione.\n" "Annullare l'elaborazione in serie?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Specificare il file della serie da salvare" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "File della serie (*.ptb)|*.ptb;|Tutti i file (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4465,15 +4680,15 @@ "Le prestazioni potrebbero risentirne.\n" "Ripulire la coda?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Pulisci la coda ora" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Mantinei la coda" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Avvio serie" @@ -4509,7 +4724,7 @@ msgid "E&xit" msgstr "E&sci" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4519,11 +4734,11 @@ "Chiudendo la schermata, verranno persi.\n" "Continuare comunque?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Accettato" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4533,11 +4748,11 @@ "Continuando, verranno tralasciati.\n" "Continuare comunque?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Interrompi" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4546,7 +4761,7 @@ "La cartella «%s» non esiste.\n" "Fornire una cartella esistente." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4554,7 +4769,7 @@ "Non è stato selezionato alcun possibile panorama.\n" "Selezionarne almeno uno e riprovare." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4565,139 +4780,141 @@ "scrittura per queste cartelle." # tooltip -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Rimuove da questo progetto l'immagine" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Suddividi qui in due panorami" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Lettura del file «%s» in corso..." -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Avvia" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Trovati %d panorami possibili." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Nessun possibile panorama trovato." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d immagini: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Rilevato errore di sintassi nei parametri, annullamento." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI avviato" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "In attesa" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "In elaborazione" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Completo" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Non riuscito" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "File mancante" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "In pausa" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Progetto" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefisso dell'output" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Stato" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Ultima modifica" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Formato dell'output" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Proiezione" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Dimensione" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Errore, impossibile convertire l'ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistente" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Cambia prefisso" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Ripristina progetto" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Modifica con Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Rimuovi" @@ -4733,16 +4950,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "File di log (*.log)|*.log|Tutti i file (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Impossibile trovare il file di output dell'utente specificato «%s»" -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Specificare il file sorgente del progetto" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4755,7 +4972,7 @@ # tooltip #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Informazioni su Hugin" @@ -4788,19 +5005,19 @@ msgstr "Sistema" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4833,22 +5050,25 @@ msgid "Overwrite always" msgstr "Sovrascrivi sempre" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:78 msgid "Overwrite existing image files without further notice." -msgstr "Sovrascrivi le immagini esistenti senza ulteriori avvisi." +msgstr "Sovrascrivi le immagini esistenti senza ulteriori avvisi" #: hugin1/hugin/xrc/batch_frame.xrc:84 msgid "Remove finished project" msgstr "Rimuovi i progetti terminati" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:85 msgid "Automatically remove successfully finished projects from queue." -msgstr "Rimuovi automaticamente i progetti terminati dalla coda" +msgstr "Rimuovi automaticamente dalla coda i progetti terminati" #: hugin1/hugin/xrc/batch_frame.xrc:91 msgid "Automatic stitch after assistant" msgstr "Assembla automaticamente dopo l'assistente" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:92 msgid "Automatically stitch projects after (successfully) running assistant." msgstr "" @@ -4863,6 +5083,7 @@ msgid "Verbose output" msgstr "Output prolisso" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:118 msgid "Show detailed output in separate window." msgstr "Mostra l'output dettagliato in una finestra separata" @@ -4880,8 +5101,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Seleziona..." @@ -4917,6 +5141,7 @@ msgid "Minimum number of images:" msgstr "Numero minimo di immagini:" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:254 msgid "Minimum number of images a panorama should contain." msgstr "Il numero minimo di immagini che un panorama dovrebbe contenere" @@ -4925,7 +5150,7 @@ msgid "Maximum time difference:" msgstr "Differenza massima di tempo:" -# Tooltip +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:273 msgid "" "Maximal time difference in seconds between two consecutive images belonging " @@ -4942,9 +5167,10 @@ msgid "Create links" msgstr "Crea collegamenti" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:297 msgid "Check if the stacks were shot on a tripod." -msgstr "Controlla se le pile sono state scattate con un cavalletto." +msgstr "Controlla se le pile sono state scattate usando un cavalletto" #: hugin1/hugin/xrc/batch_frame.xrc:304 msgid "Lens database:" @@ -4954,6 +5180,7 @@ msgid "Load distortion data" msgstr "Carica i dati di distorsione" +# tooltip #: hugin1/hugin/xrc/batch_frame.xrc:312 msgid "Tries to load distortion data from lens database if checked." msgstr "" @@ -4974,7 +5201,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opzioni" @@ -5006,10 +5233,6 @@ msgid "Send selected panoramas to queue" msgstr "Invia il panorama selezionato alla coda" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Chiudi" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Ricerca dei panorami" @@ -5103,24 +5326,24 @@ msgstr "Mi&nimizza nel vassoio" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Chiudi" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Chiude il programma" #: hugin1/hugin/xrc/batch_menu.xrc:58 -#, fuzzy msgid "Batch Stitcher &help" -msgstr "Aiuto dell'assemblatore in serie" +msgstr "&Aiuto dell'assemblatore in serie" #: hugin1/hugin/xrc/batch_menu.xrc:60 msgid "Open Batch Stitcher help." -msgstr "Apre l'aiuto dell'assemblatore in serie." +msgstr "Apre l'aiuto dell'assemblatore in serie" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:9 msgid "Clear batch" msgstr "Pulisci serie" @@ -5130,6 +5353,7 @@ msgid "clear" msgstr "Pulisci" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:15 msgid "Open batch" msgstr "Apri serie" @@ -5138,6 +5362,7 @@ msgid "open" msgstr "apri" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:21 msgid "Save batch" msgstr "Salva serie" @@ -5154,6 +5379,7 @@ msgid "start" msgstr "avvia" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:34 msgid "Skip project(s)" msgstr "Salta progetto" @@ -5174,6 +5400,7 @@ msgid "pause" msgstr "pausa" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:47 msgid "Cancel batch" msgstr "Annulla serie" @@ -5186,6 +5413,7 @@ msgid "cancel" msgstr "Annulla" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:54 msgid "Add project(s)" msgstr "Aggiungi progetto" @@ -5198,6 +5426,7 @@ msgid "add" msgstr "aggiungi" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:60 msgid "Remove project" msgstr "Rimuovi progetto" @@ -5206,6 +5435,7 @@ msgid "remove" msgstr "rimuovi" +# tooltip #: hugin1/hugin/xrc/batch_toolbar.xrc:66 msgid "Search directory" msgstr "Cerca cartella" @@ -5214,123 +5444,15 @@ msgid "adddir" msgstr "aggdir" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "Coppia di immagini precedente" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "Coppia di immagini successiva" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "Modalità:" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "linea verticale" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "linea orizzontale" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Ingrandimento:" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "Adatta alla finestra" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Regolazione precisa" - -# tooltip -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Cerca di ottimizzare il punto selezionato" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "Regolazione &precisa automatica" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "Aggiunta automatica" - -# tooltip -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "Aggiunge un punto di controllo quando ne viene selezionato un secondo" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "Stima automatica" - -# tooltip -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"Cerca di stimare lo spostamento tra le immagini e di usarlo durante il " -"posizionamento dei punti di controllo" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 -msgid "&Delete" -msgstr "Cance&lla" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 -msgid "&Add" -msgstr "&Aggiungi" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 -msgid "add a new Point" -msgstr "Aggiunge un nuovo punto" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 -msgid "Create control points for current image pair" -msgstr "Crea i punti di controllo per la coppia di immagini corrente" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 -msgid "Remove control points in clouds" -msgstr "Rimuovi i punti di controllo sulle nuvole" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 -msgid "Remove worst control points" -msgstr "Rimuovi i punti di controllo peggiori" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 -msgid "Control Points" -msgstr "Punti di controllo" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:17 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 -msgid "Delete" -msgstr "Cancella" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:24 -msgid "Select by Distance" -msgstr "Seleziona per distanza" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Descrizione:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Descrizione:" #: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 #: hugin1/hugin/xrc/image_variable_dlg.xrc:547 msgid "Type:" msgstr "Tipo:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (di A. Jenny)" - #: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 msgid "All images at once" msgstr "Tutte le immagini in una volta" @@ -5431,9 +5553,131 @@ msgid "Parameters for Control Point Detectors" msgstr "Parametri del ricercatore di punti di controllo" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Nomi file non validi" +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "Coppia di immagini precedente" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "Coppia di immagini successiva" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "Modalità:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "linea verticale" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "linea orizzontale" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Ingrandimento:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "Adatta alla finestra" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Regolazione precisa" + +# tooltip +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Cerca di ottimizzare il punto selezionato" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "Regolazione &precisa automatica" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "Aggiunta automatica" + +# tooltip +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "Aggiunge un punto di controllo quando ne viene selezionato un secondo" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "Stima automatica" + +# tooltip +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"Cerca di stimare lo spostamento tra le immagini e di usarlo durante il " +"posizionamento dei punti di controllo" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 +msgid "&Delete" +msgstr "Cance&lla" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 +msgid "&Add" +msgstr "&Aggiungi" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 +msgid "add a new Point" +msgstr "Aggiunge un nuovo punto" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 +msgid "Create control points for current image pair" +msgstr "Crea i punti di controllo per la coppia di immagini corrente" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 +msgid "Remove control points in clouds" +msgstr "Rimuovi i punti di controllo sulle nuvole" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 +msgid "Remove worst control points" +msgstr "Rimuovi i punti di controllo peggiori" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 +msgid "Control Points" +msgstr "Punti di controllo" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:17 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 +msgid "Delete" +msgstr "Cancella" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:24 +msgid "Select by Distance" +msgstr "Seleziona per distanza" + +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Attenzione: nome file non valido" + +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"I file seguenti esistono già.\n" +"Verranno sovrascritti durante l'importazione dei file RAW.\n" +"Sovrascriverli?" + +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Sì" + +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "No" #: hugin1/hugin/xrc/edit_script_dialog.xrc:4 msgid "Edit Panorama Tools Script" @@ -5455,21 +5699,153 @@ msgid "Discard changes and cancel" msgstr "Tralasciare le modifiche e annullare" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Raggruppa per:" + +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Sovrapposizione minima:" + +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Sovrapposizione minima per il riconoscimento dell'output delle pile\n" +"Con -1 saranno utilizzate le pile assegnate nel progetto" + +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Massima differenza Ev:" + +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Massima differenza EV per il riconoscimento dei livelli di output" + +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Visualizza" + +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Generale" + +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Dati EXIF" + +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Posizione" + +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parametri obiettivo" + +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Parametri fotometrici" + +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Tipo obiettivo" + +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Aggiungi immagini..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Tipo obiettivo:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Moltiplicatore lunghezza focale:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Caratteristiche corrispondenti" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Impostazioni:" + +# tooltip +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "" +"Esegui il ricercatore di punti di controllo selezionato sulle immagini " +"selezionate" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Ottimizza" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometria:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Calcola" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometria:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Immagine selezionata" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Carica dati obiettivo..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "" +"Inserire il campo inquadrato orizzontale (HFOV), la lunghezza focale o il " +"fattore di ritaglio:" + +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" + +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "gradi" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Dati fotocamera e obiettivo" + # (ndt) imbardata: rotazione sull'asse verticale #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Imbardata:" # (ndt) o beccheggio: rotazione lungo l'asse orizzontale nel piano ortogonale alla direzione di scatto #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Inclinazione:" # (ndt) rotazione lungo l'asse di scatto #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Rollio:" @@ -5477,34 +5853,11 @@ msgid "Translation parameter" msgstr "Parametri di traslazione" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Posizione" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "Gradi di vista (v):" @@ -5606,7 +5959,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Aiuto" @@ -5622,6 +5975,7 @@ msgid "Link position of images in each stack" msgstr "Collega la posizione delle immagini in ogni pila" +# tooltip #: hugin1/hugin/xrc/image_variable_dlg.xrc:689 msgid "" "Check this option if the images were shot on a tripod.\n" @@ -5629,161 +5983,79 @@ "other." msgstr "" "Selezionare questa opzione se le immagini sono state catturate utilizzando " -"un treppiede.\n" -"Deselezionare l'opzione se le immagini di ogni pila devono essere " -"reciprocamente allineate." - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:694 -msgid "Image stack" -msgstr "Pila d'immagini" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:719 -msgid "Enter image count per stack" -msgstr "Inserire il numero di immagini per pila" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:732 -#, fuzzy -msgid "Predefined setups:" -msgstr "Sequenza definita dall'utente: %s" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:744 -#, fuzzy -msgid "Load" -msgstr "Carica maschera" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 -msgid "Save" -msgstr "Salva" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:770 -msgid "Test" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:808 -#, fuzzy -msgid "Manipulate image variables" -msgstr "Modifica variabili immagine..." - -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Raggruppa per:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Sovrapposizione minima:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Sovrapposizione massima per il riconoscimento dell'output delle pile" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Massima differenza Ev:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Massima differenza EV per il riconoscimento dei livelli di output" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Visualizza" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Generale" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Dati EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parametri obiettivo" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Parametri fotometrici" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Tipo obiettivo" +"un treppiede.\n" +"Deselezionare l'opzione se le immagini di ogni pila devono essere " +"reciprocamente allineate" -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Aggiungi immagini..." +#: hugin1/hugin/xrc/image_variable_dlg.xrc:694 +msgid "Image stack" +msgstr "Pila d'immagini" -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Tipo obiettivo:" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:719 +msgid "Enter image count per stack" +msgstr "Inserire il numero di immagini per pila" -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Moltiplicatore lunghezza focale:" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:732 +msgid "Predefined setups:" +msgstr "Impostazioni predefinite:" -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Caratteristiche corrispondenti" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:744 +msgid "Load" +msgstr "Carica" -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Impostazioni:" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:751 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 +msgid "Save" +msgstr "Salva" -# tooltip -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "" -"Esegui il ricercatore di punti di controllo selezionato sulle immagini " -"selezionate" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:770 +msgid "Test" +msgstr "Prova" -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Ottimizza" +#: hugin1/hugin/xrc/image_variable_dlg.xrc:808 +msgid "Manipulate image variables" +msgstr "Modifica variabili immagine" -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometria:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" +msgstr "Riferimento WB:" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Calcola" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "dcraw" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometria:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "Parametri aggiuntivi di dcraw:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Immagine selezionata" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Carica dati obiettivo..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Elaborazione del profilo:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Inserire il campo inquadrato orizzontale (HFOV), la lunghezza focale o il " -"fattore di ritaglio:" +"Lasciare vuoto per utilizzare le impostazioni predefinite di RawTherapee" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "darktable" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "gradi" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "Convertitore RAW" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Dati fotocamera e obiettivo" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importa" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5930,14 +6202,6 @@ msgid "Don't ask again" msgstr "Non chiedere di nuovo" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Sì" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "No" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5969,6 +6233,7 @@ "corrispondente alle immagini. Collegare la posizione delle immagini in ogni " "pila?" +# tooltip #: hugin1/hugin/xrc/main_frame.xrc:317 hugin1/hugin/xrc/main_tool.xrc:51 msgid "Re-optimize" msgstr "Ri-ottimizza" @@ -6001,21 +6266,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importa posizioni da un file XML Papywizard" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Annulla" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Annulla l'ultima azione" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Ripeti" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Ripete l'ultima azione" @@ -6051,21 +6316,20 @@ "combaciano, come in molti panorami grandangolari" #: hugin1/hugin/xrc/main_menu.xrc:34 -#, fuzzy msgid "Ignore &line control points" -msgstr "Crea punti di controllo" +msgstr "Ignora i punti di controllo su &linea" +# tooltip #: hugin1/hugin/xrc/main_menu.xrc:35 hugin1/hugin/xrc/optimize_panel.xrc:51 -#, fuzzy msgid "Use only normal control points in optimization." -msgstr "Numero di punti di controllo in questa immagine" +msgstr "Utilizza per l'ottimizzazione solo i punti di controllo normali" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Ottimizza" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Esegue nuovamente l'ottimizzatore con le impostazioni attuali" @@ -6078,9 +6342,8 @@ msgstr "Esegue la regolazione precisa su tutti i punti di controllo" #: hugin1/hugin/xrc/main_menu.xrc:49 -#, fuzzy msgid "Remove control points in &masks" -msgstr "Rimuovi i punti di controllo nella maschera" +msgstr "Rimuovi i punti di controllo nella &maschera" # tooltip #: hugin1/hugin/xrc/main_menu.xrc:50 @@ -6095,17 +6358,16 @@ msgid "Run a python script" msgstr "Esegue uno script di Python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Visualizza" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 -#, fuzzy +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" -msgstr "Schermo intero" +msgstr "Schermo &intero" # tooltip -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Mostra la finestra principale di Hugin a schermo intero" @@ -6134,75 +6396,66 @@ msgstr "Mostra la finestra dell'anteprima OpenGL" #: hugin1/hugin/xrc/main_menu.xrc:82 -#, fuzzy msgid "&Photos" -msgstr "Foto" +msgstr "&Foto" #: hugin1/hugin/xrc/main_menu.xrc:84 msgid "Show the Photos panel" -msgstr "Mostra il pannello delle foto" +msgstr "Mostra la scheda delle foto" #: hugin1/hugin/xrc/main_menu.xrc:87 -#, fuzzy msgid "&Masks" -msgstr "Maschere" +msgstr "&Maschere" #: hugin1/hugin/xrc/main_menu.xrc:89 msgid "Show the Masks panel" -msgstr "Mostra il pannello delle maschere" +msgstr "Mostra la scheda delle maschere" #: hugin1/hugin/xrc/main_menu.xrc:92 -#, fuzzy msgid "&Control Points" -msgstr "Punti di controllo" +msgstr "&Punti di controllo" #: hugin1/hugin/xrc/main_menu.xrc:94 msgid "Show the Control Points panel" msgstr "Mostra la scheda dei punti di controllo" #: hugin1/hugin/xrc/main_menu.xrc:97 -#, fuzzy msgid "&Optimizer" -msgstr "Ottimizzatore" +msgstr "&Ottimizzatore" #: hugin1/hugin/xrc/main_menu.xrc:99 msgid "Show the Optimizer panel" msgstr "Mostra la scheda dell'ottimizzatore" #: hugin1/hugin/xrc/main_menu.xrc:102 -#, fuzzy msgid "&Exposure" -msgstr "Esposizione" +msgstr "&Esposizione" #: hugin1/hugin/xrc/main_menu.xrc:104 msgid "Show the Exposure panel" msgstr "Mostra la scheda dell'esposizione" #: hugin1/hugin/xrc/main_menu.xrc:107 -#, fuzzy msgid "&Stitcher" -msgstr "Assemblatore" +msgstr "&Assemblatore" #: hugin1/hugin/xrc/main_menu.xrc:109 msgid "Show the Stitcher panel" msgstr "Mostra la scheda dell'assemblatore" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 -#, fuzzy +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" -msgstr "Semplice" +msgstr "&Semplice" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 -#, fuzzy +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" -msgstr "Avanzato" +msgstr "&Avanzata" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 -#, fuzzy +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" -msgstr "Esperto" +msgstr "&Esperto" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "Inter&faccia" @@ -6212,98 +6465,98 @@ #: hugin1/hugin/xrc/main_menu.xrc:132 msgid "Stitch with the settings on the pano tabs" -msgstr "Unisci con le impostazioni nelle schede del panorama" +msgstr "Unisce con le impostazioni nelle schede del panorama" #: hugin1/hugin/xrc/main_menu.xrc:135 -#, fuzzy msgid "Stitch &user defined output..." -msgstr "Assembla output definito dell'utente..." +msgstr "Assembla output definito dall'&utente..." #: hugin1/hugin/xrc/main_menu.xrc:136 msgid "Stitch with the settings from a user defined output sequence" msgstr "" -"Unisci con le impostazioni di una sequenza di output definita dall'utente" +"Unisce con le impostazioni di una sequenza di output definita dall'utente" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." -msgstr "Informazioni sui diversi pulsanti e altre cose." +msgstr "Informazioni sull'uso del programma" -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Suggerimento del giorno" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Mostra uno dei suggerimenti del giorno" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Scorciatoie da &tastiera" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Domande poste di frequente" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "I&nformazioni" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "Preferen&ze" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nuovo" +# tooltip #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nuovo progetto" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Apri" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Apre un progetto" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Salva" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Salva il progetto attuale" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Sa&lva come" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Salva il progetto attuale in un nuovo file" @@ -6319,19 +6572,19 @@ "Scrive il progetto attuale in un file PTStitcher compatibile, utile per " "l'elaborazioni in serie" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "Progetti utilizzati &recentemente" # tooltip -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Elenca i file di progetto utilizzati di recente" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Avvia elaborazione in serie" @@ -6341,7 +6594,7 @@ #: hugin1/hugin/xrc/main_menu.xrc:207 hugin1/hugin/xrc/main_menu.xrc:237 msgid "Merges an existing project file with the current project." -msgstr "Unisce un progetto esistente con quello corrente." +msgstr "Unisce un progetto esistente con quello corrente" #: hugin1/hugin/xrc/main_menu.xrc:210 msgid "Import settings from Papywizard &XML file..." @@ -6358,7 +6611,7 @@ #: hugin1/hugin/xrc/main_menu.xrc:215 hugin1/hugin/xrc/main_menu.xrc:241 msgid "" "Assign the settings of a previously saved project to the current images." -msgstr "Applica le impostazioni di un progetto salvato alle immagini attuali." +msgstr "Applica le impostazioni di un progetto salvato alle immagini attuali" #: hugin1/hugin/xrc/main_menu.xrc:249 msgid "&Close editor" @@ -6384,6 +6637,7 @@ msgid "Open a project file" msgstr "Apre un file progetto" +# tooltip #: hugin1/hugin/xrc/main_tool.xrc:25 msgid "Save project as" msgstr "Salva il progetto con nome" @@ -6416,7 +6670,7 @@ msgid "Show the OpenGL preview image" msgstr "Mostra l'immagine di anteprima OpenGL" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Anteprima panorama" @@ -6473,15 +6727,10 @@ msgstr "Escludi regione da tutte le immagini con questo obiettivo" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Esporta" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importa" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Copia" @@ -6521,15 +6770,16 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:221 msgid "All images of selected lens" -msgstr "Tutte le immagini degll'obiettivo selezionato" +msgstr "Tutte le immagini dell'obiettivo selezionato" +# tooltip #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" -"Applica tutte le modifiche a tutte le immagine con lo stesso obiettivo delle " -"immagini selezionate." +"Applica le modifiche a tutte le immagini con lo stesso obiettivo di quelle " +"selezionate" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 #: hugin1/hugin/xrc/pano_panel.xrc:376 @@ -6539,12 +6789,12 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:257 #: hugin1/hugin/xrc/pano_panel.xrc:358 msgid "Left:" -msgstr "Sinistra:" +msgstr "Sinistro:" #: hugin1/hugin/xrc/mask_editor_panel.xrc:281 #: hugin1/hugin/xrc/pano_panel.xrc:394 msgid "Right:" -msgstr "Destra:" +msgstr "Destro:" #: hugin1/hugin/xrc/mask_editor_panel.xrc:302 #: hugin1/hugin/xrc/pano_panel.xrc:411 @@ -6609,7 +6859,6 @@ #: hugin1/hugin/xrc/optimize_panel.xrc:31 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:30 -#, fuzzy msgid "" "Any variables below which are marked [x] will be optimized.\n" "Unmarked variables [ ] will act as references or anchors." @@ -6618,15 +6867,12 @@ "Le variabili non selezionate [] sono i riferimenti o i blocchi." #: hugin1/hugin/xrc/optimize_panel.xrc:42 -#, fuzzy msgid "Only use control points between activated images." -msgstr "" -"Usa solamente i punti di controllo tra le immagini selezionate nell'anteprima" +msgstr "Usa solamente i punti di controllo tra le immagini attivate" #: hugin1/hugin/xrc/optimize_panel.xrc:50 -#, fuzzy msgid "Ignore line control points" -msgstr "Crea punti di controllo" +msgstr "Ignora punti di controllo su linea" # (ndt) pulsante #: hugin1/hugin/xrc/optimize_panel.xrc:65 @@ -6640,7 +6886,8 @@ msgid "execute the PTOptimizer engine" msgstr "Esegue il motore PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientamento immagine" @@ -6662,9 +6909,8 @@ msgstr "Ottimizzazione fotometrica" #: hugin1/hugin/xrc/optimize_photo_panel.xrc:41 -#, fuzzy msgid "Only use activated images." -msgstr "Ottimizza solo le &immagini selezionate" +msgstr "Usa solo le immagini selezionate" #: hugin1/hugin/xrc/optimize_photo_panel.xrc:42 msgid "" @@ -6687,39 +6933,40 @@ msgid "Interpolator (i):" msgstr "Interpolatore (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubica)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineare" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Nearest neighbour" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +# tooltip +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Approssimazione dei valori tra i pixel sorgente" @@ -6748,7 +6995,7 @@ msgid "Enfuse options" msgstr "Opzioni di enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Campo inquadrato:" @@ -6815,8 +7062,8 @@ "Calculate crop borders such that the final image has the largest area " "without excess" msgstr "" -"Calculate crop borders such that the final image has the largest area " -"without excess" +"Calcola il bordo di ritaglio in modo che l'immagine finale copra l'area " +"maggiore senza parti vuote" # tooltip #: hugin1/hugin/xrc/pano_panel.xrc:481 hugin1/hugin/xrc/pano_panel.xrc:1274 @@ -6923,10 +7170,6 @@ msgid "Image fusion:" msgstr "Fusione immagine:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Unione HDR:" @@ -7032,17 +7275,17 @@ msgid "Output parameters" msgstr "Parametri di output" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Modalità di unione:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" -msgstr "Cucitura netta (più veloce)" +msgstr "cucitura netta (più veloce)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" -msgstr "Cucitura fusa" +msgstr "cucitura fusa" #: hugin1/hugin/xrc/pref_dialog.xrc:15 msgid "Resource Usage" @@ -7104,36 +7347,49 @@ #: hugin1/hugin/xrc/pref_dialog.xrc:145 msgid "Autorotate images for display." -msgstr "" +msgstr "Ruota automaticamente le immagini per la visualizzazione" # tooltip #: hugin1/hugin/xrc/pref_dialog.xrc:146 -#, fuzzy msgid "This affects the control points editor and mask editor." -msgstr "Rimuove i punti di controllo all'interno delle aree mascherate." +msgstr "" +"Questa opzione interessa l'editor dei punti di controllo e delle maschere" + +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "Eseguibile di dcraw:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(Vuoto per predefinita di sistema)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "Eseguibile di RTI-cli:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "Eseguibile di darktable-cli:" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Opzioni file" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Cartella temporanea:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(Vuoto per predefinita di sistema)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Nome predefinito del file di progetto :" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Prefisso predefinito dell'output:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 -#, fuzzy, c-format +#: hugin1/hugin/xrc/pref_dialog.xrc:329 +#, c-format msgid "" "The following placeholders are replaced automatically:\n" "%firstimage - filename of first image file\n" @@ -7153,7 +7409,7 @@ "%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" +"%directory - nome cartella (percorso del primo file immagine)\n" "%projection - nome proiezione\n" "%focallength - lunghezza focale\n" "%date - data (della prima immagine)\n" @@ -7163,44 +7419,44 @@ "%lens - obiettivo (della prima immagine)\n" "%projectname - nome file di progetto (solo per il prefisso dell'output)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Nomi file predefiniti" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Nomi file" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Caricamento immagini" # (ndt) opzione -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Allinea automaticamente le immagini dopo il caricamento" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Identifica le linee verticali" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Identifica le linee verticali nelle immagini per livellare il panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Rimuovi i punti di controllo su nuvole (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Passi opzionali dell'assistente" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Allineamento automatico" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7208,39 +7464,39 @@ "Numero punti di controllo\n" "per sovrapposizione" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" -msgstr "Riduci panorama finale del" +msgstr "Riduci panorama finale al" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "% della larghezza massima" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor punti di controllo" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Visualizzazione HDR e 16-bit" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Curva" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineare" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmica" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "Usata per la visualizzazione nella GUI" @@ -7248,31 +7504,31 @@ # dovrebbe essere la larghezza della parte # sovrapposta tra le due immagini ma non mi è # molto chiara... -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Larghezza zona:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixel" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Larghezza area ricerca:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "% larghezza immagine" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Larghezza area ricerca locale:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Soglia di correlazione:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7280,11 +7536,11 @@ "0: nessuna similarità\n" "1: massima similarità" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Soglia picco curvatura:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7292,118 +7548,118 @@ "0: nessun picco\n" "0.2: picco distintivo" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Ricerca ciclica" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Abilita la ricerca della rotazione (più lenta, ma precisa)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Angolo di partenza:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" -msgstr "Angolo di fermata:" +msgstr "Angolo di arrivo:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Passi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Ricerca dei punti di controllo" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programma di ricerca dei punti di controllo" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nuovo..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Modifica..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Sposta su" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Sposta giù" # (ndt) intende la lingua del programma -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Imposta predefinita" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "L'assistente sta utilizzando l'impostazione predefinita." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Formato dell'output" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Formato file predefinito:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" -msgstr "formato di output predefinito del panorama finale" +msgstr "Formato di output predefinito del panorama finale" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Compressione TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" -msgstr "compressione TIFF predefinita" +msgstr "Compressione TIFF predefinita" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Qualità JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "impostazioni della compressione JPEG predefinita" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Programma per l'unione" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Programma predefinito per l'unione:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Programma di unione predefinito da utilizzare nei nuovi progetti" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processore" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&assembla&progetto" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Il motore che eseguirà l'assemblaggio" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Avvia immediatamente l'assemblaggio" # tooltip -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7411,23 +7667,24 @@ msgstr "" "Se selezionata, il processore riprenderà immediatamente l'elaborazione della " "coda dei lavori. Diversamente il processore rimane in pausa fino a quando " -"l'utente non lo avvia manualmente." +"l'utente non lo avvia manualmente" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Sovrascrivi i file esistenti" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +# Tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" "ATTENZIONE: i file esistenti verranno sovrascritti senza chiederne conferma" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Output prolisso" # tooltip -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7435,19 +7692,19 @@ "Abilitare per ottenere i dettagli; utile per segnalare i problemi o per " "seguire gli sviluppi del progetto" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Assemblaggio" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Copia i metadati nel file finale usando ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Opzioni ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7461,7 +7718,7 @@ "Per creare un argfile di esempio lasciare vuoti i campi e selezionare " "«Modifica...»." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7469,19 +7726,20 @@ "Il seguente argfile verrà utilizzato per copiare i tag dalla prima immagine " "alle immagini intermedie." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Argfile Exiftool intermedio:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Vuoto per predefinita di sistema" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Modifica l'argfile ExifTool selezionato" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7491,27 +7749,29 @@ "al panorama finale.\n" "É aggiunto al precedente argfile per le immagini intermedie." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Argfile Exiftool finale:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Crea dati XMP per Photosfera" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." -msgstr "Verrà fatto solo per le immagini di output equirettangolari" +msgstr "Valido solo per le immagini di output equirettangolari" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Opzioni avanzate" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Numero di thread:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7521,86 +7781,86 @@ "Nona ed enblend/enfuse abilitati a OpenMP sono in grado di utilizzare " "diversi thread per l'elaborazione.\n" "Impostare questo valore al numero massimo di processori o core di processori " -"disponibili nel sistema." +"disponibili nel sistema" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 per il riconoscimento automatico" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Assemblaggio (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Interpolatore predefinito (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Crea le immagini ritagliate di default" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Utilizza la GPU per la rimappatura (SPERIMENTALE)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "Usa la GPU per la rimappatura" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +# tooltip +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Utilizza la GPU della scheda video per accelerare la rimappatura" # (ndt) opzione -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Usa un programma enblend alternativo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Eseguibile di enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Argomenti predefiniti:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Questi sono gli argomenti predefiniti per i nuovi progetti.\n" -" È possibile modificarli per un singolo progetto nella scheda " -"«Assemblatore».\n" +"È possibile modificarli per un singolo progetto nella scheda «Assemblatore».\n" "Non usare gli argomenti -w, -o e --compression: sono già impostati da Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "enblend" # (ndt) opzione -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Usa un programma enfuse alternativo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Eseguibile di enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programmi" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parametri di Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Soglia SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7608,20 +7868,20 @@ "maggiore di 0,5: meno sensibile\n" "minore di 0,5: più sensibile" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Dimensione del filtro Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "piccolo" # (ndt) pulsante -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "grande" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7630,7 +7890,7 @@ "«piccolo» permette di esaminare i punti di controllo vicini al bordo " "dell'immagine" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7641,82 +7901,79 @@ "Per velocizzare l'elaborazione, viene usato solo un sottoinsieme casuale dei " "punti." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Numero di punti per immagine:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Ottimizzatore fotometrico" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Avvisi" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" "Mostra messaggio relativo al salvataggio del file di progetto e al prefisso " "di output" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Mostra avviso relativo all'elevata differenza nell'esposizione quando si " "aggiungono le immagini" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Dopo il comando \"Modifica PC\"" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Chiedi all'utente" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Ottimizza di nuovo il panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Non ottimizzare il panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Strumento «Modifica PC» (nella finestra dell'anteprima veloce)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Varie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Preferenze di Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 -#, fuzzy +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "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\"." +"Questo argfile è richiamato con la riga di comando\n" +"\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Modifica argfile ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 -#, fuzzy +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "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" -"\"." +"Questo argfile è richiamato con la riga di comando\n" +"\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7752,11 +8009,12 @@ "\n" "I segnaposto sono sensibili alle lettere maiuscole/minuscole." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +# tooltip +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centra l'anteprima orizzontalmente" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centra" @@ -7765,25 +8023,29 @@ msgstr "Mostra tutto il panorama" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Stima il campo inquadrato" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Adatta" -# (ndt) suggerimento, negli altri non c'è il punto... +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:18 msgid "Automatically straighten a wavy horizon" msgstr "Raddrizza automaticamente un orizzonte ondulato" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Raddrizza" +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:23 hugin1/hugin/xrc/preview_frame.xrc:53 msgid "Numerical Transform" msgstr "Trasformazione numerica" @@ -7793,6 +8055,7 @@ msgid "Num. Transf." msgstr "Trasform. num." +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:29 msgid "Auto update" msgstr "Aggiorna automaticamente" @@ -7801,6 +8064,7 @@ msgid "Auto" msgstr "Automatico" +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:35 msgid "Update preview" msgstr "Aggiorna l'anteprima" @@ -7862,14 +8126,17 @@ msgid "Identify" msgstr "Identifica" +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:298 msgid "Match images to their numbers" msgstr "Fa corrispondere le immagini ai relativi numeri" +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:318 msgid "Use full photometric correction (slow)" msgstr "Utilizza la correzione fotometrica completa (lento)" +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:326 msgid "" "Show lines between the ends of each control point. The longer the line, the " @@ -7878,6 +8145,7 @@ "Mostra delle linee tra le coppie di punti di controllo. Maggiore è la " "lunghezza della linea, maggiore è l'errore" +# tooltip #: hugin1/hugin/xrc/preview_frame.xrc:374 msgid "" "Sets the exposure value of the panorama to the mean exposure of all images." @@ -7885,33 +8153,34 @@ "Imposta il valore di esposizione del panorama alla media delle esposizioni " "di tutte le immagini." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Selezionatore del grigio" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +# tooltip +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corregge il bilanciamento del bianco globale selezionando un'area in grigio " -"neutro." +"neutro" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Modifica PC" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Crea o elimina i punti di controllo nel rettangolo selezionato" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Sfondo:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Scala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7925,176 +8194,156 @@ "* Fare clic su una linea per modificare le immagini associate nella scheda " "«Punti di controllo»." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Layout" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guide:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Regola dei terzi" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Rapporto aureo" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonale" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Metodo della diagonale" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Triangolo aureo (sopra)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Triangolo aureo (sotto)" -# (ndt) suggerimento, negli altri non c'è il punto... -#: hugin1/hugin/xrc/preview_frame.xrc:643 +# tooltip +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Raddrizza automaticamente un orizzonte ondulato" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Modalità di trascinamento:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Applica" -# tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Sposta il panorama o trascina le immagini in posizione" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Sposta/trascina" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Imposta la regione di ritaglio al rettangolo più grande coperto dalle " "immagini" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "Autoritaglio HDR" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Imposta la regione di ritaglio al rettangolo più grande coperto dalla pila " "di immagini" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" -msgstr "Sinistra:" +msgstr "sinistra:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" -msgstr "Superiore:" +msgstr "sopra:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" -msgstr "Destra:" +msgstr "destra:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" -msgstr "Inferiore:" - -#: hugin1/hugin/xrc/preview_frame.xrc:945 -msgid "Reset crop to maximal possible area" -msgstr "Reimposta il ritaglia alla massima superficie possibile" +msgstr "sotto:" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Modifica la regione di ritaglio del panorama" +#: hugin1/hugin/xrc/preview_frame.xrc:969 +msgid "Reset crop to maximal possible area" +msgstr "Reimposta il ritaglio alla massima superficie possibile" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Editor panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Panoramica" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Mostra l'anteprima della sfera del panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" -msgstr "Griglia" +msgstr "&Griglia" # Tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Mostra una griglia" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" -msgstr "Tutte le immagini" +msgstr "&Tutte le immagini" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" -msgstr "Immagine con l'esposizione media di ogni pila" +msgstr "Immagine con l'esposizione &media di ogni pila" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" -msgstr "Immagine più luminosa di ogni pila" +msgstr "Immagine più &luminosa di ogni pila" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" -msgstr "Immagine più scura di ogni pila" +msgstr "Immagine più s&cura di ogni pila" # tooltip -#: hugin1/hugin/xrc/preview_frame.xrc:1147 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" -msgstr "Mantieni le immagini selezionate" +msgstr "&Mantieni le immagini selezionate" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 -#, fuzzy +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" -msgstr "Ripristina selezione" +msgstr "&Ripristina selezione" #: hugin1/hugin/xrc/reset_dialog.xrc:20 msgid "Translation parameters" @@ -8118,7 +8367,7 @@ #: hugin1/hugin/xrc/reset_dialog.xrc:130 msgid "Reset values" -msgstr "Ripristina valori" +msgstr "Ripristino valori" #: hugin1/hugin/xrc/data/tips.txt:3 msgid "" @@ -8159,8 +8408,8 @@ "If the horizon of a panorama is wavy, use the straighten function in the " "preview window to straighten it" msgstr "" -"Se l'orizzonte di un panorama risulta ondulato, usare la funziona " -"«Raddrizza» nella finestra dell'anteprima per raddrizzarlo." +"Se l'orizzonte di un panorama risulta ondulato, usare la funziona «Raddrizza» " +"nella finestra dell'anteprima per raddrizzarlo." #: hugin1/hugin/xrc/data/tips.txt:8 msgid "" @@ -8191,19 +8440,17 @@ msgstr "" "Hugin supporta diversi ricercatori di punti di controllo forniti da terzi " "(come Autopano, Autopano-SIFT-C e Panomatic), attraverso un meccanismo in " -"stile plugin raggiungibile in «Preferenze->Ricercatori di punti di " -"controllo»." +"stile plugin raggiungibile in «Preferenze->Ricercatori di punti di controllo»." #: hugin1/hugin/xrc/data/tips.txt:11 -#, fuzzy msgid "" "Sometimes the control point detector can not find connections between all " "images. In this case, control points have to be created manually, using the " "control points tab in the panorama editor." msgstr "" -"A volte il ricercatore di punti di controllo potrebbe non trovare delle " -"connessioni tra le immagini. In questo caso, i punti di controllo devono " -"essere creati manualmente all'interno della scheda «Punti di controllo»." +"A volte il ricercatore di punti di controllo non trova delle connessioni tra " +"tutte le immagini. In questo caso, i punti di controllo devono essere creati " +"manualmente all'interno della scheda «Punti di controllo»." #: hugin1/hugin/xrc/data/tips.txt:12 msgid "" @@ -8224,7 +8471,6 @@ # (ndt) ho trovato solamente punto nodale nel glossario della Canon # e viene indicato anche come punto principale #: hugin1/hugin/xrc/data/tips.txt:14 -#, fuzzy msgid "" "Rotating the camera around the entrance pupil (sometimes also called \"nodal " "point\") avoids parallax errors and makes panorama creation a lot easier. " @@ -8233,7 +8479,8 @@ msgstr "" "Ruotare la fotocamera attorno alla pupilla di ingresso (chiamata anche " "\"punto nodale\") evita errori di parallasse e rende la creazione di " -"panorami molto più facile." +"panorami molto più facile. La wiki di Panotools offre una guida per individuare tale puntoper i propri obiettivi." #: hugin1/hugin/xrc/data/tips.txt:15 msgid "Tutorials on hugin are available on http://hugin.sf.net/tutorials" @@ -8346,8 +8593,8 @@ #: hugin1/hugin/xrc/data/tips.txt:30 msgid "Press \"1\" in the control points tab to zoom out to 100% view." msgstr "" -"Premere «1» all'intero della scheda «Punti di controllo» per avere " -"l'immagine al 100% della sua grandezza." +"Premere «1» all'intero della scheda «Punti di controllo» per avere l'immagine " +"al 100% della sua grandezza." #: hugin1/hugin/xrc/data/tips.txt:31 msgid "" @@ -8357,7 +8604,7 @@ msgstr "" "Dopo che enblend ha unito il panorama, l'immagine di output rimappata " "(disponibile nella stessa cartella dell'immagine del panorama) può essere " -"usata per il ritocco con Gimp o Photoshop." +"ritoccata con Gimp o Photoshop." #: hugin1/hugin/xrc/data/tips.txt:32 msgid "" @@ -8386,7 +8633,6 @@ "immagini catturate con obiettivi grandangolari o fisheye." #: hugin1/hugin/xrc/data/tips.txt:35 -#, fuzzy msgid "" "Multiple images can be selected in the photo tabs in the panorama editor. " "Commands will act on all selected images." @@ -8412,6 +8658,92 @@ "L'ottimizzazione di tutti i parametri di distorsione ha senso solo con " "immagini fortemente sovrapposte e molti punti di controllo ben distribuiti." +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "Aggiungere almeno un'immagine RAW all'elenco prima di importarla" + +#~ msgid "Import Raw Files" +#~ msgstr "Importa file RAW" + +#~ msgid "(WB reference)" +#~ msgstr "(Riferimento BB)" + +#~ msgid "Images" +#~ msgstr "Immagini" + +#~ msgid "Add image(s)..." +#~ msgstr "Aggiungi immagini..." + +#~ msgid "Add other images to list" +#~ msgstr "Aggiunge altre immagini all'elenco" + +#~ msgid "Remove image" +#~ msgstr "Rimuovi immagine" + +#~ msgid "Remove selected image from list" +#~ msgstr "Rimuove dall'elenco le immagini selezionate" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "" +#~ "Marca le immagini selezionate come riferimento per il bilanciamento del " +#~ "bianco" + +#~ msgid "Converter settings" +#~ msgstr "Impostazioni del convertitore" + +#~ msgid "Import &raw file(s)..." +#~ msgstr "Importa file &RAW" + +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "Converte file RAW in TIFF e li aggiunge al progetto corrente" + +# tooltip +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Sposta il panorama o trascina le immagini in posizione" + +# tooltip +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Modifica la regione di ritaglio del panorama" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Utilizza la GPU per la rimappatura (SPERIMENTALE)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Tutti i file immagine|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." +#~ "png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." +#~ "exr;*.EXR|File JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|File TIFF (*." +#~ "tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|File PNG (*.png)|*.png;*.PNG|File " +#~ "HDR (*.hdr)|*.hdr;*.HDR|File EXR (*.exr)|*.exr;*.EXR|Tutti i file (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (di A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&assembla&progetto" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Interfaccia" @@ -9259,9 +9591,6 @@ #~ msgid "Full frame" #~ msgstr "Full-frame" -#~ msgid "Remove image: " -#~ msgstr "Rimuovi immagine:" - #~ msgid "Remove images: " #~ msgstr "Rimuovi immagini:" @@ -9325,9 +9654,6 @@ #~ msgid "Hugin - Panorama Tools Frontend" #~ msgstr "Hugin - Interfaccia degli strumenti per panorami" -#~ msgid "Lens settings" -#~ msgstr "Impostazioni dell'obiettivo" - #~ msgid "Panorama settings" #~ msgstr "Impostazioni del panorama" @@ -9481,15 +9807,6 @@ #~ msgid "Format" #~ msgstr "Formato" -#~ msgid "JPEG (*.jpg)" -#~ msgstr "JPEG (*.jpg)" - -#~ msgid "PNG (*.png)" -#~ msgstr "PNG (*.png)" - -#~ msgid "TIFF (*.tif)" -#~ msgstr "TIFF (*.tif)" - #~ msgid "TIFF&mask (*.tif)" #~ msgstr "TIFF&mask (*.tif)" diff -Nru hugin-2018.0.0+dfsg/src/translations/ja.po hugin-2019.0.0+dfsg/src/translations/ja.po --- hugin-2018.0.0+dfsg/src/translations/ja.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/ja.po 2019-02-17 15:24:33.000000000 +0000 @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: Hugin 2011.1.0.83a530eea793\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2011-05-15 18:59+0900\n" "Last-Translator: KITAGAWA, Masahiro \n" "Language-Team: 日本語 \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: hugin1/base_wx/AssistantExecutor.cpp:68 #: hugin1/hugin/PapywizardImport.cpp:460 @@ -50,16 +50,16 @@ msgid "Searching for best crop..." msgstr "雲など動きのある対象上のコントロールポイントを探しています…" -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "付属の実行ファイル %s が見つかりませんでした。システム標準のパスを使用しま" "す。" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -87,9 +87,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "%s というファイルは存在します。上書きしますか?" @@ -126,7 +126,7 @@ msgstr "焦点距離換算係数は正でなければなりません" #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -136,24 +136,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -174,8 +178,8 @@ msgstr "対角魚眼レンズ" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "正距円筒（Equirectangular）" @@ -206,11 +210,13 @@ msgid "builtin" msgstr "内蔵" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "カスタム（EMoR）" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "リニア" @@ -234,16 +240,16 @@ msgid "Error loading lens parameters" msgstr "レンズの設定を読み込み中にエラー" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "レンズの設定を保存" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "レンズ設定ファイル (*.ini)|*.ini|すべて (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "プロジェクトを保存…" @@ -275,22 +281,23 @@ msgid "Error pausing process %ld, code 2" msgstr "プロセス %ld を停止。エラーコード 2." -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "キャンセル" @@ -328,12 +335,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "プロジェクトファイルを開けませんでした：" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "スクリプトを開けませんでした：%s" @@ -343,8 +350,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "PanoTools スクリプトの構文解析にエラー：%s" @@ -358,17 +365,17 @@ msgid "Could not create temporary file" msgstr "一時ファイルを作成できませんでした" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "スティッチ中にエラー" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -376,11 +383,11 @@ "既存の画像に上書きしますか？\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "既存ファイルの上書き" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -389,12 +396,12 @@ "プロジェクトのスティッチ中にエラー\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "アシスタントの実行中にエラー" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -403,295 +410,305 @@ "アシスタントの実行中にエラー\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "スチッチング中" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "バージョン：%s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "ディレクトリ：" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "出力" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "ブレンド：" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "内部エラー" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "露出" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Enfuseのオプション" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Enfuseのオプション" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "画像1枚あたりのサンプル数" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "出力" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "キャンバスのサイズ：" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "投影法：" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "GPU を用いたマッピング（実験的）" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "パノラマの出力：" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "露出補正あり、普通のダイナミックレンジ" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "スタックからの露出合成" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "任意の配列からの露出合成" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "ハイダイナミックレンジ" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "再マッピングされた画像" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "露出補正なし、普通のダイナミックレンジ" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "結合されたスタック：" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 #, fuzzy msgid "Exposure fused stacks" msgstr "スタックからの露出合成" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "レイヤー：" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "ブレンドされた露出の似ているレイヤー、露出補正なし" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "切り抜きを画像に合わせる" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "CPU の数：" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "ファイル名：" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "キャンバスのサイズ：" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "レンズタイプ：" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "露出（Eev）：" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "再マッピングされた画像" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "画像を追加" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "ブレンドされた露出の似ているレイヤー、露出補正なし" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "出力" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "スタック番号を変更" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "再マッピングされた画像" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "スタック番号を変更" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "%s をスティッチ中" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 #, fuzzy msgid "first image" msgstr "切り抜きを画像に合わせる" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 #, fuzzy msgid "last image" msgstr "画像を追加" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 #, fuzzy msgid "directory" msgstr "ディレクトリ：" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 #, fuzzy msgid "Camera maker" msgstr "カメラの製造者：" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 #, fuzzy msgid "Camera model" msgstr "カメラの型番：" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -699,36 +716,70 @@ msgid "Lens" msgstr "レンズ" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 #, fuzzy msgid "unknown projection" msgstr "Thoby 投影法" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "画像を追加" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "ファイル %s を読み込み中" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "エラー" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -738,25 +789,11 @@ "そのファイル名は使用できない文字を含んでいます: %s\n" "Hugin では扱えません。ファイル名を訂正してください。" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"全ての画像ファイル|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG ファイル (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF ファイル (*.tif," -"*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG ファイル (*.png)|*.png;*.PNG|HDR ファイ" -"ル (*.hdr)|*.hdr;*.HDR|EXR ファイル (*.exr)|*.exr;*.EXR|すべて (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -768,27 +805,27 @@ msgstr "入力された \"%s\" は %s に対して無効な数値です\n" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "警告" @@ -807,7 +844,7 @@ msgid "Could not save information into database." msgstr "プロジェクトファイルを読み込めませんでした：%s" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -818,11 +855,11 @@ "%s\n" "中止" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "認識できない画像のファイル形式" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -831,7 +868,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -842,77 +879,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -920,44 +957,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "プロジェクトをリセット" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "コマンドラインの引数" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "既存ファイルの上書き" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "画像ファイルが見つかりません" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "画像編集プログラムの選択" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -968,16 +1005,17 @@ "\n" "OK を押すと削除します。" -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "エラー発生" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "画像を追加" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -986,32 +1024,32 @@ "エラー。テンプレートに必要な画像は %d 枚ですが、\n" "このプロジェクトの画像は %d 枚です。\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "テンプレートの適用ができませんでした" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "プロジェクトの読み込み中にエラー" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "結果" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "Bundle内にXRCディレクトリが見つかりません。" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "致命的エラー" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1043,7 +1081,7 @@ "追加した画像のEXIF 情報が追加済みの画像と整合性がありません。\n" "正しい画像を選んでいるか、再度チェックしてください。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "画像を追加: キャンセル" @@ -1056,9 +1094,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1075,7 +1113,7 @@ msgstr "線を探しています…" #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "完了" @@ -1089,11 +1127,11 @@ "まず「線を探す」を実行してください。もし線が検出されないなら、パラメータを変" "更してください。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "レンズの歪みのパラメータを最適化中…" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1103,149 +1141,149 @@ "まず「線を探す」を実行してください。もし線が検出されないなら、パラメータを変" "更してください。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 #, fuzzy msgid "Save lens parameters to ini file" msgstr "レンズやカメラの数値をファイルに保存します。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "レンズやカメラの数値をファイルに保存します。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #, fuzzy msgid "Saving lens data" msgstr "レンズの設定を読み込む" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "レンズを保存" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "プロジェクトを保存" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Huginプロジェクト (*.pto)|*.pto|すべて (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 #, fuzzy msgid "Removing temporary files..." msgstr "一時的なキーポイントファイルをクリーンアップ" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "アシスタントを実行中" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "スレッドの数：" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "実行中：コマンド \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "オペレーティングシステム：%s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 ビット" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 ビット" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "アーキテクチャ：%s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "メモリの空き：%ld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "アクティブなコードページ：%u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "バージョン：%s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "リソースへのパス：%s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "データへのパス：%s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "カメラとレンズのデータ" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "プロジェクトファイルを読み込めませんでした：%s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "ライブラリ" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "OS X では Autopano (http://autopano.kolor.com) が使えません" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "代わりに Autopano-Sift を使います" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1253,91 +1291,96 @@ "少なくともひとつ空欄があります。\n" "記入を確認してください。" -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "重なり合った画像すべてを繋ごうとしています…" -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "コントロールポイントが無い画像ペアにのみ有効です" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "コントロールポイント検出プログラムの選択" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "実行ファイル (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "左 x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "左 y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "右 x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "右 y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "配置" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "距離" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "コントロールポイントを追加しました" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "同じような場所を探しています…" -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "微調整の実行中にエラー" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"ポイントを微調整しました。角度：%.0f 度 / 相関係数：%0.3f / 曲率：%0.3f, " -"%0.3f " +"ポイントを微調整しました。角度：%.0f 度 / 相関係数：%0.3f / 曲率：%0.3f, %" +"0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "ポイントの場所を変更するか、右クリックでこのポイントを追加します" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "推定された場所は画像の外です" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "同じような場所が見つかりませんでした。" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1347,31 +1390,37 @@ "類似性を目視でチェックして下さい。\n" "相関係数（%.3f）が環境設定で指定された閾値より低いです。" -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "新しい直線を追加" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "直線 %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "相関係数の閾値" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "通常" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "鉛直な線" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "水平な線" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1381,93 +1430,94 @@ "生成される数を減らすには、\n" "値を大きくして下さい。" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "角の検出 閾値" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "コントロールポイント生成" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "角の検出 スケール" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "コントロールポイント生成中にエラー：\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "右の画像上のポイントを指定してください" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "" "画像をつないでいるコントロールポイントがないと Celeste を実行出来ません。" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste実行中" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "モデルファイルをロードしています" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "%lu 個のコントロールポイントを削除しました" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste の結果" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "クリーン中" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "作成" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "雲など動きのある対象上のコントロールポイントの削除を試みます" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "バッチをクリア" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "外れたコントロールポイントを削除するのに統計的手法を用いる" @@ -1479,23 +1529,23 @@ msgid "Could not process event!" msgstr "イベントを処理できませんでした！" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "全体＃" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "左画像" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "右画像" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "ペア＃" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1503,7 +1553,7 @@ "選択するコントロールポイントの誤差の最小値を入力してください。\n" "この値より誤差の大きいポイントが選択されます。" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "コントロールポイントを選択" @@ -1579,60 +1629,60 @@ "画像を動かすにはドラッグします（Shift キーを押した状態だと拘束します）。回転" "させるにはマウスの右ボタンまたは Ctrl キーを押してドラッグします。" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "ファストパノラマプレビュー" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "ファイル (&F)" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "表示する写真" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "すべて" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "なし" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "隠す" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "垂直画角" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "縦方向の視野を調節します" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "水平画角" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "横方向の視野を調節します" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "プレビュー" @@ -1640,89 +1690,94 @@ msgid "Overview" msgstr "概観" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "投影法のパラメータをデフォルト値にリセット" -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "パラメータ：" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 #, fuzzy msgid "No images loaded." msgstr "画像が読み込まれていません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu 枚の画像が読み込まれました。" -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "" "画像は %lu 個のコントロールポイントで接続されています。\n" "\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%d個の接続されていない画像グループがあります： " -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "画像やコントロールポイントに変更がありました。配置を更新する必要があります。" -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "" "最適化後の誤差　平均： %.1f ピクセル　最大：%.1f ピクセル\n" "\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "心射方位（Rectilinear）" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "心射円筒（Cylindrical）" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Yaw (横)の値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Pitch (縦)の値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Roll (回転)の値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X の値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y の値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z の値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "値は数値でなければなりません。" -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1730,55 +1785,55 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "差分（違い）" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "自動で切り抜き" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "最適な切り抜きサイズを計算" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "上辺の値は0より大きい整数である必要があります" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "左辺の値は0より大きい整数である必要があります" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "右辺の値は0より大きい整数である必要があります" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "下辺の値は0より大きい整数である必要があります" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "左の境界は右の境界より小さい必要があります。" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "上の境界は下の境界より小さい必要があります。" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "水平画角の値が不正です. この投影法の水平画角の最大値は %lf です." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "無効な垂直画角です。この投影法の垂直画角の最大は %lf です。" -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1786,23 +1841,23 @@ "画角が広い場合、心射方位投影法でパノラマを作成すると縁に向かって強く引き伸ば" "されたものになります。\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "" "画角が水平方向にのみ広いため、代わりに心射円筒投影法を使ってみてください。" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "非常に幅の広いパノラマには、代わりに正距円筒投影法を使ってみてください。" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " パンニーニ投影法を使ってみることもできます。" -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1813,7 +1868,7 @@ "伸ばされたものになります。正距円筒投影法では縦幅がより狭い範囲に同じ内容を収" "めることができます。" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1823,7 +1878,7 @@ "ができます。正距円筒投影法とは違って、心射円筒投影法では鉛直な線はまっすぐに" "保たれます。" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1833,7 +1888,7 @@ "魚眼パノラマ投影と違って、ステレオ投影法は等角投影です。等角投影では点の周り" "の角度が保たれるため、目で見やすくなることが多いです。" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1844,13 +1899,13 @@ "ものになります。これを魚眼パノラマ投影法では圧縮できるため、中心部を適度に保" "ちつつ広い画角を収めることができます。" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "心射方位投影法を用いると直線を真っ直ぐなままに保てます。" -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1859,27 +1914,27 @@ "情報バーを隠しているため、投影法の選び方についてのヒントは表示されません。" "バーを再び表示させたい場合は、環境設定で有効にしてください。" -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "通常、個別" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "モザイク" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "モザイク、個別" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosphere" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "モザイク平面" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1887,24 +1942,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1913,31 +1968,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "コントロールポイントをクリーン" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "処理：" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "同じような場所を探しています…" -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "ペアの順序をチェック中" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1945,7 +2000,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1953,7 +2008,7 @@ "GLEW の初期化エラー\n" "ファストプレビューウィンドウを開けません。" -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 #, fuzzy msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " @@ -2000,7 +2055,7 @@ msgstr "マスクの数：" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "切り抜き" @@ -2036,7 +2091,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 #, fuzzy msgid "Stacks" @@ -2238,7 +2293,7 @@ msgid "Shutter speed" msgstr "シャッター速度：" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 #, fuzzy msgid "ISO" msgstr "ISO 感度：" @@ -2414,101 +2469,101 @@ msgid "Camera response parameter" msgstr "カメラのレスポンスカーブ" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "レンズ" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr "スタック：" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "出力" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "出力" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "リンク" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 #, fuzzy msgid "Select all" msgstr "すべてリセット" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 #, fuzzy msgid "Unselect all" msgstr "選択中でない" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 #, fuzzy msgid "Edit image variables..." msgstr "画像ごとの数値：" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "マスクを保存" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "マスクを保存" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "表示する写真" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "画像1枚あたりのサンプル数" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 #, fuzzy msgid "Control points" msgstr "コントロールポイント" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2541,12 +2596,24 @@ msgid "Did you know..." msgstr "知っていましたか…？" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "バージョン %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2554,130 +2621,130 @@ "致命的なインストールエラー\n" "ファイル data/splash.png が以下の場所に見つかりません：" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "ヘルプ (&H)" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "動作 (&A)" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "出力" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "編集 (&E)" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "アシスタントを実行中" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "アシスタントを実行中" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "起動完了" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "最適化" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "露出" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "閉じる前にパノラマの変更を保存しますか？" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "閉じる前にパノラマの変更を保存しますか？" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "閉じる前にパノラマの変更を保存しますか？" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "保存せずに閉じると、最後に保存してから後の変更は破棄されます" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "保存せずに閉じると、最後に保存してから後の変更は破棄されます" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "保存せずに閉じると、最後に保存してから後の変更は破棄されます" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "保存しない" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "保存せずに閉じる" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "強制終了されました" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "プロジェクト %s を保存しました" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - パノラマ写真作成ソフト" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 #, fuzzy msgid "Panorama editor" msgstr "プレビュー" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2690,36 +2757,36 @@ "\n" "（エラーコード：%s）" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "PTmenderスクリプトに書き出し" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmenderファイル (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "プロジェクトの読み込み中： " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "プロジェクトを読み込みました" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "画像の読み込み中" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "プロジェクトの読み込み中にエラー " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "プロジェクトを開く" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2730,11 +2797,11 @@ "このファイルは「ファイル - 開く」では開けません。\n" "代わりにこの画像ファイルを今のプロジェクトに追加しますか？" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "プロジェクトを開く: キャンセル" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2742,7 +2809,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2750,34 +2817,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "プロジェクトファイルを読み込めませんでした：%s" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "プロジェクトを開く" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "マスクファイル (*.msk)|*.msk;|すべて (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "テンプレートプロジェクトを選択" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "全コントロールポイントの微調整を実行中" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "微調整の実行中" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2805,23 +2872,23 @@ "られます。\n" "\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "微調整の結果" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "マスク内のコントロールポイントを除去中" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Python スクリプトを選択" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python スクリプト (*.py)|*.py;|すべて (*)|*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2830,13 +2897,13 @@ "ファイル \"%s\" が見つかりません。\n" "名前が変更されたか、移動されたか、削除されたと思われます。" -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "エラー！" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2844,54 +2911,54 @@ "%s にあるはずの Celeste モデルが見つかりません。Hugin が正しくインストールさ" "れていない可能性があります。" -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Celeste モデルファイル %s を読み込めませんでした。" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "アシスタントを実行中" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "警告：%d 個の接続されていない画像グループがあります：" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2905,7 +2972,7 @@ "コントロールポイントを追加し終わったら、もう一度「配置」ボタンを押して下さ" "い。" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2913,24 +2980,24 @@ "アシスタントが正常に完了しませんでした。プロジェクトファイルの結果をチェック" "してください。" -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "プロジェクトファイルが見つかりません" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "PTBatcherGui を実行できません。" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 #, fuzzy msgid "Launched incorrect programme" msgstr "正しくないプログラムを実行しました。" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "マスクタイプ" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2938,29 +3005,29 @@ "多角形マスクを作成するには画像の上で左クリックし、最後の点で右クリックしま" "す。" -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "マスクを保存" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "マスクファイル (*.msk)|*.msk;|すべて (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "マスクを読み込む" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "マスクを読み込み：キャンセル" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "ファイル %s のマスクを構文解析できませんでした。" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "有効な値を入力してください" @@ -3093,7 +3160,7 @@ msgstr "測光学的パラメータの最適化" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "画像の読み込み中" @@ -3138,68 +3205,72 @@ msgid "Photometric optimization finished" msgstr "測光学的パラメータの最適化処理が終了" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "画像を追加…" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "撮影時刻で追加…" -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 #, fuzzy msgid "No matching images found." msgstr "画像の読み込み中" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "画像ごとの数値：" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "選択した画像を取り除く" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "位置決めの基準にする" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "露出修正の基準にする" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 #, fuzzy msgid "New lens" msgstr "新規レンズ" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "レンズの変更…" -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "レンズ番号を入力" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "レンズ番号" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "レンズ番号を変更" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "レンズの設定を読み込む" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 #, fuzzy msgid "Load lens from ini file" msgstr "レンズの数値をファイルから読み込む" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3207,12 +3278,12 @@ "画像がひとつしか選択されていません。\n" "読み込まれたパラメータを同じレンズによる画像全てに適用してよいですか？" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "質問" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3222,109 +3293,109 @@ "レンズ設定ファイルを適用すると想定外の結果になることがあります。\n" "設定を適用して構いませんか？" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 #, fuzzy msgid "Save lens to ini file" msgstr "レンズやカメラの数値をファイルに保存します。" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 #, fuzzy msgid "Remove control points" msgstr "%d 個のコントロールポイントを削除しました" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 #, fuzzy msgid "Selected images have no control points." msgstr "コントロールポイントをクリーン" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, fuzzy, c-format msgid "Really delete %lu control points?" msgstr "本当にコントロールポイント %lu 個を消去しますか？" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "コントロールポイントを消去" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "コントロールポイントをクリーン" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "コントロールポイントをクリーン中" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "ペアの順序をチェック中" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "プロジェクト全体をチェック中" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "クリーン終了" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 #, fuzzy msgid "Remove control points on clouds" msgstr "マスク内のコントロールポイントを除去" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 #, fuzzy msgid "Reset positions" msgstr "プロジェクトをリセット" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "パラメータをリンク" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 #, fuzzy msgid "Reset lens parameters" msgstr "XYZ パラメータをリセットしますか？" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 #, fuzzy msgid "Reset photometric parameters" msgstr "XYZ パラメータをリセットしますか？" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "新規スタック" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "スタックの変更…" -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "新しいスタック番号を入力" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "スタック番号" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "スタック番号を変更" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 #, fuzzy msgid "Set stack size..." msgstr "スタックの変更…" -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "品質：" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3395,64 +3466,64 @@ msgid "Hammer-Aitoff Equal Area" msgstr "ランベルト正積方位（Lambert Equal Area Azimuthal）" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "幅の値は0より大きい整数である必要があります" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "高さの値は0より大きい整数である必要があります" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 #, fuzzy msgid "Left boundary must be smaller than right." msgstr "左の境界は右の境界より小さい必要があります。" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 #, fuzzy msgid "Top boundary must be smaller than bottom." msgstr "上の境界は下の境界より小さい必要があります。" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " この機能はまだ実装されていません!" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " この機能はまだ実装されていません!" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " この HDRMerge プログロムのオプションはまだ実装されていません" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "一時プロジェクトファイルを作成できませんでした" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "出力ファイルの名前を指定" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3462,7 +3533,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3475,7 +3546,7 @@ "チャー」タブでスティッチを実行してください。現在の大きさのパノラマをスティッ" "チするには長い時間と大量のメモリが必要です。" -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3483,26 +3554,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "本当にこれほど巨大なパノラマをスティッチしますか？" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "構わずスティッチ" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "訂正する" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3533,184 +3604,202 @@ msgid "Miscellaneous" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "システム標準" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Català（カタルーニャ語）" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "简体中文（中国語簡体字）" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "繁体中文（中国語繁体字）" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Čeština（チェコ語）" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Danish（デンマーク語）" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Nederlands（オランダ語）" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "English（英語）" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Français（フランス語）" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Deutsch（ドイツ語）" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Magyar（ハンガリー語）" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiano（イタリア語）" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "日本語" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polski（ポーランド語）" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Português do Brasil（ブラジルポルトガル語）" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Русский（ロシア語）" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovenčina（スロバキア語）" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Español（スペイン語）" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Svenska（スウェーデン語）" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Suomi（フィンランド語）" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Enblend を選択" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "実行ファイル (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Enfuse を選択" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "すべてリセット" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "すべてリセット" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ログファイル (*.log)|*.log|All files (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "プロジェクトファイルを読み込めませんでした：%s" -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "本当に初期設定に戻しますか？" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "初期設定を読み込む" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "まずエントリーを選択してください" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "エントリーを選択" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3718,29 +3807,29 @@ "最後の設定は削除できません。\n" "少なくとも1つの設定が必要です。" -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "コントロールポイント検出プログラム %s の設定を本当に削除しますか？" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "コントロールポイント検出プログラムの設定を削除" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "コントロールポイント検出プログラムの設定を読み込む" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "コントロールポイント検出プログラムの設定 (*.setting)*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "コントロールポイント検出プログラムの設定を保存" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "最終的なパノラマで無彩色の灰色または白にしたい領域をクリックします。" @@ -3765,48 +3854,53 @@ msgid "Remove %lu control points" msgstr "%lu 個のコントロールポイントを削除しました" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "プレビュー" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "プレビューオプション" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "投影法 (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "ブレンドモード:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "出力:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "普通" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "露出 (EV):" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "圧縮：" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "投影法のパラメータ" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "パノラマの中心を左クリックで、水平線を右クリックで設定します。" -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "パノラマの中心を左クリックで、水平線を右クリックで設定します。" @@ -3823,7 +3917,7 @@ msgid "Click a connection to edit control points." msgstr "コネクションをクリックするとコントロールポイントを編集できます。" -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3831,33 +3925,115 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "検出中：%s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "閉じる" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, fuzzy, c-format msgid "Directory '%s' does not exists" msgstr "" "ディレクトリ %s は存在しません。\n" "存在するディレクトリを指定してください。" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "バッチ処理" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "PTBatcher（Hugin プロジェクトファイル用のバッチ処理プログラム）を開く" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Hugin レンズ補正GUI" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3871,11 +4047,11 @@ "\"%s\" を見つけられませんでした。\n" "正しくインストールできていないか、パスの設定が間違っています。" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "一時的なキーポイントファイルをクリーンアップ" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3884,15 +4060,15 @@ "%namefile か %i か%s でコントロールポイント検出プログラムへの入力ファイルを指" "定してください。" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "コントロールポイント検出中にエラー " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3903,14 +4079,14 @@ "これは Windows による制約です。\n" "写真の数を減らすか、画像ファイルをパスの短いフォルダに移動してみてください。" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "選択された画像が多すぎます" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3922,38 +4098,38 @@ "\n" " 以下のコマンドを実行できませんでした：%s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute エラー" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "コントロールポイントの検出中" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "以下のコマンドを実行できませんでした：%s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3962,9 +4138,9 @@ "コマンド：%s\n" "エラーコード：%d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3979,13 +4155,13 @@ "\n" "実行されたコマンド：%s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "コントロールポイント検出に失敗" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3993,7 +4169,7 @@ "%i で入力ファイルを、%k のキー生成ステップ用のキーポイントファイルを指定して" "ください。" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4001,11 +4177,11 @@ "マッチングステップ用のキーポイントファイルを %k で、出力プロジェクトファイル" "を %o で指定してください。" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "キーファイルの作成中" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4018,11 +4194,11 @@ "\n" " 以下のコマンドを実行できませんでした：%s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "デフォルト" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4030,264 +4206,264 @@ "実行中のバッチ処理をクリアできませんでした。\n" "キャンセルしますか？" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "バッチをクリアしました。" -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "エラー：状態を取得できませんでした。インデックス番号 %d のプロジェクトはリス" "トに存在しません。" -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "エラー：バッチファイルを読み込めません。" -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "バッチが成功しました。" -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Batchが終了しましたが、エラーがあります。" -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "システム終了を開始" -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "システム終了中…" -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "システム終了を開始" -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "システム終了を開始" -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "プロジェクトを保存" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "出力ファイル名が指定されていません" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "プロジェクトが指定されていません。" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - スティッチ" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - アシスタント" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "" "エラー：削除できませんでした。番号 %d のプロジェクトはリストに存在しません。" -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "エラー：プロジェクトファイルを削除できません " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "バッチを実行中…" -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "バッチは既に処理中です。" -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "実行中：コマンド \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "スティッチ中：%s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "検出中：%s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "エラー：状態をセットできませんでした。インデックス番号 %d のプロジェクトはリ" "ストに存在しません。" -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "何もしていません…" -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "なし" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "終了後にシャットダウン" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "実行するコマンドラインアプリケーション名を入力してください：" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "アプリケーションを入力" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "プロジェクトファイルを検索するディレクトリを指定" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "プロジェクトのソースファイルを指定" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "プロジェクトをディレクトリから追加中 " -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "プロジェクト %s をスティッチ・キューに追加します。" -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "プロジェクト %s をアシスタント・キューに送る" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "バッチ処理を中止しました" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugin のバッチ処理プログラム" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "出力プロジェクト名を指定 " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "アシスタント対象のファイル名は変更できません。" -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "プロジェクトを選択してください" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "プロジェクトを選択してください" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "開くバッチファイルを指定" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "バッチファイル (*.ptb)|*.ptb;|すべて (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "アプリケーションはHuginでは開けません。" -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "" "プロジェクトが選択されていません。プロジェクトなしで Hugin を実行しますか？" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "バッチ処理が一時停止しました" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "バッチ処理を継続…" -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4295,7 +4471,7 @@ "リストの中に失敗したプロジェクトがあります。\n" "それも削除しますか？" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4303,16 +4479,16 @@ "実行中のプロジェクトは削除できません。\n" "プロジェクトの実行をキャンセルしますか？" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "プロジェクトを削除しました " -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "削除するプロジェクトを選択してください" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4320,16 +4496,16 @@ "実行中のプロジェクトはリセットできません。\n" "プロジェクトの実行をキャンセルしますか？" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "プロジェクトをリセット " -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "リセットするプロジェクトを選択してください" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4337,31 +4513,31 @@ "実行中のプロジェクトはリセットできません。\n" "バッチ処理をキャンセルしますか？" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "保存するバッチファイルを指定" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "バッチファイル (*.ptb)|*.ptb;|すべて (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "バッチをクリア" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "バッチ処理の開始" @@ -4397,7 +4573,7 @@ msgid "E&xit" msgstr "終了 (&X)" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4406,11 +4582,11 @@ "リストに処理されない可能性のあるパノラマが含まれています。ダイアログを閉じた" "場合、それらは失われます。続行して構いませんか？" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Accepted" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4419,11 +4595,11 @@ "リストにまだ処理されていないパノラマが含まれています。続行するとそれらは失わ" "れます。構わず続行しますか？" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "中止" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4432,7 +4608,7 @@ "ディレクトリ %s は存在しません。\n" "存在するディレクトリを指定してください。" -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4440,7 +4616,7 @@ "パノラマが選択されていません。\n" "少なくともひとつ選択してから実行してください" -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4449,142 +4625,144 @@ "一部のプロジェクトファイルが正常に書き込めませんでした。\n" "ディレクトリの書き込み権限がないか、ディスクがいっぱいの可能性があります。" -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "選択された画像をこのプロジェクトから取り除きます。" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "パノラマを探しています" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "ファイル %s を読み込み中" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "開始" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "%d 個のパノラマが見つかりました。" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "パノラマが見つかりませんでした" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d 枚の画像：%s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "オプションの指定にエラーがあります。処理を中止します。" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 #, fuzzy msgid "PTBatcherGUI started" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "待機中" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "処理中" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "完了" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "失敗" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "ファイルが見つかりません" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "一時停止" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "プロジェクト" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "出力" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "状態" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "最終変更日時" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "出力形式" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "投影法" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "サイズ" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "エラー。id を変換できません。" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "アシスタント" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "ファイル名の変更" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "プロジェクトをリセット" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Hugin で編集" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "取り除く" @@ -4620,16 +4798,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "ログファイル (*.log)|*.log|All files (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "プロジェクトファイルを読み込めませんでした：%s" -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "プロジェクトファイルの選択" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4639,7 +4817,7 @@ "Hugin では扱えません。ファイル名を訂正してください。" #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Huginについて" @@ -4672,19 +4850,19 @@ msgstr "システム" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4762,8 +4940,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "選択…" @@ -4854,7 +5035,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "オプション…" @@ -4888,10 +5069,6 @@ msgid "Send selected panoramas to queue" msgstr "選択されたパノラマをキューに送る" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "閉じる" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "パノラマを探しています" @@ -4994,12 +5171,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "終了 (&Q)" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "このプログラムを終了します。" @@ -5104,44 +5281,154 @@ msgid "adddir" msgstr "ディレクトリから追加" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "前のペア" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "次のペア" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "説明：" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "モード：" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "タイプ：" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "鉛直な線" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "すべての画像を一括処理" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "水平な線" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "スタックを用いたパノラマ" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "ズーム：" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "複数行にわたるパノラマ" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "画面にあわせる" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "スタックを用いた複数行にわたるパノラマ" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "微調整" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "あらかじめ揃えられたパノラマ" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "アクティブなポイントの最適化を試みます" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "検出プログラム" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "1段階の検出プログラム" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "プログラム：" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "オプション：" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "クリーンアップの引数：" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "2段階の検出プログラム" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "スタックの検出プログラム" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"スタック上で実行するコントロールポイント検出プログラムがない場合、空のままに" +"しておいてください。" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "上級オプション" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "この設定には上級オプションはありません。" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"以下のパターンが実行前に代入されます：\n" +"%o -- 出力されるプロジェクトファイル名 (Autopano 使用時は \"0.oto\" が追加さ" +"れます)\n" +"%p -- 画像ペア毎のコントロールポイント数\n" +"%v -- 最初の画像の水平画角\n" +"%f -- 最初の画像の投影法 (0-4, PanoTools での指定番号)\n" +"%i -- 入力する画像ファイル群\n" +"%namefile -- 入力画像のファイル名をリストしたファイル\n" +"%s -- 入力する PanoTools スクリプト\n" +"%k -- 中間キーファイル" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "コントロールポイント検出プログラムのパラメータ" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "前のペア" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "次のペア" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "モード：" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "鉛直な線" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "水平な線" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "ズーム：" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "画面にあわせる" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "微調整" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "アクティブなポイントの最適化を試みます" #: hugin1/hugin/xrc/cp_editor_panel.xrc:261 msgid "auto fine-&tune" @@ -5198,7 +5485,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "削除" @@ -5206,157 +5493,193 @@ msgid "Select by Distance" msgstr "距離で選択する" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "説明：" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "タイプ：" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "デフォルトのファイル形式：" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (A. Jenny作)" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "すべての画像を一括処理" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "スタックを用いたパノラマ" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +#, fuzzy +msgid "No" +msgstr "なし" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "複数行にわたるパノラマ" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Panorama Tools スクリプトを編集する" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "スタックを用いた複数行にわたるパノラマ" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Panorama Tools エンジンに送られるスクリプトです。これを編集するのは高等テク" +"ニックです。" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "あらかじめ揃えられたパノラマ" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "変更を反映して続ける" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "検出プログラム" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "変更を破棄してキャンセル" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "1段階の検出プログラム" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "プログラム：" +#: hugin1/hugin/xrc/images_panel.xrc:42 +#, fuzzy +msgid "Minimum overlap:" +msgstr "線の長さの最小値：" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "オプション：" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "クリーンアップの引数：" +#: hugin1/hugin/xrc/images_panel.xrc:67 +#, fuzzy +msgid "Maximum Ev difference:" +msgstr "差分（違い）" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "2段階の検出プログラム" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "一般" + +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "スタックの検出プログラム" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +#, fuzzy +msgid "Positions" +msgstr "画像の位置" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "レンズの数値" + +#: hugin1/hugin/xrc/images_panel.xrc:96 +#, fuzzy +msgid "Photometric parameters" +msgstr "測光学的パラメータの最適化" + +#: hugin1/hugin/xrc/images_panel.xrc:130 +#, fuzzy +msgid "Lens type" +msgstr "レンズタイプ：" + +#: hugin1/hugin/xrc/images_panel.xrc:145 +#, fuzzy +msgid "Add images..." +msgstr "画像を追加" + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "レンズタイプ：" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "焦点距離換算係数：" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" msgstr "" -"スタック上で実行するコントロールポイント検出プログラムがない場合、空のままに" -"しておいてください。" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "上級オプション" +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "設定：" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "この設定には上級オプションはありません。" +#: hugin1/hugin/xrc/images_panel.xrc:254 +#, fuzzy +msgid "Run selected control point detector on the selected images" +msgstr "選択された画像をつないでいるコントロールポイントを取り除きます" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "以下を最適化：" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +#, fuzzy +msgid "Geometric:" +msgstr "幾何学的" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" msgstr "" -"以下のパターンが実行前に代入されます：\n" -"%o -- 出力されるプロジェクトファイル名 (Autopano 使用時は \"0.oto\" が追加さ" -"れます)\n" -"%p -- 画像ペア毎のコントロールポイント数\n" -"%v -- 最初の画像の水平画角\n" -"%f -- 最初の画像の投影法 (0-4, PanoTools での指定番号)\n" -"%i -- 入力する画像ファイル群\n" -"%namefile -- 入力画像のファイル名をリストしたファイル\n" -"%s -- 入力する PanoTools スクリプト\n" -"%k -- 中間キーファイル" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "コントロールポイント検出プログラムのパラメータ" +#: hugin1/hugin/xrc/images_panel.xrc:314 +#, fuzzy +msgid "Photometric:" +msgstr "測光学的" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "選択された画像" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -#, fuzzy -msgid "Invalid filenames" -msgstr "デフォルトのファイル形式：" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "レンズの設定を読み込む" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Panorama Tools スクリプトを編集する" +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "水平画角、または焦点距離と焦点距離換算係数を入力：" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." -msgstr "" -"Panorama Tools エンジンに送られるスクリプトです。これを編集するのは高等テク" -"ニックです。" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "水平画角 (v) :" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "変更を反映して続ける" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "度" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "変更を破棄してキャンセル" +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "カメラとレンズのデータ" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Yaw (横)：" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Pitch (縦)：" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Roll (回転)：" @@ -5365,35 +5688,11 @@ msgid "Translation parameter" msgstr "パラメータをリンク" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -#, fuzzy -msgid "Positions" -msgstr "画像の位置" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "水平画角 (v)：" @@ -5494,7 +5793,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "ヘルプ" @@ -5538,8 +5837,8 @@ msgstr "マスクを読み込む" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "保存する…" @@ -5552,127 +5851,47 @@ msgid "Manipulate image variables" msgstr "画像ごとの数値：" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:42 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Minimum overlap:" -msgstr "線の長さの最小値：" +msgid "WB reference:" +msgstr "環境設定… (&P)" -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:67 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 #, fuzzy -msgid "Maximum Ev difference:" -msgstr "差分（違い）" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "一般" +msgid "Additional dcraw parameters:" +msgstr "パラメータをリンク" -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "レンズの数値" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -#, fuzzy -msgid "Photometric parameters" -msgstr "測光学的パラメータの最適化" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -#, fuzzy -msgid "Lens type" -msgstr "レンズタイプ：" - -#: hugin1/hugin/xrc/images_panel.xrc:145 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 #, fuzzy -msgid "Add images..." -msgstr "画像を追加" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "レンズタイプ：" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "焦点距離換算係数：" +msgid "Processing profile:" +msgstr "処理：" -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "設定：" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -#, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "選択された画像をつないでいるコントロールポイントを取り除きます" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "以下を最適化：" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -#, fuzzy -msgid "Geometric:" -msgstr "幾何学的" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -#, fuzzy -msgid "Photometric:" -msgstr "測光学的" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "選択された画像" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "レンズの設定を読み込む" - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "水平画角、または焦点距離と焦点距離換算係数を入力：" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "水平画角 (v) :" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "度" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "カメラとレンズのデータ" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "インポート" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5829,15 +6048,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -#, fuzzy -msgid "No" -msgstr "なし" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5898,21 +6108,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "元に戻す (&U)" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "最後の動作を元に戻す" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "やり直し (&R)" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "最後の動作をやり直す" @@ -5959,12 +6169,12 @@ msgid "Use only normal control points in optimization." msgstr "画像1枚あたりのサンプル数" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "最適化 (&O)" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "現在の設定で最適化を再実行します" @@ -5995,16 +6205,16 @@ msgid "Run a python script" msgstr "Python スクリプトを実行" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "表示 (&V)" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "全画面表示" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Hugin のメインウィンドウを全画面表示" @@ -6088,20 +6298,20 @@ msgid "Show the Stitcher panel" msgstr "「スティッチャー」パネルを表示" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "上級オプション" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "インターフェース" @@ -6123,86 +6333,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "ボタンやボックスについての情報などがあります。" -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "今日のヒント (&T)" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "「今日のヒント」からひとつを見る" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "ショートカット (&K)" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "ショートカットの一覧" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "よく訊かれる質問と答" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "Hugin について (&A)" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "環境設定… (&P)" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "新規 (&N)" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "新規プロジェクト" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "開く (&O)" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "プロジェクトを開く" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "保存 (&S)" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "プロジェクトを保存" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "別名で保存 (&A)" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "プロジェクトを別名で保存" @@ -6217,19 +6427,19 @@ msgstr "" "プロジェクトをPTStitcher互換のスクリプトに保存します。バッチ処理に便利です。" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "最近使ったプロジェクト" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "最近使ったプロジェクトファイルのリスト" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "バッチ処理を実行 (&R)" @@ -6315,7 +6525,7 @@ msgid "Show the OpenGL preview image" msgstr "OpenGL プレビューを表示" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "プレビューを見る" @@ -6372,15 +6582,10 @@ msgstr "このレンズでのどの画像からの領域も含めない" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "エクスポート" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "インポート" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "コピー" @@ -6425,8 +6630,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6532,7 +6737,8 @@ msgid "execute the PTOptimizer engine" msgstr "最適化プログラムを実行" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "画像の位置" @@ -6577,39 +6783,39 @@ msgid "Interpolator (i):" msgstr "画像補完法 (i)：" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (バイキュービック法)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "バイリニア法" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "ニアレストネイバー法" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "画素間の補完" @@ -6637,7 +6843,7 @@ msgid "Enfuse options" msgstr "Enfuseのオプション" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "画角：" @@ -6799,10 +7005,6 @@ msgid "Image fusion:" msgstr "フュージョン：" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "Enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDRヘのマージ：" @@ -6903,16 +7105,16 @@ msgid "Output parameters" msgstr "カスタマイズ" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "ブレンドモード:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "" @@ -6981,29 +7183,45 @@ msgid "This affects the control points editor and mask editor." msgstr "マスク内のコントロールポイントを除去" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Enblend：" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "（OS の標準設定を使うには空白にします）" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Enblend：" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Enblend：" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "ファイルの設定" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "一時ディレクトリ：" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "（OS の標準設定を使うには空白にします）" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 #, fuzzy msgid "Default project filename:" msgstr "プロジェクトを開く" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 #, fuzzy msgid "Default output prefix:" msgstr "出力ファイルの名前を指定" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7021,111 +7239,111 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 #, fuzzy msgid "Default filenames" msgstr "デフォルトのファイル形式：" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 #, fuzzy msgid "Filenames" msgstr "ファイル名" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "画像の読み込み" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "画像を読み込み後、自動配置を実行する" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "鉛直な線を検出" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "画像内の鉛直な線を検出することで pano を水平に合わせる" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "雲など動きのある対象上のコントロールポイントを削除（Celeste）" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "アシスタントでの追加のステップ" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "自動配置" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" msgstr "重複している領域一カ所あたりの検出するコントロールポイントの数" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "パノラマの縮小" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "%" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "コントロールポイントの編集" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDRと16bit画像の表示" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "トーンカーブ" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "リニア" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "対数" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "ガンマ 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "表示に使用" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "パッチの幅：" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "ピクセル" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "検索する範囲の幅" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "% (画像の幅に対して)" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "ローカルな検索範囲の幅" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "相関係数の閾値" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7133,11 +7351,11 @@ "0: 全く違う\n" "1: ほとんど同じ" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "曲率のピークの閾値" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7145,118 +7363,114 @@ "0 : ピークなし\n" "0.2: はっきりとしたピーク" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "回転もさせて検索" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "回転もさせて検索する（遅いが精確）" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "開始角度：" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "終了角度：" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "ステップ数：" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "コントロールポイントの検出" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "コントロールポイント検出プログラム" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "新規…" -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "編集…" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "順番を上に" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "順番を下に" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "デフォルトに設定" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "アシスタントはデフォルト設定を使用します。" -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "出力形式" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "デフォルトのファイル形式：" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "最終的なパノラマのデフォルトの出力形式" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF の圧縮形式：" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "デフォルトの TIFF の圧縮形式" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG の画質：" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "デフォルトの JPEG の圧縮率設定" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "ブレンド：" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "デフォルトのファイル形式：" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "処理プログラム" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "スティッチを実行するエンジン" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "スティッチ処理をすぐに開始" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7266,19 +7480,19 @@ "以外の場合、処理プログラムはサスペンド状態に入り、ユーザが手動で処理を再開す" "る必要があります。" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "既存ファイルの上書き" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "警告：既存ファイルは事前確認なしに上書きされます。" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "詳細を出力" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7286,20 +7500,20 @@ "詳細を知ることができ、バグを報告するときや単にプロジェクトの進捗を確認すると" "きに便利です。" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "スティッチ中" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "メタデータを最終的なファイルに ExifTool でコピーする" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Enfuseのオプション" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7308,56 +7522,56 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "（OS の標準設定を使うには空白にします）" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "上級オプション" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "スレッドの数：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7368,83 +7582,85 @@ "えるようになります。\n" "この数字をコンピュータの CPU または CPU コアの最大数に合わせてください。" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "自動検出するには 0" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "スティッチ中" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "デフォルトの画像補完法 (i)：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "切り抜き画像をデフォルトで保存" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "GPU を用いたマッピング（実験的）" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "マッピングの高速化のためにビデオカードの GPU を利用します" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Enblendプログラムを自分で選択" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "デフォルトの引数：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "これらは新規プロジェクト用のデフォルトの引数です。\n" "値はプロジェクトごとに「スティッチャー」タブで変更できます。\n" "引数のうち -w, -o, --compression は使わないで下さい。Huginが自動的に指定しま" "す。" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Enfuseプログラムを自分で選択" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "プログラム" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celesteの設定" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVMの閾値：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7452,19 +7668,19 @@ "0.5以上：より鈍感\n" "0.5未満：より敏感" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "ガボールフィルタのサイズ：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "小" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "大" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7472,7 +7688,7 @@ "大：より正確\n" "小：画像の端に近いコントロールポイントも検証可能" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7481,78 +7697,78 @@ "周辺光量低下と露出は重なり合っている領域のカラーの値を使って測定されます。\n" "処理スピードアップのため、ランダムにサンプルされた点のみが使われます。" -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 #, fuzzy msgid "Number of points per image: " msgstr "画像1枚あたりのサンプル数" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 #, fuzzy msgid "Photometric optimizer" msgstr "測光学的パラメータの最適化" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "警告" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "パノラマを最適化中" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "最適化を実行" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "ヒントはファストプレビューウィンドウでのみ表示されます" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Hugin - 環境設定" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "左の画像上のポイントを指定してください" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7572,11 +7788,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "パノラマを横方向中央に移動" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "中央に" @@ -7584,13 +7800,15 @@ msgid "Show the whole panorama" msgstr "パノラマ全体を表示する" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "最適な画角を推定" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "フィットさせる" @@ -7598,7 +7816,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "波打っている水平線を自動的にまっすぐにします。" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "まっすぐに" @@ -7693,34 +7912,34 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "パノラマの露出を全画像の平均露出に一致させます。" -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "灰色をピックアップ" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "全体的なホワイトバランスを調整するために無彩色の灰色の領域を選択します。" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "編集 (&E)" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "コントロールポイント検出プログラムの設定を削除" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "背景：" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "スケール：" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7733,164 +7952,152 @@ "* 「コントロールポイント」タブで線をクリックすると関連する画像を編集すること" "ができます。" -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "配置" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "ガイド：" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "三分割法" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "黄金比" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "対角線" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "黄金三角形（下向き）" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "黄金三角形（上向き）" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "波打っている水平線を自動的にまっすぐにします。" -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "ドラッグモード：" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "適用" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "パノラマを移動させるか画像をドラッグします。" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "移動／ドラッグ" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "切り抜き領域を画像に内接する最大の長方形に設定" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 #, fuzzy msgid "HDR Autocrop" msgstr "自動で切り抜き" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 #, fuzzy msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "切り抜き領域を画像に内接する最大の長方形に設定" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "左:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "上:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "右:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "下:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "パノラマの切り抜き領域を変更" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 #, fuzzy msgid "Panorama &editor" msgstr "プレビュー" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 #, fuzzy msgid "&Overview" msgstr "概観" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 #, fuzzy msgid "Shows the overview of the panorama sphere." msgstr "パノラマ全体を表示する" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "グリッド" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "画像を追加" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "スタック全体で位置をリンク" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "スタック全体で位置をリンク" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "スタック全体で位置をリンク" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "選択された画像のレンズを変更します" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "プロジェクトをリセット" @@ -8189,6 +8396,75 @@ "ん。" #, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "環境設定… (&P)" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "画像" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "画像を追加" + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "もう一枚プロジェクトに画像を追加します" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "マスクを保存" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "選択した画像を取り除く" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "角の検出 スケール" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "パノラマを移動させるか画像をドラッグします。" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "パノラマの切り抜き領域を変更" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "GPU を用いたマッピング（実験的）" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "全ての画像ファイル|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." +#~ "png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." +#~ "exr;*.EXR|JPEG ファイル (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF ファ" +#~ "イル (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG ファイル (*.png)|*.png;" +#~ "*.PNG|HDR ファイル (*.hdr)|*.hdr;*.HDR|EXR ファイル (*.exr)|*.exr;*.EXR|す" +#~ "べて (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (A. Jenny作)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "enfuse" +#~ msgstr "Enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "×" + +#, fuzzy #~ msgid "Interface" #~ msgstr "インターフェース" diff -Nru hugin-2018.0.0+dfsg/src/translations/nl.po hugin-2019.0.0+dfsg/src/translations/nl.po --- hugin-2018.0.0+dfsg/src/translations/nl.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/nl.po 2019-02-17 15:24:33.000000000 +0000 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-12-12 08:49+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2019-02-07 20:14+0100\n" "Last-Translator: Harry van der Wolf \n" "Language-Team: American English \n" -"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl_NL\n" "X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -46,15 +46,15 @@ msgid "Searching for best crop..." msgstr "Zoeken naar beste uitsnede..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Extern programma %s niet gevonden in de bundel, het systeempad wordt gebruikt" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -81,9 +81,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|PNG-Bestand (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Bestand %s bestaat al, Overschrijven?" @@ -120,7 +120,7 @@ msgstr "De bijsnijfactor moet groter dan 0 zijn" #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -133,30 +133,34 @@ "Wil je nog steeds deze hoge waarde gebruiken?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" #: hugin1/base_wx/LensTools.cpp:38 hugin1/base_wx/LensTools.cpp:81 msgid "Normal (rectilinear)" -msgstr "Normaal (rectilinear)" +msgstr "Normaal (rectilineair)" #: hugin1/base_wx/LensTools.cpp:39 hugin1/base_wx/LensTools.cpp:82 msgid "Panoramic (cylindrical)" @@ -171,8 +175,8 @@ msgstr "Volledig frame fisheye" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirectangulair" @@ -203,11 +207,13 @@ msgid "builtin" msgstr "ingebouwde" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "custom (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineair" @@ -232,16 +238,16 @@ msgid "Error loading lens parameters" msgstr "Fout bij het inlezen van lensparameters" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Opslaan lensparametersbestand" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Lensprojectbestanden (*.ini)|*.ini|Alle bestanden (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Opslaan project" @@ -279,22 +285,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Fout, pauzeren bij proces %ld, code 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Annuleer" @@ -328,12 +335,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Kan projectbestand niet openen:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "Kan script: %s niet openen" @@ -343,8 +350,8 @@ msgid "Project %s does not contain any active images." msgstr "Project %s bevat geen actieve afbeeldingen." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "fout bij verwerking panotoolsscript: %s" @@ -358,17 +365,17 @@ msgid "Could not create temporary file" msgstr "Kan tijdelijk bestand niet aanmaken" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "Wachtrij is leeg. Dit zou nooit mogen gebeuren." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Fout bij samenvoegen" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -376,11 +383,11 @@ "Bestaande afbeeldingen overschrijven?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Bestaande afbeeldingen overschrijven" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -389,12 +396,12 @@ "Fout bij uitvoeren project\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Fout tijdens uitvoeren Assistent" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -403,275 +410,285 @@ "Fout bij uitvoeren van de Assistent\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Samenvoegen panorama..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Platform:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Versie:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Werk folder:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Geef uitvoernaam zonder extensie: " -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Samenvoeger:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Onbekende samenvoeger (enblend --version mislukt)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "intern" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Belichting samensmelting:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Onbekend belichting samensmelt programma (enfuse --version mislukt)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "ExifTool versie:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "MISLUKT" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Aantal actieve afbeeldingen:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Uitvoer belichtings waarde: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Canvas grootte: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projectie:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Gebruik GPU voor positioneren:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "waar" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "niet waar" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panorama uitvoer:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Belichting gecorrigeerd, laag dynamisch bereik" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Samenvoegen van lagen met verschillende belichting" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "" "Samenvoegen van lagen met verschillende belichting uit willekeurige " "afbeelding verdeling" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Hoog dynamisch bereik" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Gepositioneerde afbeeldingen:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Geen belichtings correctie, laag dynamisch bereik" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Gecombineerde lagen:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Samenvoegen lagen met verschillende belichting" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Lagen:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" "Samengevoegde lagen met gelijke belichting, zonder belichtings correctie" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "eerste ingevoerde afbeelding" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Aantal:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Bestandsnaam:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Grootte: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Respons type:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Belichting waarde: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Positioneren en samenvoegen LDR afbeeldingen..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Positioneren LDR afbeeldingen..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Samenvoegen van afbeeldingen..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Positioneren LDR afbeeldingen en samenvoegen belichtings lagen..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Positioneren LDR afbeeldingen zonder belichtings correctie..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Samenvoegen belichtings laag %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Samenvoegen van alle belichtings lagen..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Samenvoegen set nummer %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Samenvoegen alle sets..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Positioneren HDR afbeeldingen..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Samenvoegen HDR set nummer %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Samenvoegen HDR sets..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Vernieuwen metadata..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Samenvoegen gebruik makend van \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "eerste afbeelding" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "laatste afbeelding" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "Folder" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Camera maker" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Camera Model" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -679,35 +696,67 @@ msgid "Lens" msgstr "Lens" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "onbekende projectie" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Alle afbeeldingsbestanden" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "JPEG bestanden (*.jpg,*.jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "TIFF bestanden (*.tif,*.tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "PNG bestanden (*.png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "HDR bestanden (*.hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "EXR bestanden (*.exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "Ale bestanden (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "Raw bestanden" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Fout" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -718,26 +767,11 @@ "Hugin kan niet overweg met dee bestandsnamen. Hernoem uw bestand(en) en " "probeer opnieuw." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Debug rapport gegenereerd in \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Alle afbeeldingsbestanden|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" -"*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." -"exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*." -"tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG bestanden (*.png)|*.png;*.PNG|HDR " -"bestanden (*.hdr)|*.hdr;*.HDR|EXR bestanden (*.exr)|*.exr;*.EXR|All " -"bestanden (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -749,27 +783,27 @@ msgstr "Invoer \"%s\" is geen geldig getal." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Attentie" @@ -786,7 +820,7 @@ msgid "Could not save information into database." msgstr "Kon de informatie niet opslaan in het database bestand." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -796,11 +830,11 @@ "Kan afbeelding %s niet decoderen\n" "Afbreken" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Dit type afbeelding wordt niet ondersteund" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -812,7 +846,7 @@ "Hugin ondersteunt dit bestand niet. Bestand wordt overgeslagen.\n" "Converteer afbeelding naar grijstinten en open opnieuw." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -829,14 +863,14 @@ "Hugin ondersteunt deze afbeelding. Bestand wordt overgeslagen.\n" "Converteer de afbeelding naar grijstinten of RGB en open opnieuw." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin ondersteunt alleen grijstinten en RGB afbeeldingen (met en zonder alfa " "kanaal)" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -845,7 +879,7 @@ "Bestand \"%s\" is een grijstinten afbeelding, maar de andere afbeeldingen in " "het project zijn RGB afbeeldingen." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -854,7 +888,7 @@ "Bestand \"%s\" is een RGB afbeelding, maar de andere afbeeldingen in het " "project zijn grijstinten afbeeldingen." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -863,7 +897,7 @@ "Hugin ondersteunt dit samenvoegen niet. Afbeelding wordt overgeslagen.\n" "Converteer afbeelding naar grijstinten of RGB en open opnieuw." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -872,7 +906,7 @@ "Bestand \"%s\" heeft geen ingebed icc profiel, maar andere afbeeldingen in " "dit project hebben profiel \"%s\" ingebed." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -881,7 +915,7 @@ "Bestand \"%s\" heeft icc profiel \"%s\" ingebed, maar andere afbeeldingen in " "dit project hebben geen ingebed kleurprofiel." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -890,7 +924,7 @@ "Bestand \"%s\" heeft icc profiel \"%s\" ingebed maar de andere afbeeldingen " "in het project hebben kleur profiel \"%s\" ingebed." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -899,7 +933,7 @@ "Converteer s.v.p. alle afbeeldingen naar hetzelfde kleurprofiel en probeer " "opnieuw." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -907,7 +941,7 @@ "Hugin detecteerde afbeelding sets in de toegevoegde afbeeldingen en zal " "overeenkomende set nummers toekennen aan de afbeeldingen." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -917,11 +951,11 @@ "worden herschikt o.b.v. deze detectie. Bestaande set toekenningen worden " "overschreven." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Moet de positie van afbeeldingen in elke set gekoppeld worden?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -933,25 +967,25 @@ "proces te vereenvoudigen. Indien bij uit de hand geschoten afbeeldings set " "een nauwkeurige positionering vereist is, koppel dan de posities niet. " -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Koppel positie" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Koppel positie niet" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Geen sets toekennen" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Bewaar bestaande sets" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -961,16 +995,16 @@ "worden.\n" "Selecteer alstublieft de juiste afbeelding handmatig." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Afbeelding niet gevonden" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Selecteer afbeelding %s" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -981,16 +1015,17 @@ "\n" "Klik OK om te verwijderen." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Fout Gevonden" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Voeg afbeeldingen toe" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -999,32 +1034,32 @@ "Fout, template verwacht %d afbeeldingen,\n" "huidig project bevat %d afbeeldingen\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Kan template niet toepassen" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Fout bij openen projectbestand" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultaat" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc map niet gevonden in bundle" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Fatale Fout" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1060,7 +1095,7 @@ "Controleer de afbeelding om te zien of u de correcte afbeelding(en) " "toegevoegd heeft." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Voeg afbeelding toe: annuleer" @@ -1073,9 +1108,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1092,7 +1127,7 @@ msgstr "Lijnen zoeken..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Klaar" @@ -1106,11 +1141,11 @@ "U dient eerst \"Vind lijnen\" uitvoeren. Als er geen lijnen gevonden worden " "moet u de parameters aanpassen." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimaliseren van lens vervorming parameters..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1120,142 +1155,142 @@ "Voer svp \"Vind lijnen\" en \"Optimaliseer\" voordat u de lens data opslaat. " "Als er geen lijnen gevonden zijn dient u de parameters aan te passen." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Lensparameters opslaan in ini bestand" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Lensparameters opslaan in de lens database" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Lensdata opslaan" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Sla lens op..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Opslaan project bestand" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Project bestanden (*.pto)|*.pto|Alle bestanden (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "verwijderen van tijdelijke bestanden..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "Toon deze help boodschap" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Uitvoeren assistent" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Voer samenvoegen op opgegeven project uit" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Aantal gebruikte threads" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "Voorvoeging gebruikt voor samenvoegen" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "gebruik door gebruiker gedefinieerde commandos op opgegeven bestand" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "gebruik door gebruiker gedefinieerde commando's uit opgegeven bestand" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "Alleen commandos tonen" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Besturings systeem: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architectuur: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Vrij geheugen: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Actieve tekst codering: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Versie: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Pad naar bronnen: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Pad naar data: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Hugins Camera- en Lensdatabse: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Multi-threading gebruikmakend van C++11 std::thread en OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Monitor profiel: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Bibliotheken" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano van http://autopano.kolor.com is niet beschikbaar voor OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Wilt u in plaats daarvan Autopano-Sift gebruiken ?" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1263,65 +1298,66 @@ "Tenminste één invoer veld is leeg.\n" "Controleer uw invoer." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Proberen om alle overlappende afbeeldingen te verbinden." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Werk alleen op afbeelding paren zonder ijkpunten." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Selecteer ijkpunten detector programma" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "" "Uitvoerbare bestanden (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x links" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y links" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x rechts" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y rechts" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Uitlijning" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Afstand" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Nieuw ijkpunt toegevoegd" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "Gelijkvormige punten zoeken..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Fout tijdens het fijnafstemmen" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1330,19 +1366,23 @@ "Punt geoptimaliseerd, hoek: %.0f deg, correlatie coefficient: %0.3f, ronding:" "%0.3f %0.3f" -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "verander punten of klik rechtermuisknop om het paar toe te voegen" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Het berekende punt ligt buiten de afbeelding" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "Afstand tussen lijn ijkpunten te kort, fine-tuning wordt overgeslagen." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Geen gelijkvormig punt gevonden." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1350,7 +1390,7 @@ "Fout in interne transformatie.\n" "Controleer of het punt binnen de afbeelding ligt." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1361,31 +1401,36 @@ "Correlatiecoefficient (%.3f) is lager dan de gespecificeerde drempelwaarde " "in het instellingenscherm." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Voeg nieuwe Lijn toe" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Lijn %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Correlatie" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normaal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "vert. lijn" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "horiz. lijn" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1395,38 +1440,38 @@ "Kies een groter getal\n" "om minder punten te maken." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Hoek detectie drempel:" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Maak ijkpunten" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Hoekdetectieschaal" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Fout bij aanmaken van ijkpunten:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Selecteer punt in rechter afbeelding" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Selecteer punt in linker afbeelding" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Creëer ijkpunt (huidige instelling: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1434,36 +1479,36 @@ "Kan celeste niet starten zonder ten minste één ijkpunt tussen de twee " "afbeeldingen" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste wordt uitgevoerd" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Openen van model bestand" # hugin1/hugin/ImagesPanel.cpp:866, c-format -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "%lu ijkpunten verwijderd" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Resultaat van celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Opschonen" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Maakijkpunt" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1471,19 +1516,20 @@ "Maak ijkpunten voor afbeeldings paar o.b.v. geselecteerde ijkpunt detector " "uit de fotos tab. " -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Probeert ijkpunten in wolken weg te halen" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Verwijder ijkpunt" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Verwijder afwijkende ijkpunten via statistische methode" @@ -1495,23 +1541,23 @@ msgid "Could not process event!" msgstr "Kan de gebeurtenis niet verwerken!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "linker afb." -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "rechter afb." -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1519,7 +1565,7 @@ "Voer minimale foutgrens voor ijkpunten in.\n" "Alle punten met een grotere fout worden geselecteerd" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Selecteer ijkpunten" @@ -1593,60 +1639,60 @@ "Sleep om afbeeldingen te verplaatsen (gebruik shift om te beperken), of rol " "met rechts-sleep of ctrl-sleep." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Snel Panoramavoorbeeld" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Bestand" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "getoonde afbeeldingen" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Alle" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Geen" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Verberg" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "sleep om de verticale beeldhoek te wijzigen" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "sleep om de horizontale beeldhoek te wijzigen" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Voorbeeld" @@ -1654,85 +1700,90 @@ msgid "Overview" msgstr "Overzicht" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Zet de projectie parameters terug naar hun standaard waardes." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "geen afbeeldingen geladen" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu afbeeldingen ingelezen." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Afbeeldingen zijn verbonden door %lu ijkpunten.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%lu niet verbonden afbeeldings groepen \"%s\" gevonden\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Afbeeldingen of ijkpunten zijn veranderd, nieuwe uitlijning of optimalisatie " "is noodzakelijk." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Gemiddelde fout na optimalisatie: %.1f pixel, max: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectilineair" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindrisch" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Yaw-waarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Pitch-waarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Rotatiewaarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X-waarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y-waarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z-waarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "De waarde moet numeriek zijn." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "Waarde voor reeks compressie valt buiten het toegestane bereik." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1744,55 +1795,55 @@ "Maar je project heeft Tpy en Tpp parameters groter dan nul.\n" "De Tpy en Tpp parameters opnieuw instellen op nul?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "verschil" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Auto uitsnede" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Bereken optimale uitsnede" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "bovenkant moet een geheel getal groter dan 0 zijn" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "linkerkant moet een geheel getal groter dan 0 zijn" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "rechterkant moet een geheel getal groter dan 0 zijn" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "onderkant moet een geheel getal groter dan 0 zijn" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "linker grens moet kleiner zijn dan de rechter grens" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "boven grens moet kleiner zijn dan de onder grens" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Ongeldige HFOV waarde. De maximale HFOV is %lf bij deze projectie." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Ongeldige VFOV waarde. De maximale VFOV is %lf bij deze projectie." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1800,7 +1851,7 @@ "Met een grote beeldhoek worden panoramas met een rectilineaire project erg " "uitgerekt naar de zijkanten toe.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1808,17 +1859,17 @@ "Omdat de beeldhoek alleen in de horizontale richting er groot is, kun je het " "beste een cylindrische projectie proberen." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Voor een panorama met een erg grote beeldhoek kun je het beste een " "equirectangulaire projectie gebruiken." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Je kunt ook de Panini projectie proberen." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1830,7 +1881,7 @@ "Een equirectangulaire project zou dezelfde informatie plaatsen in geringere " "vertikale hoogte." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1841,7 +1892,7 @@ "Een cylindrische projectie behoudt de verticale lijnen in tegenstelling tot " "een equirectangulaire." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1853,7 +1904,7 @@ "Een conformal projectie behoudt de hoeken rond een punt waardoor het " "aangenamer is voor het oog." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1865,7 +1916,7 @@ "De Fisheye projectie comprimeert dit zodat je een grote beeldhoek behoudt " "met een goede verdeling in het midden." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1873,7 +1924,7 @@ "Bij het gebruik van de rectilineaire projectie worden de rechte lijnen ook " "recht gehouden." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1884,27 +1935,27 @@ "Als je de balk weer wilt zien kun je deze opnieuw activeren in de " "voorkeuren. " -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normaal, individueel" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mozaiek" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mozaiek, individueel" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosphere" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mozaiek plane" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1915,12 +1966,12 @@ "\n" "Moet het panorama opnieuw geoptimaliseerd worden?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "Huidige geselecteerde optimalisatie strategie is \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1928,7 +1979,7 @@ "Het geselecteerde gebied bevat geen actieve afbeelding.\n" "Selecteer een gebied dat afgedekt wordt door minstens 2 afbeeldingen." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1936,7 +1987,7 @@ "Het geselecteerde gebied wordt slechts door één afbeeldingen afgedekt.\n" "Kan geen ijkpunten genereren voor één afbeelding." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1950,27 +2001,27 @@ "\n" "Toch doorgaan?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Zoeken van ijkpunten" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Verwerken" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Herschik afbeelding naar panorama projectie..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Gelijkvormige punten zoeken..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Controleren van resultaten..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1981,7 +2032,7 @@ "\n" "Panorama opnieuw optimaliseren?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1989,7 +2040,7 @@ "Fout bij initialiseren GLEW\n" "Snelle voorbeeld venster kan niet geopend worden." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2036,7 +2087,7 @@ msgstr "Aantal maskers" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Uitsnijden" @@ -2069,7 +2120,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Het maixmale Ev verschil moet groter dan 0 zijn." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Sets" @@ -2246,7 +2297,7 @@ msgid "Shutter speed" msgstr "Sluitertijd" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2393,93 +2444,93 @@ msgid "Camera response parameter" msgstr "Cameragevoeligheid parameter" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "inactief" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "actief" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Lens %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Set %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Uitvoer set %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Uitvoer belichtings laag %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Koppel" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Verbreek" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Alles selecteren voor huidige lens" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Alles deselecteren voor huidige lens" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Alles selecteren voor huidige set" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Alles deselecteren voor huidige set" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Alles selecteren" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Alles deselecteren" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Bewerk afbeeldingsvariabelen:" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Deactiveer afbeelding" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Activeer afbeelding" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Activeer afbeeldingen" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Deactiveer afbeeldingen:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "IJkpunten" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2512,12 +2563,26 @@ msgid "Did you know..." msgstr "Wist u dat..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" +"Je hebt één raw bestand geselecteerd. Dit wordt niet aangeraden.\n" +"Alle raw bestanden zouden in één keer geconverteerd moeten worden." + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "Toch converteren." + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versie %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2525,70 +2590,70 @@ "Fatale installatiefout\n" "Bestand data/splash.png niet gevonden in:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Help" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Acties" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "Uitv&oer" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Gebruiker gedefinieerde volgorde: %s" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Gebruiker gedefinieerde volgordes" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Bewerk" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "Gebruiker gedefinieerde assistent: %s" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "Gebruiker gedefinieerde assistent" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Gestart" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimalisatie" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Belichting" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "Project wijzigingen bewaren voor openen van volgend project?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "Project wijzigingen bewaren voor starten van nieuw project?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "Project wijzigingen bewaren voor afsluiten?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2596,7 +2661,7 @@ "Als u een ander project laadt zonder nu eerst op te slaan, worden uw laatste " "wijzigingen niet bewaard." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2604,47 +2669,47 @@ "Als u een nieuw project start zonder deze eerst op te slaan, worden uw " "laatste wijzigingen niet bewaard." -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 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" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Niet opslaan" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Afsluiten zonder opslaan" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "Geforceerd afsluiten" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "project opgeslagen als %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Panorama Stitcher" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Panorama bewerker" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2657,35 +2722,35 @@ "\n" "(Fout code: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Opslaan PTMender projectbestand" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTMender bestanden (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Open project:" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Project geopend" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "Openen gestopt:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Fout bij openen project: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Open projectbestand" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2696,11 +2761,11 @@ "Dit bestand kan niet met Bestand, Open geopend worden.\n" "Wilt u dit bestand aan het huidige project toevoegen?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Open project: annuleren" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2711,7 +2776,7 @@ "Dit bestand is geen correcte afbeelding.\n" "Het bestand wordt verwijderd uit het project." -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2722,32 +2787,32 @@ "Het bestand is hernoemd, verwijderd of op een niet toegankelijke locatie.\n" "Het bestandwordt verwijderd uit het project." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Kan projectbestand %s niet openen:" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Open Papywizard xml bestand" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Papywizard xml bestanden (*.xml)|*.xml|Alle bestanden (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Kies templateproject" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Fijnafstemmen van alle punten" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Fijnafstemmen" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2777,24 +2842,24 @@ "Gebruik de ijkpuntenlijst (F3) om alle ijkpunten van het huidige project te " "tonen\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Resultaat fijnafstemmen" # hugin1/hugin/ImagesPanel.cpp:866, c-format -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "IJkpunten verwijderen in maskers" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Selecteer python script" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "ython script (*.py)|*.py||Alle bestanden (*)|*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2803,13 +2868,13 @@ "Bestand \"%s\" niet gevonden.\n" "Mogelijk is het bestand hernoemd, verplaatst od verwijderd." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Fout!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2817,12 +2882,12 @@ "Celeste-modelbestand niet gevonden in %s, Hugin moet opnieuw/goed " "geinstalleerd worden" -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Kan Celeste model bestand %s niet openen" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2832,7 +2897,7 @@ "vignettering centrum verschuiving.\n" "Deze opties worden niet ondersteund in de simpele modus." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2842,7 +2907,7 @@ "of deformatie parameters.\n" "Deze parameters worden niet ondersteund in de simpele modus." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2852,7 +2917,7 @@ "translatie of deformatie parameters.\n" "Deze parameters worden niet ondersteund in de simpele modus." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." @@ -2860,11 +2925,11 @@ "De assistent wachtrij is leeg. Dit wijst op een fout in het door de " "gebruiker gedefinieerde assistent bestand." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Uitvoeren assistent" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2872,12 +2937,12 @@ "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:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Waarschuwing: %d niet verbonden groepen van afbeeldingen gevonden:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2889,7 +2954,7 @@ "\n" "Druk opnieuw op de \"Uitlijn\"-knop na het toevoegen van punten" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2897,23 +2962,23 @@ "De assistent is afgesloten met een fout. Controleer aub het gemaakte project " "bestand." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Project niet gevonden" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Kan PTBatcherGui niet starten" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Verkeerde programma gestart" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Masker type" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2921,29 +2986,29 @@ "Creeer een polygon masker door te links-klikken op de afbeelding, Stel " "laatste punt in door te rechts-klikken" -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Bewaar masker" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Masker bestanden (*.msk)|*.msk|Alle bestanden (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Laad masker" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Laad masker: annuleer" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Kan masker van bestand %s niet uitvoeren:" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Voer een geldig nummer in" @@ -3090,7 +3155,7 @@ msgstr "Fotometrische uitlijning" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Openen van afbeeldingen" @@ -3134,63 +3199,67 @@ msgid "Photometric optimization finished" msgstr "Fotometrische optimalisatie afgerond" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Voeg individuele afbeeldingen toe" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "Laat me meerdere raw bestanden selecteren." + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Voeg tijdreeks van afbeeldingen toe..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Geen bij elkaar horende afbeeldingen gevonden." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Bewerk afbeeldings variabelen..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Verwijder de geselecteerde afbeelding(en)" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Gebruik deze afbeelding als positiereferentie " -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Gebruik deze afbeelding als belichtingsreferentie" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nieuwe lens" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Wijzig lens..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Voer nieuw lensnummer in" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Lensnummer" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Wijzig lensnummer" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Laad lens uit lens database" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Laad lens uit ini bestand" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3199,12 +3268,12 @@ "Moeten de geladen parameters toegepast worden op alle afbeeldingen met " "dezelfde lens?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Vraag" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3215,102 +3284,102 @@ "resultaten.\n" "Instellingen toch toepassen?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Lens opslaan in ini bestand" # hugin1/hugin/ImagesPanel.cpp:866, c-format -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Verwijder ijkpunten" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "De geselecteerde afbeeldingen bevatten geen ijkpunten." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Echt %lu ijkpunten verwijderen?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Verwijder ijkpunten" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Opschonen ijkpunten" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Opschonen ijkpunten" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Controleer paarsgewijs" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Controleer hele project" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Klaar met opschonen" # hugin1/hugin/ImagesPanel.cpp:866, c-format -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Verwijder ijkpunten op wolken" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Reset gebruiker instellingen.." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Reset posities" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Reset Translatie parameters" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Reset lens parameters" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Reset fotometrische parameters" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nieuwe set" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Wijzig set..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Voer nieuw set nummer in" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Set nummer" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Wijzig set nummer" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Stel set grootte in..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Kwaliteit:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3380,47 +3449,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff Equal Area" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "breedte moet een geheel getal groter dan 0 zijn" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "hoogte moet een geheel getal groter dan 0 zijn" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "linker grens moet kleiner zijn dan de rechter grens." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Boven grens moet kleiner zijn dan de onder grens." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "PTMender opties nog niet geïmplementeerd" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "PTblender opties nog niet geïmplementeerd" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Opties voor dit HDRMerge programma zijn nog niet geimplementeerd." -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Kan tijdelijk project bestand niet aanmaken" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Geef uitvoernaam zonder extensie" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3429,15 +3498,15 @@ "Je hebt geen toestemming om in folder \"%s\" te schrijven.\n" "Selecteer s.v.p. een andere folder voor de uitvoer." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Selecteer gebruiker gedefinieerde uitvoer..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Gebruiker gedefinieerde uitvoer|*.uitvoerder" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3452,7 +3521,7 @@ "Verklein totale formaat op de samenvoeg tab of selecteer TIF of PNG als " "uitvoer." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3465,7 +3534,7 @@ "samen van de Samenvoegen tab. Een dergelijk groot panorama kan veel tijd " "kosten om samen te voegen en vraagt veel geheugen." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3479,19 +3548,19 @@ "Als dit te groot is, verklein dan het totale panorama of het uitgesneden " "gebied." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Weet je zeker dat je zo'n groot panorama wilt maken?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Toch Samenvoegen" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Laat me dat repareren." -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3501,7 +3570,7 @@ "Controleer s.v.p. uw instellingen zodat in ieder geval één afbeelding in het " "uitvoer bereik staat." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3538,121 +3607,136 @@ msgid "Miscellaneous" msgstr "Diverse" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Systeemgekozen taal" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baskisch" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalaans" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Vereenvoudigd Chinees" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Tsjechisch" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Deens" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Nederlands" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Engels" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Frans" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Duits" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Hongaars" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiaans" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japans" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Pools" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugees (Braziliaans)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Russisch" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slowaaks" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spaans" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Zweeds" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Fins" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valenciaans (Zuid Catalaans)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Selecteer Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Uitvoerbaar bestand (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Selecteer Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "Selecteer dcraw" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "Selecteer RawTherapee-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Selecteer Darktable-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Selecteer het ExifTool arg bestand" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool Arg bestanden (*.arg)|*.arg|Alle bestanden (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3661,14 +3745,14 @@ "Bestand %s bestaat niet.\n" "Moet het arg bestand met standaard labels gemaakt worden?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "ExifTool arg bestand" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3676,18 +3760,18 @@ "Geen bestand geselecteerd.\n" "Moet een arg bestand met standaard labels gemaakt worden?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Selecteer nieuwe ExifTool arg bestand" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Kan bestand \"%s\" niet opslaan:" -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3696,7 +3780,7 @@ "Bestand %s bestaat niet.\n" "Moet een voorbeeld arg bestand gemaakt worden?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3704,25 +3788,26 @@ "Geen bestand geselecteerd.\n" "Moet een voorbeeld arg bestand gemaakt worden?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "" "Wilt u echt de getoonde instellingen terugzetten naar de\n" "standaardwaarden?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Laad Standaardwaarden" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Selecteer eerst een afbeelding en probeer opnieuw" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Selecteer optie" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3730,29 +3815,29 @@ "U kunt de laatste instelling niet verwijderen.\n" "Tenminste één instelling is vereist." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "Wilt u echt de ijkpunt detector instelling \"%s\" verwijderen?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Verwijder IJkpunten detector instelling" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Laad iJkpunt detector instellingen" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "IJkpunt detector instellingen (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "IJkpunt detector instellingen opslaan" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3782,50 +3867,54 @@ msgid "Remove %lu control points" msgstr "Verwijderen van %lu ijkpunten" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panoramavoorbeeld" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Voorbeeldopties" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projectie (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Blend modus:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Output:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Compressie:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Projectieparameters" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Links-klikken om een nieuw middelpunt te maken, rechts-klikken om punt naar " "de horizon te verplaatsen." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centreer panorama met de linkermuisknop. Gebruik de rechtermuisknop om de " @@ -3846,7 +3935,7 @@ msgid "Click a connection to edit control points." msgstr "klik op een verbinding om ijkpunten te wijzigen" -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3857,29 +3946,126 @@ "Fout: %s\n" "Een incorrecte of missende afbeelding kan een oorzaak zijn." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Programma \"%s\" niet gevonden.\n" +"Specificeer aub een geldig programma in de voorkeuren." + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Programma \"%s\" niet gevonden in PAD.\n" +"Specificeer een geldig programma in de voorkeuren." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Uitvoeren: %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "Bijwerken EXIF data voor %s" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Verwerkings profiel \"%s\" niet gevonden.\n" +"Geef alstublieft een correct bestand op of laat leeg voor standaard " +"instellingen." + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Importeer Raw afbeeldingen" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Kan uitvoer van referentie afbeelding niet verwerken.\n" +"Kan verdere afbeeldingen niet verwerken." + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Sluiten" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Waarschuwing: leesfout" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"De volgende bestanden worden overgeslagen omdat de metadata niet gelezen kon " +"worden." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Waarschuwing: raw afbeeldingen van verschillende camera's" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"De volgende afbeeldingen zijn met een andere camera gemaakt dan de vorige.\n" +"De raw import werkt alleen voor afbeeldingen van dezelfde camera." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" +"Tenminste één raw afbeelding is niet succesvol geconverteerd.\n" +"Deze afbeelding(en) word(t)(en) overgeslagen." + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Selecteer het standaard RT bewerkings profiel" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "RT bewerkings profiel|*.pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Folder '%s' bestaat niet." -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Kan omgevings variabele PYTHONHOME niet instellen" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Open Bulkprocessor" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Opent PTBatcher, de bulkprocessor voor Hugin's projectbestanden" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Open Lens calibratie GUI" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Opent lens calibratie gui, een simpele applicatie voor lens calibratie." @@ -3895,11 +4081,11 @@ "Misschien hebt u het niet goed geinstalleerd of het verkeerde bestands pad " "in in de instellingen ingevoerd." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "verwijderen van tijdelijke ijkpunten bestanden" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3908,15 +4094,15 @@ "Gebruik %namefile, %i of %s om de invoerbestanden voor de ijkpunt detector " "aan te geven" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Fout in het ijkpunt detector commando" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3928,14 +4114,14 @@ "Gebruik minder afbeeldingen of plaats de afbeeldingen in een map\n" "met een kortere padnaam" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Te veel afbeeldingen geselecteerd" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3947,38 +4133,38 @@ "\n" "Kan commando niet uitvoeren: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute fout" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "ijkpunten zoeken" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Kan commando: %s niet uitvoeren" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3987,9 +4173,9 @@ "Commando: %s\n" "mislukt met foutcode: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4004,13 +4190,13 @@ "\n" "Uitgevoerd commando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "IJkpunten detector fout" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4018,7 +4204,7 @@ "Gebruik %i om de invoerbestanden en %k om het sleutelpunt bestand voor de " "genereer stap aan te geven" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4026,11 +4212,11 @@ "Gebruik %k om het sleutelpunten bestand te definieren en %o om het project " "uitvoer bestand voor de koppeling stap te definieren" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "genereren sleutelpunten bestand" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4043,11 +4229,11 @@ "\n" "Kon commando: %s niet uitvoeren." -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Standaard" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4055,253 +4241,253 @@ "Kan lopend bulkproces niet leegmaken.\n" "Wilt u dit bulkproces afbreken?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Wachtrij geleegd." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Fout: Kon status niet opvragen, project met index %d niet in de lijst." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Fout: Kon wachtrij bestand niet openen." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Bulkproces succesvol afgerond." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Bulkproces afgerond met foutmeldingen." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Beginnen met afsluiten..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Bezig af te sluiten..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Voorbereiden voor slaapstand..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Beginnen met slaapstand..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Voorbereiden sluimerstand..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Beginnen met sluimerstand..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Specificeer project bestand" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Geen uitvoernaam (zonder extensie) opgegeven" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Geen projectbestanden opgegeven" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Samenvoegen" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Assistent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Fout bij verwijderen, project met id %d niet in de lijst." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Fout: Kan projectbestand niet verwijderen" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Bulkproces wordt uitgevoerd..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI is aan het samenvoegen" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Bulkproces loopt al." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Uitvoeren commando \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Nu samenvoegen: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Nu detecteren: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Fout: Kon status niet instellen, project met index %d niet inde de lijst." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Ik verveel me..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Je hebt de Optie toets ingedrukt." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Je hebt de Control toets ingedrukt." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Moet het laden van de bulk reeks overgeslagen worden?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Niets gebeurt nu" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI afsluiten" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Computer afsluiten" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Sluimerstand computer" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Slaapstand computer" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Geef het uit te voeren commando" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Voer programma in" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Geef directory om projectbestanden in te zoeken" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Geef bronbestand van project aan." -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Voeg projecten toe uit dir %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Voeg project %s toe aan de samenvoegen wachtrij" -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Voeg project %s toe aan Assistent wachtij" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Bulkproces gepauzeerd" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugin's Bulkprocessor" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Geef project naam (zonder extensie)" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "" "De naam (zonder extensie) van een assistent doel kan niet gewijzigd worden." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Kies een project" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Selecteer slechts één project" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Kies te openen bulkwachtrij bestand" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Bulkbestanden (*.ptb)|*.ptb|Alle bestanden (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Kan \"app\" niet openen in Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Geen project gekozen. Hugin starten zonder project?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Bulkproces gepauzeerd" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Pauzeren van Hugin's bulk wachtrij" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Verder gaan met het bulkproces" -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Uitvoeren van Hugin's bulk wachtrij" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4309,7 +4495,7 @@ "Er staan mislukte projecten in de lijst.\n" "Deze ook verwijderen?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4317,16 +4503,16 @@ "Kan het lopend project niet verwijderen.\n" "Wilt u het afbreken?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Verwijderd project %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Kies een project om te verwijderen" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4334,16 +4520,16 @@ "Kan lopend project niet resetten.\n" "Wilt u het afbreken?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Reset project %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Kies een project om te resetten" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4351,15 +4537,15 @@ "Kan lopende projecten niet resetten.\n" "Wilt u dit bulkproces afbreken?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Geef te bewaren bulk wachtrij bestand aan " -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Bulkbestanden (*.ptb)|*.ptb|Alle bestanden (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4369,15 +4555,15 @@ "Dit kan negatieve effecten hebben op de prestaties.\n" "Moet de bulk wachtrij nu geleegd worden?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Bulk wachtrij leegmaken" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Bulk wachtrij behouden" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Start bulkproces" @@ -4413,7 +4599,7 @@ msgid "E&xit" msgstr "S&toppen" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4423,11 +4609,11 @@ "Als je dit dialoogscherm sluit verlies je die.\n" "Toch verder gaan?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Geaccepteerd" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4437,11 +4623,11 @@ "Als je verder gaat worden deze genegeerd.\n" "Wil je verder gaan?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Stop" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4450,7 +4636,7 @@ "Folder %s bestaat niet.\n" "Geef aub een bestaande folder op." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4458,7 +4644,7 @@ "Je hebt een onmogelijk panorama geselecteerd.\n" "Selecteer minstens een panorama en probeer opnieuw." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4468,140 +4654,142 @@ "Mogelijk heb je geen schrijf toegang in deze folders of is je harde schijf " "vol." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Verwijder afbeelding uit project" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Hier splitsen in twee panoramas" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Openen van bestand %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Start" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "%d mogelijke panoramas gevonden." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Geen mogelijke panoramas gevonden" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d afbeeldingen: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Syntaxisfout ontdekt in de parameters, bewerking wordt afgebroken." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI gestart" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Wachten" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Bezig" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Klaar" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Mislukt" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Bestand mist" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pauze" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Project" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Geef uitvoernaam zonder extensie" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Status" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Laatst veranderd" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Uitvoerformaat" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projectie" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Afmeting" # PTBatcherGUI/ProjectListBox.cpp:145, c-format -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Fout, kan id niet converteren" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Verander naam (zonder extensie)" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Reset project" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Bewerken met Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Verwijder" @@ -4637,16 +4825,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Log bestanden (*.log)|*.log|Alle bestanden (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Kan opgegeven uitvoerbestand \"%s\" niet vinden." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Geef bronbestand van project aan." -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4657,7 +4845,7 @@ "bestandsnaam." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Over Hugin" @@ -4690,19 +4878,19 @@ msgstr "Systeem" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4781,8 +4969,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Kies..." @@ -4872,7 +5063,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Parameters" @@ -4904,10 +5095,6 @@ msgid "Send selected panoramas to queue" msgstr "Stuur de gevonden panoramas naar de wachtrij" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Sluiten" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Panoramas zoeken" @@ -5001,12 +5188,12 @@ msgstr "&Minimaliseer naar tray" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "S&top" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Verlaat programma" @@ -5110,70 +5297,179 @@ msgid "adddir" msgstr "voeg folder toe" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "Vorig paar afbeeldingen" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "Volgend paar afbeeldingen" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Omschrijving:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "modus:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Type:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "verticale lijn" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Alle afbeeldingen tegelijk" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "horizontale lijn" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama met lagen" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Vergroting:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Multi-rij panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "passend in venster" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Multi-rij panorama met lagen." -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Fijnafstemming" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Voor-uitgelijnd panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "probeert het geselecteerde ijkpunt te optimaliseren" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detector" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "auto fijnafs&temming" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Eén staps detector" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "auto toevoegen" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programma:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "direct ijkpunt toevoegen bij kiezen van tweede punt" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumenten:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "autobenaderen" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Opschoon parameters:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"probeert de verschuiving tussen twee afbeeldingen te bepalen tijdens het " -"plaatsen van ijkpunten" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Twee staps detector" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Kenmerk beschrijver:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Kenmerk detector:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detector voor lagen" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Laat leeg indien er geen ijkpunt detector over de lagen uitgevoerd moet " +"worden." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Geavanceerde Optie" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Deze instelling heeft verder geen opties." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"De volgende variabelen worden vervangen bij het starten:\n" +"%o -- uitvoer project (0.oto wordt toegevoegd bij Autopanogebruik)\n" +"%p -- aantal ijkpunten per paar\n" +"%v -- HFOV van de eerste afbeelding\n" +"%f -- projectie van de eerste afbeelding (0-4, zoals in panotools)\n" +"%i -- afbeeldingsbestanden\n" +"%namefile -- bestand met bestandsnamen van de afbeeldingen\n" +"%s -- input panotools script\n" +"%k -- tijdelijk sleutel bestand" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parameters voor ijkpunt detectoren" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "Vorig paar afbeeldingen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "Volgend paar afbeeldingen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "modus:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "verticale lijn" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "horizontale lijn" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Vergroting:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "passend in venster" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Fijnafstemming" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "probeert het geselecteerde ijkpunt te optimaliseren" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "auto fijnafs&temming" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "auto toevoegen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "direct ijkpunt toevoegen bij kiezen van tweede punt" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "autobenaderen" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"probeert de verschuiving tussen twee afbeeldingen te bepalen tijdens het " +"plaatsen van ijkpunten" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 msgid "&Delete" msgstr "&Verwijder" @@ -5205,7 +5501,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Verwijder" @@ -5213,155 +5509,189 @@ msgid "Select by Distance" msgstr "Selecteer op afstand" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Omschrijving:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Waarschuwing: incorrecte bestandsnamen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Type:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"De volgende bestanden bestaan al.\n" +"Ze worden overschreven wanneer u de raw import uitvoert.\n" +"Wilt u deze bestanden overschrijven?" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (door A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Ja" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Alle afbeeldingen tegelijk" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Nee" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama met lagen" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Bewerk Panorama Tools script" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Multi-rij panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Dit is het script dat naar de Panorama-Toolsmotor gestuurd wordt. Het " +"bewerken van deze regels is voor gevorderden." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Multi-rij panorama met lagen." +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Ga verder met deze wijzigingen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Voor-uitgelijnd panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Negeer wijzigingen en annuleer" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Groepeer op:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Eén staps detector" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimale overlap:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programma:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Minimale overlap voor detecteren van uitvoer lagen\n" +"De toegekende lagen -1 worden in het project gebruikt." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumenten:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maximum Ev verschil:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Opschoon parameters:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maximale EV verschil voor detectie van uitvoer lagen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Twee staps detector" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Toon" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Kenmerk beschrijver:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Algemeen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Kenmerk detector:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF data" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detector voor lagen" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Posities" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Laat leeg indien er geen ijkpunt detector over de lagen uitgevoerd moet " -"worden." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Lensparameters" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Geavanceerde Optie" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Fotometrische parameters" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Deze instelling heeft verder geen opties." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Lenstype" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Voeg afbeeldingen toe.." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Lenstype:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Brandpuntsafstand schaalfactor:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Kenmerk detector" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Instellingen:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -"De volgende variabelen worden vervangen bij het starten:\n" -"%o -- uitvoer project (0.oto wordt toegevoegd bij Autopanogebruik)\n" -"%p -- aantal ijkpunten per paar\n" -"%v -- HFOV van de eerste afbeelding\n" -"%f -- projectie van de eerste afbeelding (0-4, zoals in panotools)\n" -"%i -- afbeeldingsbestanden\n" -"%namefile -- bestand met bestandsnamen van de afbeeldingen\n" -"%s -- input panotools script\n" -"%k -- tijdelijk sleutel bestand" +"Voer geselecteerde ijkpunten detector uit op de geselecteerde afbeeldingen" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimaliseer" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometrisch:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Bereken" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parameters voor ijkpunt detectoren" +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometrisch:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "incorrecte bestandsnamen" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Geselecteerde afbeelding" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Bewerk Panorama Tools script" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Lees lensdata..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Dit is het script dat naar de Panorama-Toolsmotor gestuurd wordt. Het " -"bewerken van deze regels is voor gevorderden." +"Geef horizontale beeldhoek (HFOV) of brandpuntsafstand en bijsnijfactor:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Ga verder met deze wijzigingen" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Negeer wijzigingen en annuleer" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "graden" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Camera- en Lensdata" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Yaw:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Pitch:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Rotatie:" @@ -5369,34 +5699,11 @@ msgid "Translation parameter" msgstr "Translatie parameter" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Posities" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "beeldhoek (v)" @@ -5496,7 +5803,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Help" @@ -5538,8 +5845,8 @@ msgstr "Openen" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Opslaan" @@ -5551,121 +5858,44 @@ msgid "Manipulate image variables" msgstr "Bewerk afbeeldings variabelen" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Groepeer op:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimale overlap:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimale overlap voor detecteren van uitvoer lagen" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maximum Ev verschil:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maximale EV verschil voor detectie van uitvoer lagen" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Toon" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Algemeen" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF data" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Lensparameters" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Fotometrische parameters" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Lenstype" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Voeg afbeeldingen toe.." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Lenstype:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Brandpuntsafstand schaalfactor:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Kenmerk detector" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Instellingen:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "" -"Voer geselecteerde ijkpunten detector uit op de geselecteerde afbeeldingen" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimaliseer" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometrisch:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Bereken" - -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometrisch:" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Geselecteerde afbeelding" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Lees lensdata..." - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "" -"Geef horizontale beeldhoek (HFOV) of brandpuntsafstand en bijsnijfactor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" +msgstr "WB referentie:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "dcraw" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "Additionele dcraw parameters:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Verwerkings profiel:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "Leeglaten om standaard RawTherapee instellingen te gebruiken" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "darktable" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "Raw converteerder" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "graden" - -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Camera- en Lensdata" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importeer" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5812,14 +6042,6 @@ msgid "Don't ask again" msgstr "Niet opnieuw vragen" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Ja" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Nee" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5883,21 +6105,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importeer posities van Papywizard XML" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "On&gedaan maken" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Maak laatste actie ongedaan" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "Opnieuw uitvoe&ren" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Opnieuw uitvoeren laatste actie" @@ -5939,12 +6161,12 @@ msgid "Use only normal control points in optimization." msgstr "Gebruik alleen normale ijkpunten bij de optimalisatie" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimaliseer" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Voer optimalisatie opnieuw uit met de huidige instellingen" @@ -5975,15 +6197,15 @@ msgid "Run a python script" msgstr "Voer een python script uit" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Bekijk" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "Volledig Scherm" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Toont Hugin's hoofdvenster in volledig scherm" @@ -6059,19 +6281,19 @@ msgid "Show the Stitcher panel" msgstr "Toon Samenvoegen tabblad" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "&Simpel" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "Ge&avanceerd" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "&Expert" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "&Interface" @@ -6092,86 +6314,86 @@ msgstr "" "Samenvoegen met gebruiker gedefinieerde instellingen voor uitvoer volgorde" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Informatie over de verschillende knoppen e.d." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Tip van de dag" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Toon een van de tips van de dag." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Snel&keuzetoetsen" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "snelkeuzetoetsen" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Frequently Asked Questions (Veel gestelde vragen)" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Over Hugin" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Instellingen" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nieuw" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nieuw project" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Open" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Open project" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "Op&slaan" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Sla huidig projectbestand op" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Sl&a op als" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Sla huidig project op in nieuw bestand" @@ -6187,18 +6409,18 @@ "Schrijf huidig project naar een scriptbestand compatibel met PTStitchter, " "nuttig voor bulkverwerking" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "Meest recent gebr&uikte projecten" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Lijst van recent gebruikte projecten" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Start Bulkprocessor" @@ -6285,7 +6507,7 @@ msgid "Show the OpenGL preview image" msgstr "Toon het OpenGL voorbeeld" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Voorbeeld van panorama" @@ -6342,15 +6564,10 @@ msgstr "Uitsluiten regio uit alle afbeeldingen van deze lens" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exporteeer" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importeer" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Copiëer" @@ -6394,8 +6611,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "Pas alle wijzigen toe op alle afbeeldingen met dezelfde lens" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6497,7 +6714,8 @@ msgid "execute the PTOptimizer engine" msgstr "Voer het PTOptimizer programma uit" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Positionering van de Afbeelding" @@ -6542,39 +6760,39 @@ msgid "Interpolator (i):" msgstr "Interpolator (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubisch)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineair" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Nearest Neighbour" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Benadering van waarden tussen bronpixels" @@ -6602,7 +6820,7 @@ msgid "Enfuse options" msgstr "Enfuse parameters" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Beeldhoek:" @@ -6765,10 +6983,6 @@ msgid "Image fusion:" msgstr "Afbeeldingsfusie:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR combinator" @@ -6872,15 +7086,15 @@ msgid "Output parameters" msgstr "Uitvoer parameters" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Naand Blend modus:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "Harde naad (sneller)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "blend naad" @@ -6950,27 +7164,40 @@ msgid "This affects the control points editor and mask editor." msgstr "Dit beïnvloedt de ijkpunt editor en de masker editor." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "dcraw programma:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "Laat leeg om standaardwaarde besturingssysteem te gebruiken" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "RT-cli programma:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "darktable-cli programma:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Bestands opties" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Folder voor tijdelijke opslag:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "Laat leeg om standaardwaarde besturingssysteem te gebruiken" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Standaard project bestandsnaam:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Staandaard uitvoer voorloop" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7001,45 +7228,45 @@ "%lens - lens (van eerste afbeelding)\n" "%projectname - project bestandsnaam (alleen voor voorvoegsel uitvoer naam)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Standaard bestandsnaam" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Bestandsnamen" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Afbeelding openen" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "De afbeeldingen na openen automatisch uitlijnen" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Detecteer verticale lijnen" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" "Detecteer vertikale lijnen in de afbeeldingen om de pano recht te maken" # hugin1/hugin/ImagesPanel.cpp:866, c-format -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Verwijder wolk-achtige ijkpunten (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Optionele Assistent stappen" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Auto-uitlijning" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7047,67 +7274,67 @@ "Aantal ijkpunten\n" "per overlap" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Verklein uiteindelijke pano" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "percent. max. breedte" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "IJkpunteneditor" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR en 16-bits weergave" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Curve" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineair" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmisch" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "gebruikt voor weergave in GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Overlap breedte:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixels" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Breedte zoekgebied:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "perc. afbeeldings breedte " -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "zoekbreedte lokaal:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Correlatiedrempel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7115,11 +7342,11 @@ "0: Geen overeenkomst(en)\n" "1: Maximale overeenkomst(en)" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Piekkrommingsdrempel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7127,116 +7354,112 @@ "0: geen piek\n" "0.2: te onderscheiden piek" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Rotatie zoeken" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Zet rotatie zoeken aan (langzamer, maar nauwkeuriger)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Starthoek:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Stophoek:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Stappen:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "IJkpunten detectors" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "IJkpunten detector programma's" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nieuw..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "&Bewerk..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Verplaats omhoog" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Verplaats omlaag" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Stel standaard in" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "De assistent gebruikt de standaard instelling." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Uitvoerformaat" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Standaard bestand formaat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "standaard uitvoer formaat voor uiteindelijke panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF Compressie:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "standaard TIFF compressie" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG Kwaliteit:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "standaard JPEG compressie" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Samenvoeger" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Standaard samenvoeger:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Standaard samenvoeger voor nieuwe projecten." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processor" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Het programma dat het samenvoegen zal uitvoeren" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Start samenvoeg opdrachten onmiddelijk " -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7246,20 +7469,20 @@ "de invoer rij. Anders wordt de processor gestart in afwachtende modus en " "moet de gebruiker het uitvoeren handmatig starten" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Bestaande afbeeldingen overschrijven" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" "WAARSCHUWING: bestaande bestanden zullen ongevraagd overschreven worden." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Uitgebreid voortgang weergeven" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7267,19 +7490,19 @@ "Activeer om details te verkrijgen. Nuttig als u een programma fout wilt " "rapporteren of om de voortgang te volgen." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Samenvoegen" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Kopieer metadata in uiteindelijke afbeelding m.b.v. ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "ExifTool opties" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7293,7 +7516,7 @@ "Laat de invulvelden leeg en druk op \"Edit\" om een voorbeeld arg bestand te " "maken." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7301,19 +7524,19 @@ "Het volgende arg bestand wordt gebruikt om de labels uit de eerste " "afbeelding te kopiëren naar de tussen afbeeldingen." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Exiftool tussen arg bestand:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Laat leeg om standaardwaarde te gebruiken" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Bewerk geselecteerde ExifTool arg bestand" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7324,28 +7547,28 @@ "Het wordt toegepast bovenop het arg bestand voor de tussen afbeeldingen " "toegepast." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Uiteindelijk ExifTool arg bestand:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Maak Photo Sphere XMP data" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" "Dit zal alleen gedaan worden voor equirectangulaire uitvoer afbeeldingen." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Geavanceerde Opties" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Aantal threads:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7356,82 +7579,82 @@ "bewerken.\n" "Stel de waarde in op het aantal processoren of processorkernen in uw systeem." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 voor automatische detectie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Samenvoegen (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Standaard Interpolator (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Altijd bijgesneden afbeeldingen maken" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Gebruik GPU voor positioneren (EXPERIMENTEEL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "Gebruik GPU voor positioneren" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Gebruik video kaart GPU om het positioneren te versnellen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Gebruik ander Enblend programma" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend programma:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Standaardparameters:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Dit zijn de standaard parameters voor nieuwe projecten.\n" "Ze kunnen veranderd worden per project in het Samenvoegen tabblad.\n" "Voer geen waarden in voor de -w, -o en --compression parameters, deze worden " -"door hugin ingevuld" +"door hugin ingevuld." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Gebruik een alternatief Enfuse programma" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse programma:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programma's" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parameters Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM drempelwaarde:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7439,19 +7662,19 @@ "groter dan 0,5: minder gevoelig\n" "kleiner dan 0,5: gevoeliger" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor filter maat" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "klein" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "groot" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7460,7 +7683,7 @@ "klein kan ijkpunten beoordelen die zich dichter bij de rand van de " "afbeelding bevinden" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7471,57 +7694,57 @@ "Om de berekening te verkorten wordt alleen een willekeurige selectie van " "punten gebruikt." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Aantal ijkpunten per afbeelding:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Fotometrische optimalisator" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Waarschuwingen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Toon melding over opslaan project bestand en voorvoegsel uitvoer" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Toon waarschuwing by grote belichtings verschillen tijdens toevoegen van " "afbeeldingen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Na \"bewerk ijkpunten\" gereedschap" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Vraag gebruiker" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Opnieuw Panorama optimaliseren" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Panorama niet optimaliseren" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Bewerk ijkpunten gereedschap (alleen in het \"snelle voorbeeld\")" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Diversen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Instellingen - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." @@ -7530,11 +7753,11 @@ "\"exiftool -overwrite_original -tagsfromfile afbeelding -@ arg-bestand " "panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Bewerk ExifTool arg bestand" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." @@ -7543,7 +7766,7 @@ "\"exiftool -overwrite_original -tagsfromfile afbeelding -E -@ arg-bestand " "panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7580,11 +7803,11 @@ "\n" "De panorama labels zijn hoofdletter gevoelig." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centreer het voorbeeld horizontaal" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centreer" @@ -7592,13 +7815,15 @@ msgid "Show the whole panorama" msgstr "Toon het gehele panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Bepaal beeldhoek" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Maak passend" @@ -7606,7 +7831,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automatisch recht maken van gegolfde horizon" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Recht maken" @@ -7705,32 +7931,32 @@ "Zet de belichtings waarde van het panorama naar de gemiddelde belichting van " "alle afbeeldingen." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Grijs selectie werktuig" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corrigeer de globale witbalans door een neutraal grijs gebied te selecteren." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "B&ewerk ijkpunt(en)" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Vind of verwijder ijkpunten in de geselecteerde rechthoek" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Achtergrond:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Schaal:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7744,157 +7970,145 @@ "* Klik op een lijn om de geassocieerde afbeeldingen te bewerken in het " "Ijkpunten tabblad." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Opmaak" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "x" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Hulpen:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Rule of thirds" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Gouden ratio" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonaal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Diagonale methode" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Gouden driehoek (naar onder)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Gouden driehoek (naar boven)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automatisch recht maken van gegolfde horizon." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Sleep modus:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Toepassen" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Verplaats het panorama of sleep afbeeldingen naar de juiste positie" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Verplaats/Sleep" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Zet de het uitsnede gebied naar de grootste rechthoek bedekt door de " "afbeeldingen" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR auto uitsnede" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Zet het uitsnede gebied naar de grootste rechthoek bedekt door de " "afbeeldingen" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "linkerkant:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "bovenkant:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "rechterkant:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "onderkant:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Zet uitsnijding terug naar maximaal oppervlak" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Verander de uitsnede van het panorama" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Panorama b&ewerker" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Overzicht" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Toont het overzicht van de panorama globe" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "Rooster" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Toont een raster" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "&Alle afbeeldingen" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "Afbeelding met de ge&middelde belichting voor elke set" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "Lichtste af&beelding van elke set" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "&Donkerste afbeelding van elke set" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "Behoud huidige geselecteerde afbeeldingen" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "&Reset selectie" @@ -8202,6 +8416,77 @@ "Optimalisatie van alle vervormingsparameters. Optie \"alles\" heeft alleen " "zin bij sterk overlappende afbeeldingen met vele goed verspreide ijkpunten." +#~ msgid "(WB reference)" +#~ msgstr "(WB referentie)" + +#~ msgid "Images" +#~ msgstr "Afbeeldingen..." + +#~ msgid "Add image(s)..." +#~ msgstr "Voeg afbeelding(en) toe.." + +#~ msgid "Add other images to list" +#~ msgstr "Voeg andere afbeeldingen toe aan de lijst" + +#~ msgid "Remove image" +#~ msgstr "Verwijder afbeelding" + +#~ msgid "Remove selected image from list" +#~ msgstr "Verwijder de geselecteerde afbeelding" + +#~ msgid "Converter settings" +#~ msgstr "conversie instellingen" + +#~ msgid "Import &raw file(s)..." +#~ msgstr "Importeer &raw bestand(en)..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Verplaats het panorama of sleep afbeeldingen naar de juiste positie" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Verander de uitsnede van het panorama" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Gebruik GPU voor positioneren (EXPERIMENTEEL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Alle afbeeldingsbestanden|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." +#~ "TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." +#~ "HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF " +#~ "files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG bestanden (*.png)|*." +#~ "png;*.PNG|HDR bestanden (*.hdr)|*.hdr;*.HDR|EXR bestanden (*.exr)|*.exr;*." +#~ "EXR|All bestanden (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (door A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "x" + #~ msgid "Interface" #~ msgstr "Interface" @@ -9235,9 +9520,6 @@ #~ msgid "Flatfield" #~ msgstr "Flatfield" -#~ msgid "Image file:" -#~ msgstr "Afbeeldingsbestand:" - #~ msgid "Polynomial" #~ msgstr "Polynoom" @@ -9462,9 +9744,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#~ msgid "&Import Project..." -#~ msgstr "&Importeer Project..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9565,10 +9844,6 @@ #~ "Autopano-SIFT niet gevonden. Specificeer een geldig pad in het " #~ "instellingenscherm" -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "" -#~ "\"%s\" niet gevonden. Specificeer een geldig pad in het voorkeuren scherm" - #~ msgid "Error in Autopano command" #~ msgstr "Fout in Autopano-opdracht" @@ -9659,9 +9934,6 @@ #~ msgid "PTStitcher note" #~ msgstr "PTStitcher opmerking" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Selecteer PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "PTStitcher.exe is niet geselecteerd" @@ -9836,3 +10108,19 @@ #~ msgid "Could not read number" #~ msgstr "Kan het nummer niet interpreteren" + +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "" +#~ "Voeg tenminste een raw afbeelding aan de lijst toe om dee te kunnen " +#~ "importeren." + +#~ msgid "Import Raw Files" +#~ msgstr "Importeren Raw bestanden" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "" +#~ "Markeer geselecteerde afbeelding als witbalans referentie afbeelding" + +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "" +#~ "Converteer raw bestand naar TIFF en voeg TIFF toe aan huidig project" diff -Nru hugin-2018.0.0+dfsg/src/translations/pl.po hugin-2019.0.0+dfsg/src/translations/pl.po --- hugin-2018.0.0+dfsg/src/translations/pl.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/pl.po 2019-02-17 15:24:33.000000000 +0000 @@ -10,14 +10,14 @@ msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2013-11-04 17:48+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 #: hugin1/hugin/PapywizardImport.cpp:460 @@ -51,16 +51,16 @@ msgid "Searching for best crop..." msgstr "Szukanie ruchomych punktów kontrolnych..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Program zewnętrzny %s nie został znaleziony w pakiecie instalacyjnym, " "przywracanie ścieżki systemowej" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -87,9 +87,9 @@ msgstr "Bitmapa (*.bmp)|*.bmp|Plik PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Plik %s już istnieje. Nadpisać go?" @@ -127,7 +127,7 @@ msgstr "Mnożnik ogniskowej musi być większy od zera." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -140,24 +140,28 @@ "Czy na pewno użyć tak dużej wartości?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -178,8 +182,8 @@ msgstr "Pełnoklatkowe rybie oko" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Walcowy równoodległościowy" @@ -210,11 +214,13 @@ msgid "builtin" msgstr "wbudowany" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "własna (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Liniowa" @@ -238,16 +244,16 @@ msgid "Error loading lens parameters" msgstr "Błąd wczytywania parametrów obiektywu" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Zapisz plik parametrów obiektywów" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Pliki parametrów obiektywów (*.ini)|*.ini|Wszystkie pliki (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Zapisz projekt" @@ -279,22 +285,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Błąd zatrzymania procesu %ld, kod 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Anuluj" @@ -332,12 +339,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Nie można otworzyć pliku projektu:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "nie można otworzyć skryptu : %s" @@ -347,8 +354,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "Błąd podczas przetwarzania skryptu panotools: %s" @@ -362,17 +369,17 @@ msgid "Could not create temporary file" msgstr "Nie można utworzyć pliku tymczasowego" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Błąd podczas składania" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -380,11 +387,11 @@ "Nadpisać istniejące pliki?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Nadpisanie istniejących plików" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -393,12 +400,12 @@ "Błąd podczas składania projektu\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Błąd podczas uruchamiania asystenta" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -407,290 +414,300 @@ "Błąd podczas uruchamiania asystenta\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Składam panoramę" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "Wersja %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "katalog" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "Przedrostek wyjściowy" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Blender:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "Błąd wewnętrzny" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Ekspozycja" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Opcje Enfuse" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Opcje Enfuse" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "Liczba punktów na zdjęcie: " -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "Warstwa ekspozycji wyjściowej %d" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "Rozmiar płótna:" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Rzut:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "Użyj GPU do remapowania (EKSPERYMENTALNE)" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Wyjście panoramy:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Wykryto ekspozycję, mała rozpiętość tonalna" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Ekspozycja łączona z serii" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Ekspozycja łączona z dowolnego układu" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Duża rozpiętość tonalna" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Przetworzone zdjęcia:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Bez korekcji ekspozycji, mała rozpiętość tonalna" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Połączone serie:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Serie z połączoną ekspozycją" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Warstwy:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Wygładzone warstwy o podobnej ekspozycji bez korekcji ekspozycji" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "pierwsze zdjęcie" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "Liczba procesorów:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 #, fuzzy msgid "Filename:" msgstr "Nazwa pliku" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "Rozmiar płótna:" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "Rodzaj reakcji" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "Ekspozycja (Eev)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "Przetworzone zdjęcia:" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "Wczytywanie zdjęć" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "Wygładzone warstwy o podobnej ekspozycji bez korekcji ekspozycji" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "Warstwa ekspozycji wyjściowej %d" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "Przypisany numer serii" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "Przetworzone zdjęcia:" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "Przypisany numer serii" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Składanie %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "pierwsze zdjęcie" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "ostatnie zdjęcie" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "katalog" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Producent aparatu" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Model aparatu" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -698,35 +715,69 @@ msgid "Lens" msgstr "Obiektyw" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "nieznany rzut" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Rozmiar obrazu:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Odczyt zdjęcia %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Błąd" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -738,25 +789,11 @@ "Hugin nie potrafi pracować z takimi nazwami plików. Proszę zmienić nazwy " "swoich plików i spróbować ponownie." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Wszystkie pliki zdjęć|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*. PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." -"exr;*.EXR| Pliki JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Pliki TIFF (*." -"tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Pliki PNG (*.png)|*.png;*.PNG|Pliki " -"HDR (*.hdr)|*.hdr;*.HDR|Pliki EXR (*.exr)|*.exr;*.EXR|Wszystkie pliki (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -768,27 +805,27 @@ msgstr "Wprowadzona wartość \"%s\" nie jest poprawną liczbą." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Ostrzeżenie" @@ -806,7 +843,7 @@ msgid "Could not save information into database." msgstr "Nie udało się zapisać informacji do pliku bazy danych." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -817,11 +854,11 @@ "%s\n" "Anulowanie" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Nieobsługiwany format pliku" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -830,7 +867,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -841,78 +878,78 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 #, fuzzy msgid "Should the position of images in each stack be linked?" msgstr "Czy pominąć wczytywanie listy wsadowej?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -920,44 +957,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "Przywróć pozycje" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "Opcje wiersza poleceń" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "Nadpisanie istniejących plików" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Nie znaleziono pliku zdjęcia" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Zaznaczone zdjęcie" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -968,16 +1005,17 @@ "\n" "Naciśnij OK aby usunąć." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Wykryto błąd" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Dodaj zdjęcia" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -986,32 +1024,32 @@ "Błąd, szablon wymaga %d zdjęć,\n" "a bieżący projekt zawiera %d zdjęć\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Nie można zastosować szablonu" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Błąd podczas wczytywania pliku projektu" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Wynik" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "katalog xrc nie został znaleziony w instalacji" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Błąd krytyczny" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1044,7 +1082,7 @@ "zdjęciami.\n" "Proszę sprawdzić zdjęcie jeszcze raz, jeśli zostały wybrane poprawne zdjęcia." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Dodaj zdjęcia: anuluj" @@ -1057,9 +1095,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1076,7 +1114,7 @@ msgstr "Wyszukiwanie linii..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Zakończono" @@ -1090,11 +1128,11 @@ "Proszę najpierw uruchomić \"Znajdź linie\". Jeśli linie nie zostaną " "znalezione, należy zmienić parametry." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optymalizacja parametrów zniekształceń obiektywu..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1104,149 +1142,149 @@ "Proszę uruchomić \"Znajdź linie\" i \"Optymalizuj\" przed zapisaniem danych " "obiektywu. Jeśli linie nie zostaną znalezione, należy zmienić parametry." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Zapisz parametry obiektywu do pliku ini" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "Zapisz parametry obiektywu do bazy danych lensfun" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Zapisywanie danych obiektywu" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Zapisz obiektyw" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Zapisz projekt" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Pliki projektów (*.pto)|*.pto|Wszystkie pliki (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 #, fuzzy msgid "Removing temporary files..." msgstr "czyszczenie plików tymczasowych punktów kluczowych" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "Uruchom a&systenta" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "Liczba wątków:" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "Uruchamianie polecenia \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "System operacyjny: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64-bitowy" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32-bitowy" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architektura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "Wolna pamięć: %ld KiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktywna strona kodowa: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Wersja %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Ścieżka do zasobów: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Ścieżka do danych: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "Dane aparatu i obiektyw" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "Nie udało się odczytać pliku projektu %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Biblioteki" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "" "Autopano ze strony http://autopano.kolor.com jest niedostępne dla systemu OS " "X" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Użycie zamiast tego Autopano-Sift" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1254,64 +1292,65 @@ "Co najmniej jedno pole danych jest puste.\n" "Proszę sprawdzić wprowadzone dane." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Spróbuj połączyć wszystkie nakładające się obrazy." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Działa tylko dla par obrazów bez zdefiniowanych punktów kontrolnych." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Wybierz program do wykrywania punktów kontrolnych" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Pliki wykonywalne (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "lewy x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "lewy y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "prawy x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "prawy y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Wyrównanie" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Odległość" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "Dodano nowy punkt kontrolny" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "Szukam podobnych punktów..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Błąd podczas dostrajania" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1320,25 +1359,29 @@ "Punkt dostrojony, kąt: %.0f stopni, współczynnik korelacji: %0.3f, " "zakrzywienie: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "zmień punkty lub naciśnij prawy przycisk myszy by dodać parę" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Estymowany punkt jest poza obszarem zdjęcia" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Nie znaleziono podobnego punktu." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1349,31 +1392,37 @@ "Współczynnik korelacji (%.3f) jest mniejszy niż próg ustawiony w " "ustawieniach programu." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Dodaj nową linię" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linia %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Próg korelacji:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normalny" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "linia pionowa" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "linia pozioma" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1383,38 +1432,38 @@ "Aby utworzyć mniej punktów\n" "wprowadź większą liczbę." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Próg wykrywania rogów" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Utwórz punkty kontrolne" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Skala wykrywania rogów" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Błąd podczas tworzenia punktów kontrolnych:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Zaznacz punkt na prawym zdjęciu" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1422,55 +1471,56 @@ "Nie można uruchomić Celeste bez co najmniej jednego punktu kontrolnego " "łączącego dwa zdjęcia" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Uruchamianie Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Wczytywanie pliku modelu" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Usunięto %lu punktów kontrolnych" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Wynik Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Czyszczenie" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Utwórz powiązania" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Próbuje usunąć punkty kontrolne z ruchomych obiektów" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Wyczyść przetwarzanie wsadowe" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Usuń oddalone punkty kontrolne za pomocą metody statystycznej" @@ -1482,23 +1532,23 @@ msgid "Could not process event!" msgstr "Nie można obsłużyć wydarzenia!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "lewe zdjęcie" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "prawe zdjęcie" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1506,7 +1556,7 @@ "Wpisz minimalny błąd punktów kontrolnych\n" "Zostaną zaznaczone wszystkie punkty z większym błędem" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Zaznacz punkty kontrolne" @@ -1587,60 +1637,60 @@ "lub obróć za pomocą przeciągania z wciśniętym prawym klawiszem myszy lub " "klawiszem Ctrl." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Szybki podgląd panoramy" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Plik" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "wyświetlone zdjęcia" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Wszystkie" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Brak" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Ukryj" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "przeciągnij by zmienić pionowe pole widzenia" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "przeciągnij by zmienić poziome pole widzenia" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Podgląd" @@ -1648,87 +1698,92 @@ msgid "Overview" msgstr "Widok ogólny" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Przywraca parametry rzutu do ich wartości domyślnych." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "parametr:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Nie wczytano żadnych zdjęć." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "Wczytano %lu zdjęć." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Zdjęcia są połączone za pomocą %lu punktów kontrolnych.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Znaleziono %d niepołączonych grup zdjęć: " -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Zdjęcia lub punkty kontrolne zostały zmienione. Należy ponownie wykonać " "wyrównanie." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Średni błąd po optymalizacji: %.1f piksel, maksymalnie: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Prostoliniowy" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindryczny" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Wartość kąta obrotu poziomego (yaw) musi być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "" "Wartość kąta obrotu pionowego (obniżenia/podwyższenia horyzontu, pitch) musi " "być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Wartość obrotu wokół osi optycznej aparatu musi być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "Wartość X musi być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Wartość Y musi być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Wartość Z musi być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Wartość musi być liczbowa." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1736,55 +1791,55 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "różnica" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Automatyczne przycięcie" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Wyliczanie optymalnego przycięcia" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Góra powinna być liczbą całkowitą większą od 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "Lewo powinno być liczbą całkowitą większą od 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "Prawo powinno być liczbą całkowitą większą od 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "Dół powinien być liczbą całkowitą większą od 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "Lewa krawędź musi być mniejsza niż prawa" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "Górna krawędź musi być mniejsza niż dolna" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Błędna wartość HFOV. Maksimum HFOV dla tego rzutu to %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Błędna wartość VFOV. Maksimum VFOV dla tego rzutu to %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1792,7 +1847,7 @@ "Przy szerokim polu widzenia, panoramy z rzutem prostoliniowym są bardzo " "porozciągane w kierunku brzegów.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1800,17 +1855,17 @@ "Ponieważ pole widzenia jest szerokie tylko w kierunku poziomym, lepiej " "spróbować rzutu cylindrycznego." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Dla bardzo szerokich panoram lepiej spróbować rzutu walcowego " "równoodległościowego." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " Można także spróbować rzutu Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1822,7 +1877,7 @@ "Rzut walcowy równoodległościowy zmieści tę samą zawartość w mniejszej " "przestrzeni pionowej." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1833,7 +1888,7 @@ "Rzut cylindryczny zachowuje linie pionowe w przeciwieństwie do rzutu " "walcowego równoodległościowego." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1845,7 +1900,7 @@ "Zgodny rzut zachowuje kąty wokół punktu, co zwykle czyni go swobodniejszym " "dla oka." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1857,13 +1912,13 @@ "Rzut panoramiczny rybiego oka ścieśnia je, co pozwala zachować szerokie pole " "widzenia i mieć rozsądne pokrycie pośrodku." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "Ustawianie panoramy na rzut prostoliniowy zachowa proste linie." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1873,27 +1928,27 @@ "rzutu.\n" "Aby zobaczyć ten pasek ponownie, należy go uaktywnić w ustawieniach." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normalny, własny" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mozaika" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mozaika, własny" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfera" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Płaszczyzna mozaiki" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1901,24 +1956,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1927,31 +1982,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "Wyczyść punkty kontrolne" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "Przetwarzanie:" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "Szukam podobnych punktów..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "Sprawdzanie parzystości" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1959,7 +2014,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1967,7 +2022,7 @@ "Błąd inicjowania GLEW\n" "Nie można otworzyć okna szybkiego podglądu." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2013,7 +2068,7 @@ msgstr "Liczba masek" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Ucięcie" @@ -2046,7 +2101,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Maksymalna różnica Ev musi być większa od 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Serie" @@ -2225,7 +2280,7 @@ msgid "Shutter speed" msgstr "Szybkość migawki" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2376,97 +2431,97 @@ msgid "Camera response parameter" msgstr "Parametr reakcji aparatu" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "Obiektyw %d" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr "Seria %d" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "Seria wyjściowa %d" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Warstwa ekspozycji wyjściowej %d" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Dołącz" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Odłącz" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Wybierz wszystkie dla bieżącego obiektywu" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Porzuć wszystkie dla bieżącego obiektywu" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Wybierz wszystkie dla bieżącej serii" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Porzuć wszystkie dla bieżącej serii" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Wybierz wszystko" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Porzuć wszystko" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Modyfikuj zmienne zdjęcia..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Zapisz zdjęcie" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Zapisz zdjęcie" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "wyświetlone zdjęcia" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Liczba punktów na zdjęcie: " -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Punkty kontrolne" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2499,12 +2554,24 @@ msgid "Did you know..." msgstr "Czy wiesz że..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Wersja %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2512,76 +2579,76 @@ "Błąd krytyczny instalacji\n" "Nie znaleziono pliku data/splash.png w:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "Po&moc" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Akcje" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Wyjście" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "Przywróć zdefiniowane przez użytkownika..." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Edycja" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Przywróć zdefiniowane przez użytkownika..." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Uruchom a&systenta" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Rozpoczęto" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optymalizator" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Ekspozycja" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Zapisać zmiany w panoramie przed zamknięciem?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Zapisać zmiany w panoramie przed zamknięciem?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Zapisać zmiany w panoramie przed zamknięciem?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2590,7 +2657,7 @@ "W przypadku zamknięcia bez zapisu, zmiany od ostatniego zapisania zostaną " "utracone" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2599,7 +2666,7 @@ "W przypadku zamknięcia bez zapisu, zmiany od ostatniego zapisania zostaną " "utracone" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " @@ -2608,40 +2675,40 @@ "W przypadku zamknięcia bez zapisu, zmiany od ostatniego zapisania zostaną " "utracone" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Nie zapisuj" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Zamknij bez zapisu" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "wymuszone zamknięcie" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "zapisano projekt %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Składanie panoram" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Edytor panoramy" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2654,36 +2721,36 @@ "\n" "(Kod błędu: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Zapisz plik skryptu PTmendera" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Pliki PTmendera (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Otwórz projekt: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Otwarto projekt" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Wczytywanie zdjęć" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Błąd podczas otwierania projektu: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Otwórz projekt" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2694,11 +2761,11 @@ "Tego pliku nie można otworzyć przez Plik -> Otwórz.\n" "Czy dodać ten plik zdjęcia do bieżącego projektu?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Otwórz projekt: anuluj" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2706,7 +2773,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2714,34 +2781,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Nie udało się odczytać pliku projektu %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Otwórz plik projektu" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Pliki masek (*.msk)|*.msk|Wszystkie pliki (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Wybierz szablon projektu" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Dostrajanie wszystkich punktów" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Dostrajanie" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2771,23 +2838,23 @@ "Użyj listy Punktów Kontrolnych (F3) aby zobaczyć wszystkie punkty obecnego " "projektu\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Rezultat dostrajania" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Usuwanie punktów kontrolnych w maskach" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Wybierz skrypt Pythona" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Skrypty Pythona (*.py)|*.py|Wszystkie pliki (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2796,13 +2863,13 @@ "Nie znaleziono pliku \"%s\".\n" "Możliwe że został przeniesiony, usunięty lub zmieniono jego nazwę." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Błąd!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2810,12 +2877,12 @@ "Nie znaleziono pliku modelu Celeste, którego oczekiwano w %s; Hugin musi być " "poprawnie zainstalowany." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Nie udało się załadować pliku modelu Celeste %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2825,7 +2892,7 @@ "lub przesunięcie środka winietowania.\n" "Te parametry nie są obsługiwane w interfejsie prostym." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2835,7 +2902,7 @@ "przesunięcia lub przycięcia.\n" "Te parametry nie są obsługiwane w interfejsie prostym." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2845,28 +2912,28 @@ "parametry przesunięcia lub przycięcia.\n" "Te parametry nie są obsługiwane w interfejsie zaawansowanym." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Uruchamianie asystenta" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Ostrzeżenie - znaleziono %d niepołączonych grup zdjęć:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2879,7 +2946,7 @@ "\n" "Po dodaniu punktów, ponownie naciśnij przycisk \"Wyrównaj\"." -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2887,23 +2954,23 @@ "Asystent nie zakończył poprawnie pracy. Proszę sprawdzić wynikowy plik " "projektu." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Nie znaleziono pliku projektu" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Nie można uruchomić programu PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Uruchomiono niewłaściwy program" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Typ maski" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2911,29 +2978,29 @@ "Utwórz wielokątną maskę klikając lewym klawiszem myszy na obrazie, ustaw " "ostatni punkt za pomocą prawego klawisza myszy." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Zapisz maskę" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Pliki masek (*.msk)|*.msk|Wszystkie pliki (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Wczytaj maskę" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Wczytaj maskę: anuluj" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Nie można przeanalizować maski z pliku %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Proszę wpisać poprawny numer" @@ -3078,7 +3145,7 @@ msgstr "Wyrównanie fotometryczne" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Wczytywanie zdjęć" @@ -3124,65 +3191,69 @@ msgid "Photometric optimization finished" msgstr "Optymalizacja fotometryczna zakończona" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Dodaj pojedyncze zdjęcia..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Dodaj serię zdjęć..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Nie znaleziono pasujących zdjęć." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Modyfikuj zmienne zdjęcia..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Usuń wybrane zdjęcia" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Zablokuj pozycję tego zdjęcia" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ustaw to zdjęcie jako odniesienie ekspozycji" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nowy obiektyw" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Zmień obiektyw..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Wpisz numer nowego obiektywu" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Numer obiektywu" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Zmień numer obiektywu" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "Wczytaj dane obiektywu z bazy danych Lensfun" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Wczytaj parametry obiektywu z pliku ini" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3191,12 +3262,12 @@ "Czy wczytane parametry mają być zastosowane dla wszystkich zdjęć robionych " "tym samym obiektywem?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Pytanie" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3206,101 +3277,101 @@ "Zastosowanie pliku parametrów obiektywu może mieć niechciane efekty.\n" "Czy zastosować ustawienia mimo to?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Zapisz parametry obiektywu do pliku ini" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Usuń punkty kontrolne" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Wybrane zdjęcia nie mają punktów kontrolnych." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Czy na pewno usunąć %lu punktów kontrolnych?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Usuń punkty kontrolne" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Wyczyść punkty kontrolne" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Czyszczenie punktów kontrolnych" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Sprawdzanie parzystości" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Sprawdzanie całego projektu" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Zakończono czyszczenie" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Usuń punkty kontrolne w chmurach" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Przywróć zdefiniowane przez użytkownika..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Przywróć pozycje" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "Parametry przesunięcia" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Przywróć parametry obiektywu" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Przywróć parametry fotometryczne" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nowa seria" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Zmień serię..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Podaj numer nowej serii" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Numer serii" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Zmień numer serii" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Ustaw rozmiar serii..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Jakość:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3371,63 +3442,63 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Azymutalny równopowierzchniowy Lamberta" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "Szerokość powinna być liczbą całkowitą większą od 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "Wysokość powinna być liczbą całkowitą większą od 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "Lewa krawędź musi być mniejsza niż prawa." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Górna krawędź musi być mniejsza niż dolna." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " opcje programu PTmender nie są jeszcze obsługiwane" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " opcje programu PTblender nie są jeszcze obsługiwane" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " Opcje dla tego programu HDRMerge nie są jeszcze obsługiwane" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Nie można utworzyć pliku tymczasowego projektu" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Podaj nazwę pliku wyjściowego" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "Przywróć zdefiniowane przez użytkownika..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3437,7 +3508,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3450,7 +3521,7 @@ "obszaru w zakładce składania. Składanie panoramy o takim rozmiarze może " "wymagać dużo czasu i pamięci." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3458,26 +3529,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Czy na pewno złożyć taką dużą panoramę?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Złóż mimo to" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Pozwól poprawić" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3508,184 +3579,202 @@ msgid "Miscellaneous" msgstr "Różne" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Domyślne ustawienie systemu" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baskijski" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Kataloński" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Chiński uproszczony" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Chiński tradycyjny" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Czeski" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Duński" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holenderski" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Angielski" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francuski" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Niemiecki" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Węgierski" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Włoski" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japoński" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polski" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Brazylijski portugalski" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Rosyjski" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Słowacki" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Hiszpański" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Szwedzki" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Fiński" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Wybierz Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Pliki wykonywalne (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Wybierz Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Wybierz wszystko" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Wybierz wszystko" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Pliki logów (*.log)|*.log|Wszystkie pliki (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "Nie udało się odczytać pliku projektu %s." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Czy naprawdę przywrócić ustawienia do wartości domyślnych?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Wczytaj wartości domyślne" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Proszę najpierw wybrać wpis" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Wybierz wpis" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3693,30 +3782,30 @@ "Nie możesz usunąć ostatniego ustawienia.\n" "Wymagane jest co najmniej jedno ustawienie." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Czy na pewno chcesz usunąć ustawienie wykrywania punktów kontrolnych \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Usuń ustawienie wykrywania punktów kontrolnych" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Załaduj ustawienia wykrywania punktów kontrolnych" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Ustawienia wykrywania punktów kontrolnych (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Zapisz ustawienia wykrywania punktów kontrolnych" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3743,50 +3832,55 @@ msgid "Remove %lu control points" msgstr "Usunięto %lu punktów kontrolnych" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Podgląd panoramy" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opcje podglądu" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Rzut (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Tryb łączenia:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Wyjście:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Kompresja:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parametry rzutu" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Kliknij lewym przyciskiem myszy aby zdefiniować nowy punkt centralny, prawym " "przyciskiem aby przesunąć punkt na horyzont." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Wyśrodkuj panoramę lewym klawiszem myszy, ustaw horyzont prawym klawiszem" @@ -3806,7 +3900,7 @@ msgid "Click a connection to edit control points." msgstr "Kliknij na połączeniu aby edytować punkty kontrolne." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3814,33 +3908,115 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Wykrywanie: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Zamknij" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, fuzzy, c-format msgid "Directory '%s' does not exists" msgstr "" "Katalog %s nie istnieje.\n" "Proszę podać istniejący katalog." -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "Składanie wsadowe" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Otwiera program PTBatcher, procesor wsadowy plików projektu Hugina" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Interfejs Hugina do kalibracji obiektywu" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3855,11 +4031,11 @@ "Być może nie został zainstalowany poprawnie lub źle podano ścieżkę w " "ustawieniach." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "czyszczenie plików tymczasowych punktów kluczowych" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3868,15 +4044,15 @@ "Proszę użyć %namefile, %i lub %s by podać nazwę plików wejściowych dla " "wykrywacza punktów kontrolnych" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Błąd w poleceniu wykrywania punktów kontrolnych" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3888,14 +4064,14 @@ "Proszę wybrać mniej zdjęć lub umieścić zdjęcia w folderze\n" "z krótszą ścieżką" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Wybrano zbyt wiele zdjęć" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3906,38 +4082,38 @@ "\n" " Nie można wykonać polecenia: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Błąd wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Szukanie punktów kontrolnych" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Nie można wykonać polecenia: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3946,9 +4122,9 @@ "Polecenie: %s\n" "nie powiodło się z kodem błędu: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3963,13 +4139,13 @@ "\n" "Wykonane polecenie: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Błąd wykrywania punktów kontrolnych" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3977,7 +4153,7 @@ "Proszę użyć %i, aby podać nazwy plików wejściowych, a %k, aby podać plik " "punktów kluczowych dla kroku generowania" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3985,11 +4161,11 @@ "Proszę użyć %k, aby podać nazwy plików z punktami kluczowymi, a %o, aby " "podać plik wyjściowy projektu dla kroku dopasowywania" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "tworzenie pliku z punktami kluczowymi" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4002,11 +4178,11 @@ "\n" " Nie można wykonać polecenia: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Domyślnie" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4014,260 +4190,260 @@ "Nie można wyczyścić, przetwarzanie wsadowe w toku.\n" "Czy chcesz je anulować?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Wyczyszczono przetwarzanie wsadowe." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Błąd: Nie można uzyskać stanu, projektu z indeksem %d nie ma na liście." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Błąd: nie można wczytać pliku przetwarzania wsadowego." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Przetwarzanie wsadowe zakończone powodzeniem." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Przetwarzanie wsadowe zakończone z błędami." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Rozpoczynanie zamykania..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Zamykanie..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Rozpoczynanie zamykania..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Rozpoczynanie zamykania..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Zapisz projekt" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Nie podano przedrostka wyjściowego" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Nie podano plików projektu" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Składanie" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Asystent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Błąd podczas usuwania, projektu z id %d nie ma na liście." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Błąd: Nie można usunąć pliku projektu " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Uruchamianie przetwarzania wsadowego..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "Uruchomiono PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Przetwarzanie wsadowe w trakcie." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "Uruchamianie polecenia \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Składanie: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Wykrywanie: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Błąd: Nie można ustawić stanu, projektu z indeksem %d nie ma na liście." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Nie robi za wiele..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Wciśnięto klawisz Command." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Wciśnięto klawisz Control." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Czy pominąć wczytywanie listy wsadowej?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "Składanie" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Wyłącz po wykonaniu" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Proszę podać program wiersza poleceń do wykonania:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Podaj program" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Podaj katalog do wyszukania w nim projektów" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Podaj plik źródłowy projektu" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "Dodano projekty z katalogu " -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Dodaje projekt %s do kolejki składania." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Dodaje projekt %s do kolejki asystenta." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Przetwarzanie wsadowe zatrzymane" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Procesor wsadowy Hugina" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Podaj nazwę przedrostka wyjściowego dla projektu " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Nie można zmienić prefiksu wyników asystenta." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Proszę wybrać projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Proszę wybrać projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Podaj plik wsadowy do otwarcia" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Pliki projektów (*.ptb)|*.ptb|Wszystkie pliki (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Nie można otworzyć programu w Huginie." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Nie wybrano projektu. Otworzyć Hugina bez projektu?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Zatrzymano przetwarzanie wsadowe" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Kontynuowanie przetwarzania wsadowego..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4275,7 +4451,7 @@ "Na liście znajdują się nieprawidłowe projekty.\n" "Usunąć je również?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4283,16 +4459,16 @@ "Nie można usunąć, projekt w toku.\n" "Czy chcesz go anulować?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "Usunięto projekt " -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Proszę wybrać projekt do usunięcia" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4300,16 +4476,16 @@ "Nie można przywrócić, projekt w toku.\n" "Czy chcesz go anulować?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "Przywróć projekt " -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Proszę wybrać projekt do przywrócenia" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4317,31 +4493,31 @@ "Nie można przywrócić, projekty w toku.\n" "Czy chcesz anulować przetwarzanie wsadowe?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Podaj plik wsadowy do zapisania" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Pliki projektów (*.ptb)|*.ptb|Wszystkie pliki (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Wyczyść przetwarzanie wsadowe" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Uruchamianie przetwarzania wsadowego" @@ -4377,7 +4553,7 @@ msgid "E&xit" msgstr "&Wyjście" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4387,11 +4563,11 @@ "Zamknięcie okna spowoduje ich utratę.\n" "Mimo to kontynuować?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Przyjęto" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4401,11 +4577,11 @@ "Zamknięcie okna spowoduje ich pominięcie.\n" "Mimo to kontynuować?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Zatrzymaj" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4414,7 +4590,7 @@ "Katalog %s nie istnieje.\n" "Proszę podać istniejący katalog." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4422,7 +4598,7 @@ "Nie wybrano możliwej panoramy.\n" "Proszę wybrać przynajmniej jedną panoramę i spróbować ponownie." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4431,141 +4607,143 @@ "Nie wszystkie pliki projektów zostały poprawnie zapisane.\n" "Być może brak prawa zapisu do ich katalogów lub dysk jest pełny." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "Usuń wybrane zdjęcia" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "Wyszukiwanie panoram" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Odczyt zdjęcia %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Start" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Znaleziono %d możliwych panoram." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Nie znaleziono żadnej możliwej panoramy." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d zdjęć: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Wykryto błąd składni w parametrach, anulowanie." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "Uruchomiono PTBatcherGUI" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Oczekiwanie" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "W trakcie" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Zakończono" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Niepowodzenie" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Brak pliku" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Zatrzymanie" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Przedrostek wyjściowy" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Stan" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Ostatnio zmodyfikowany" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Format wyjściowy" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Rzut" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Rozmiar" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Błąd, nie można przekształcić id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Asystent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Zmień przedrostek" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Przywróć projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Edytuj w Huginie" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Usuń" @@ -4599,16 +4777,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Pliki logów (*.log)|*.log|Wszystkie pliki (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Nie udało się odczytać pliku projektu %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Podaj plik źródłowy projektu" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4618,7 +4796,7 @@ "Hugin nie potrafi pracować z taką nazwą pliku. Proszę podać prawidłową nazwę." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "O programie Hugin" @@ -4651,19 +4829,19 @@ msgstr "System" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4742,8 +4920,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Wybierz..." @@ -4835,7 +5016,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opcje" @@ -4870,10 +5051,6 @@ msgid "Send selected panoramas to queue" msgstr "Prześlij wybrane panoramy do kolejki" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Zamknij" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Wyszukiwanie panoram" @@ -4976,12 +5153,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "Za&kończ" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Zakończ program" @@ -5086,44 +5263,153 @@ msgid "adddir" msgstr "dodaj katalog" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "poprzednia para zdjęć" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "następna para zdjęć" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Opis:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "tryb:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Typ:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "linia pionowa" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Wszystkie zdjęcia jednocześnie" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "linia pozioma" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama z seriami" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Powiększenie:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Panorama wielorzędowa" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "dopasuj do okna" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Panorama wielorzędowa z seriami" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Dostrój" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Panorama wstępnie wyrównana" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Próbuje optymalizować obecnie aktywny punkt" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Wykrywacz" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Wykrywacz jednokrokowy" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Program:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Parametry:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Parametry czyszczenia:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Wykrywacz dwukrokowy" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Opisywanie cech:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Dopasowywanie cech:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Wykrywacz dla serii fotografii" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Pozostaw puste, kiedy wykrywacz punktów kontrolnych nie powinien być " +"uruchamiany na seriach fotografii." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Opcja zaawansowana" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "To ustawienie nie ma żadnych dodatkowych opcji." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"Poniższe szablony zostaną zastąpione przed uruchomieniem:\n" +"%o -- plik projektu (0.oto zostanie dodane jeśli użyjesz Autopano)\n" +"%p -- liczba punktów kontrolnych między każdą parą zdjęć\n" +"%v -- HFOV (poziome pole widzenia) pierwszego zdjęcia\n" +"%f -- rzut pierwszego zdjęcia (0-4, tak jak w panotools)\n" +"%i -- pliki zdjęć\n" +"%namefile -- plik zawierający nazwy plików ze zdjęciami\n" +"%s -- wejściowy skrypt panotools\n" +"%k -- plik(i) pośrednie z punktami kluczowymi" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parametry dla wykrywania punktów kontrolnych" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "poprzednia para zdjęć" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "następna para zdjęć" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "tryb:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "linia pionowa" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "linia pozioma" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Powiększenie:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "dopasuj do okna" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Dostrój" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Próbuje optymalizować obecnie aktywny punkt" #: hugin1/hugin/xrc/cp_editor_panel.xrc:261 msgid "auto fine-&tune" @@ -5182,7 +5468,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Usuń" @@ -5190,155 +5476,186 @@ msgid "Select by Distance" msgstr "Wybierz ze względu na odległość" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Opis:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Błędne nazwy plików" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Typ:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (autor A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Tak" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Wszystkie zdjęcia jednocześnie" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Nie" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama z seriami" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Modyfikuj skrypt Panorama Tools" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Panorama wielorzędowa" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"To jest skrypt, który zostanie wysłany do programu Panorama Tools. Edycja " +"tego tekstu jest techniką zaawansowaną." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Panorama wielorzędowa z seriami" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Kontynuuj z tymi zmianami" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Panorama wstępnie wyrównana" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Porzuć zmiany i anuluj" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Wykrywacz" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Grupuj wg:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Wykrywacz jednokrokowy" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimalne nałożenie:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Minimalne nałożenie przy wykrywaniu serii wyjściowej" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Parametry:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maksymalna różnica Ev:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Parametry czyszczenia:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maksymalna różnica EV przy wykrywaniu warstw wyjściowych" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Wykrywacz dwukrokowy" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Wyświetlanie" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Opisywanie cech:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Ogólne" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Dopasowywanie cech:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Dane EXIF" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Wykrywacz dla serii fotografii" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Pozycje" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Pozostaw puste, kiedy wykrywacz punktów kontrolnych nie powinien być " -"uruchamiany na seriach fotografii." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parametry obiektywu" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Opcja zaawansowana" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Parametry fotometryczne" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "To ustawienie nie ma żadnych dodatkowych opcji." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Typ obiektywu" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"Poniższe szablony zostaną zastąpione przed uruchomieniem:\n" -"%o -- plik projektu (0.oto zostanie dodane jeśli użyjesz Autopano)\n" -"%p -- liczba punktów kontrolnych między każdą parą zdjęć\n" -"%v -- HFOV (poziome pole widzenia) pierwszego zdjęcia\n" -"%f -- rzut pierwszego zdjęcia (0-4, tak jak w panotools)\n" -"%i -- pliki zdjęć\n" -"%namefile -- plik zawierający nazwy plików ze zdjęciami\n" -"%s -- wejściowy skrypt panotools\n" -"%k -- plik(i) pośrednie z punktami kluczowymi" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Dodaj zdjęcia..." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parametry dla wykrywania punktów kontrolnych" +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Typ obiektywu:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Mnożnik ogniskowej (crop):" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Dopasowywanie szczegółów" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Ustawienia:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +#, fuzzy +msgid "Run selected control point detector on the selected images" +msgstr "Usuń punkty kontrolne w maskach" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optymalizuj" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometria:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Oblicz" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometria:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Błędne nazwy plików" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Zaznaczone zdjęcie" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Modyfikuj skrypt Panorama Tools" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Wczytaj dane obiektywu..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"To jest skrypt, który zostanie wysłany do programu Panorama Tools. Edycja " -"tego tekstu jest techniką zaawansowaną." +"Wprowadź poziome pole widzenia (HFOV) lub ogniskową i mnożnik ogniskowej:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Kontynuuj z tymi zmianami" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Porzuć zmiany i anuluj" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "stopnie" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Dane aparatu i obiektyw" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Obrót poziomy:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Obrót pionowy:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Obrót osi optycznej:" @@ -5346,34 +5663,11 @@ msgid "Translation parameter" msgstr "Parametry przesunięcia" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Pozycje" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "widok w stopniach (v):" @@ -5473,7 +5767,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Pomoc" @@ -5517,8 +5811,8 @@ msgstr "Wczytaj maskę" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Zapisz" @@ -5531,121 +5825,47 @@ msgid "Manipulate image variables" msgstr "Modyfikuj zmienne zdjęcia..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Grupuj wg:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimalne nałożenie:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimalne nałożenie przy wykrywaniu serii wyjściowej" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maksymalna różnica Ev:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maksymalna różnica EV przy wykrywaniu warstw wyjściowych" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Wyświetlanie" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Ogólne" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Dane EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parametry obiektywu" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Parametry fotometryczne" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Typ obiektywu" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Dodaj zdjęcia..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Typ obiektywu:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Mnożnik ogniskowej (crop):" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Dopasowywanie szczegółów" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Ustawienia:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "Usuń punkty kontrolne w maskach" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optymalizuj" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometria:" +msgid "WB reference:" +msgstr "&Ustawienia" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Oblicz" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometria:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Odziedzicz parametry" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Zaznaczone zdjęcie" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Wczytaj dane obiektywu..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Przetwarzanie:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Wprowadź poziome pole widzenia (HFOV) lub ogniskową i mnożnik ogniskowej:" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "stopnie" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Dane aparatu i obiektyw" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importuj" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5792,14 +6012,6 @@ msgid "Don't ask again" msgstr "Nie pytaj ponownie" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Tak" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Nie" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5859,21 +6071,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Cofnij" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Cofnij ostatnie polecenie" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "Po&nów" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Ponów ostatnie polecenie" @@ -5918,12 +6130,12 @@ msgid "Use only normal control points in optimization." msgstr "Liczba punktów kontrolnych na tym zdjęciu" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optymalizuj" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Ponownie uruchom optymalizator z obecnymi ustawieniami" @@ -5953,16 +6165,16 @@ msgid "Run a python script" msgstr "Uruchamia skrypt Pythona" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Widok" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Pełny ekran" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Pokazuje główne okno Hugina na pełnym ekranie" @@ -6044,22 +6256,22 @@ msgid "Show the Stitcher panel" msgstr "Pokaż panel składania" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Prosty" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Zaawansowany" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Eksperta" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Interfejs" @@ -6082,86 +6294,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Informacja o różnych przyciskach itp." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Porada dnia" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Pokaż jedną z porad dnia." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Skróty klawiszowe" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "skróty klawiszowe" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Najczęściej zadawane pytania" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&O programie" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Ustawienia" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nowy" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nowy projekt" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Otwórz" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Otwórz projekt" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Zapisz" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Zapisz bieżący plik projektu" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Z&apisz jako" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Zapisz obecny projekt do nowego pliku" @@ -6177,19 +6389,19 @@ "Zapisz obecny projekt jako plik skryptu zgodny z programem PTStitcher, jest " "to użyteczne przy przetwarzaniu wsadowym" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Ostatnio używane projekty" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Lista ostatnio używanych plików projektu" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Uruchom składanie wsadowe" @@ -6275,7 +6487,7 @@ msgid "Show the OpenGL preview image" msgstr "Pokaż okno podglądu OpenGL" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Podgląd panoramy" @@ -6332,15 +6544,10 @@ msgstr "Wyklucz obszar ze wszystkich zdjęć tym obiektywem" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Eksportuj" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importuj" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopiuj" @@ -6385,8 +6592,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6493,7 +6700,8 @@ msgid "execute the PTOptimizer engine" msgstr "uruchom PTOptimizera" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientacja zdjęcia" @@ -6539,39 +6747,39 @@ msgid "Interpolator (i):" msgstr "Interpolator (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bikubiczny)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Dwuliniowa" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Najbliższy sąsiad" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "przybliżenie wartości pomiędzy pikselami źródłowymi" @@ -6600,7 +6808,7 @@ msgid "Enfuse options" msgstr "Opcje Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Pole widzenia:" @@ -6765,10 +6973,6 @@ msgid "Image fusion:" msgstr "Fuzja zdjęć:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Składacz HDR:" @@ -6874,16 +7078,16 @@ msgid "Output parameters" msgstr "Parametry wyjścia" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Tryb łączenia:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "" @@ -6955,27 +7159,43 @@ msgid "This affects the control points editor and mask editor." msgstr "Usuwa wszystkie punkty kontrolne wewnątrz zamaskowanych obszarów." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Plik wykonywalny programu Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "Dla domyślnych wartości systemu nie wypełniaj" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Plik wykonywalny programu Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Plik wykonywalny programu Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Opcje pliku" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Katalog tymczasowy:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "Dla domyślnych wartości systemu nie wypełniaj" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Domyślna nazwa pliku projektu:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Domyślny prefiks wyjścia:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7006,43 +7226,43 @@ "%lens - obiektyw (z pierwszego zdjęcia)\n" "%projectname - nazwa pliku projektu (tylko dla prefiksu wyjścia)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Domyślne nazwy plików" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Nazwy plików" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Wczytywanie zdjęć" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Automatycznie wyrównaj zdjęcia po ich wczytaniu" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Wykryj linie pionowe" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Wykrywa linie pionowe w zdjęciach w celu wypoziomowania panoramy" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Usuń ruchome punkty kontrolne (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Opcjonalne kroki asystenta" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Automatyczne wyrównanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7050,67 +7270,67 @@ "Liczba punktów kontrolnych\n" "dla każdego nachodzącego obszaru" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Zmniejsz panoramę wynikową" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "procent maks. szerokości zdjęcia" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Edytor punktów kontrolnych" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Tryb wyświetlania HDR i 16-bitowy" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Krzywa" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "liniowa" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logarytmiczna" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "użyta do wyświetlania w GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Szerokość łatki:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "piksele" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Szerokość pola wyszukiwania:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "procent szerokości zdjęcia" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Lokalna szerokość obszaru poszukiwania:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Próg korelacji:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7118,11 +7338,11 @@ "0: brak podobieństwa\n" "1: maksymalne podobieństwo" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Próg szczytu zakrzywienia:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7130,118 +7350,114 @@ "0: brak szczytu\n" "0.2: wyraźny szczyt" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Poszukiwanie obrotu" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Aktywuj poszukiwanie obrotu (wolniejsze, ale bardziej dokładne)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Kąt początkowy:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Kąt końcowy:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Kroki:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Wykrywanie punktów kontrolnych" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programy do wykrywania punktów kontrolnych" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nowy..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Edycja..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Przenieś w górę" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Przenieś w dół" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Ustaw domyślne" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Asystent używa ustawienia domyślnego." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Format wyjściowy" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Domyślny format pliku:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "domyślny format wyjściowy dla ostatecznej panoramy" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Kompresja TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "domyślna kompresja TIFF" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Jakość JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "domyślne ustawienie kompresji JPEG" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "Blender:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "Domyślne nazwy plików" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Procesor" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Silnik wykonujący składanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Natychmiastowe uruchamianie zadań składania" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7251,19 +7467,19 @@ "zadań. W przeciwnym wypadku procesor jest uruchamiany w stanie wstrzymanym, " "a użytkownik musi ręcznie uruchomić proces." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Nadpisywanie istniejących plików" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "UWAGA: istniejące pliki zostaną po cichu nadpisane." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Szczegółowe komunikaty wyjścia" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7271,20 +7487,20 @@ "Należy włączyć, aby uzyskać szczegóły, przydatne przy zgłaszaniu błędów albo " "do śledzenia postępów projektu." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Składanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Kopiowanie metadanych do plików końcowych z użyciem ExifToola" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Opcje Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7293,56 +7509,56 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "Dla domyślnych wartości systemu nie wypełniaj" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Opcje zaawansowane" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Liczba wątków:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7354,82 +7570,84 @@ "Należy ustawić tę wartość maksymalnie na liczbę procesorów lub rdzeni " "dostępnych w systemie." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 oznacza wykrywanie automatyczne" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "Składanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Domyślny interpolator (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Domyślnie zapisz przycięte zdjęcia" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "Użyj GPU do remapowania (EKSPERYMENTALNE)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Używaj procesora karty graficznej aby przyspieszyć remapowanie zdjęć" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Użyj alternatywnego programu Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Plik wykonywalny programu Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Parametry domyślne:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "To są parametry domyślne dla nowych projektów.\n" "Mogą być zmienione dla poszczególnych projektów w zakładce Składacza.\n" "Nie dodawaj parametrów -w, -o i --compression, są one ustawiane przez Hugin." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Użyj alternatywnego programu Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Plik wykonywalny programu Enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programy" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parametry Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Próg algorytmu SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7437,19 +7655,19 @@ "większy niż 0.5: większa czułość\n" "mniejszy niż 0.5: większa czułość" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Rozmiar filtru Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "mały" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "duży" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7457,7 +7675,7 @@ "duży jest bardziej dokładny\n" "mały może przeanalizować punkty kontrolne położone blisko krawędzi obrazu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7467,77 +7685,77 @@ "kolorów w nachodzących obszarach.\n" "Aby przyspieszyć obliczenia, używany jest tylko losowy podzbiór punktów." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Liczba punktów na zdjęcie: " -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Optymalizacja fotometryczna" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "Ostrzeżenie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "Optymalizuję panoramę" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "Optymalizuj teraz!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "" "Podpowiedzi dotyczące rzutów są pokazywane tylko w oknie szybkiego podglądu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Różne" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Ustawienia - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "Zaznacz punkt na lewym zdjęciu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7557,11 +7775,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Wyśrodkuj podgląd w poziomie" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Wyśrodkuj" @@ -7569,13 +7787,15 @@ msgid "Show the whole panorama" msgstr "Pokaż całą panoramę" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estymuj pole widzenia" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Zmieść" @@ -7583,7 +7803,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automatycznie wyprostuj zakrzywiony horyzont" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Wyprostuj" @@ -7681,34 +7902,34 @@ msgstr "" "Ustawia wartość ekspozycji panoramy na średnią ekspozycję z wszystkich zdjęć." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Pobieranie szarości" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Popraw globalnie balans bieli poprzez wybranie neutralnego obszaru szarości." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "&Edycja" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "Usuń ustawienie wykrywania punktów kontrolnych" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Tło:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Skala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7722,160 +7943,148 @@ "* Kliknij na linii, aby zmodyfikować powiązane zdjęcia w zakładce Punkty " "kontrolne." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Układ" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Prowadnice:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Reguła trójpodziału" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Złoty podział" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonalne" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Metoda diagonalna" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Złoty trójkąt (dolny)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Złoty trójkąt (górny)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automatycznie wyprostuj zakrzywiony horyzont." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Tryb przeciągania:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Zastosuj" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Przesuń panoramę lub przeciągnij zdjęcia na pozycję" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Przesuń/Przeciągnij" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Ustaw obszar przycięcia na największy prostokąt pokryty przez zdjęcia" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "Automatyczne przycięcie HDR" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Ustaw obszar przycięcia na największy prostokąt pokryty przez serie zdjęć" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "lewo:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "góra:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "prawo:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "dół:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Przywróć przycięcie na maksymalny możliwy obszar" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Zmień obszar przycięcia panoramy" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Edytor panoramy" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "Widok &ogólny" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Pokazuje widok ogólny sfery panoramy." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Siatka" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Pokazuje siatkę." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Dodaj zdjęcia" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Odziedzicz pozycje w tej serii." -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Wprowadź liczbę zdjęć w serii" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Odziedzicz pozycje w tej serii." -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Usuń wybrane zdjęcia" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Przywróć pozycje" @@ -8186,6 +8395,75 @@ "w przypadku znacznie zachodzących na siebie zdjęć i wielu dobrze " "rozproszonych punktów kontrolnych." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Ustawienia" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Zdjęcia" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Dodaj zdjęcia..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Dodaj następne zdjęcie do obecnego projektu" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Zapisz zdjęcie" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Usuń wybrane zdjęcia" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Skala wykrywania rogów" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Przesuń panoramę lub przeciągnij zdjęcia na pozycję" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Zmień obszar przycięcia panoramy" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Użyj GPU do remapowania (EKSPERYMENTALNE)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Wszystkie pliki zdjęć|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." +#~ "png;*. PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*." +#~ "exr;*.EXR| Pliki JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Pliki TIFF " +#~ "(*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Pliki PNG (*.png)|*.png;*.PNG|" +#~ "Pliki HDR (*.hdr)|*.hdr;*.HDR|Pliki EXR (*.exr)|*.exr;*.EXR|Wszystkie " +#~ "pliki (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (autor A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Interfejs" @@ -9181,9 +9459,5 @@ #~ msgstr "zniekształcenie (c):" #, fuzzy -#~ msgid "Image file:" -#~ msgstr "Rozmiar obrazu:" - -#, fuzzy #~ msgid "center shift x:" #~ msgstr "Przesunięcie środka zdjęcia" diff -Nru hugin-2018.0.0+dfsg/src/translations/pt_BR.po hugin-2019.0.0+dfsg/src/translations/pt_BR.po --- hugin-2018.0.0+dfsg/src/translations/pt_BR.po 2018-01-13 07:52:07.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/pt_BR.po 2019-02-21 18:12:40.000000000 +0000 @@ -5,19 +5,19 @@ # # Ademar de Souza Reis Jr. , 2005, 2006, 2007, 2009. # Carlos Eduardo G. Carvalho , 2016. -# Luís Henrique Camargo Quiroz , 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Luís Henrique Camargo Quiroz , 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-12-19 13:58-0300\n" -"Last-Translator: Luis Henrique Camargo Quiroz \n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2019-02-21 14:18-0300\n" +"Last-Translator: Luís Henrique Camargo Quiroz \n" "Language-Team: Portuguese \n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -47,16 +47,16 @@ msgid "Searching for best crop..." msgstr "Determinando melhor recorte..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Programa externo %s não encontrado no pacote, revertendo para diretórios do " "sistema (path)" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -83,9 +83,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|PNG-File (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "O arquivo %s já existe. Sobrescrevê-lo?" @@ -123,7 +123,7 @@ msgstr "O fator de corte deve ser positivo." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -136,24 +136,28 @@ "Você quer mesmo usar este valor tão alto?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -174,8 +178,8 @@ msgstr "Olho de peixe full-frame" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirretangular" @@ -206,11 +210,13 @@ msgid "builtin" msgstr "interno" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "personalizado (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Linear" @@ -236,16 +242,16 @@ msgid "Error loading lens parameters" msgstr "Erro ao carregar parâmetros de lente" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Salvar arquivo de parâmetros de lente" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Arquivos de parâmetros de lente (*.ini)|*.ini|Todos os arquivos (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Gravar projeto" @@ -281,22 +287,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Erro pausando processo %ld, código 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Cancelar" @@ -330,12 +337,12 @@ msgid "Panorama Tools" msgstr "Ferramentas de Panorama" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Não foi possível abrir o arquivo de projeto:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "não foi possível abrir script: %s" @@ -345,8 +352,8 @@ msgid "Project %s does not contain any active images." msgstr "O projeto %s não contém nenhuma imagem ativa." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "erro enquanto parseava script do panotools: %s" @@ -360,17 +367,17 @@ msgid "Could not create temporary file" msgstr "Não foi possível criar um arquivo temporário" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "A fila está vazia. Isto nunca deveria acontecer." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Erro durante montagem" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -378,11 +385,11 @@ "Sobrescrever imagens existentes?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Sobrescrever imagens existentes" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -391,12 +398,12 @@ "Erro ao montar projeto\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Erro durante execução do assistente" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -405,277 +412,287 @@ "Erro ao executar o assistente: \n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Montando Panorama..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Plataforma:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Versão:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Diretório de trabalho:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Prefixo de saída:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Homogeneizador:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Homogeneizador desconhecido (comando enblend --version falhou)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "interno" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Fusão de exposição:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Misturador de exposição desconhecido (comando enfuse --version falhou)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Versão do EXifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "EXifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "FALHOU" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Número de imagens ativas:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Valor de exposição de saída: %.1f" # aqui "canvas" ficou como "panorama", e aí fiz assim algures -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Tamanho do panorama: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "Região de interesse (ROI): (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "Campo de visão (FOV): %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projeção:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Usando GPU para remapeamento:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "verdade" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "falso" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Resultados do panorama:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Correção da exposição, baixa faixa dinâmica" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Fusão de exposição das pilhas" # ver onde se usa, estará bom? -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Fusão de exposição de qualquer arranjo" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Alta faixa dinâmica" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Imagens remapeadas:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Sem correção da exposição, baixa faixa dinâmica" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Pilhas combinadas:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Fusão de exposição das pilhas" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Camadas:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "" "Resultado: camadas de exposição similar homogeneizadas, sem correção de " "exposição" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Primeira imagem de entrada" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Número:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Nome do Arquivo:" # aqui "canvas" ficou como "panorama", e aí fiz assim algures -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Tamanho: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Tipo de resposta:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "Campo de visão horizontal (HFOV): %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Valor de exposição: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Remapeando e fundindo imagens LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Remapeando imagens LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Fundindo imagens..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Remapeando imagens LDR e fundindo camadas de exposição..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Remapeando imagens LDR sem correção de exposição..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Fundindo camada de exposição de saída %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Fundindo todas as camadas de exposição..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Fundindo pilha número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Fundindo todas as pilhas..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Remapeando imagens HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Combinando pilha hdr número %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Fundindo pilhas HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Atualizando metadados..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Montando, usando \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "primeira imagem" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "última imagem" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "diretório" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Fabricante da câmera" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Modelo da câmera" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -683,35 +700,67 @@ msgid "Lens" msgstr "Lente" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "projeção desconhecida" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Todos os arquivos de imagem" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "arquivos JPEG (*.jpg,*.jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "arquivos TIFF (*.tif,*.tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "arquivos PNG (*.png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "arquivos HDR (*.hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "arquivos EXR (*.exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "todos os arquivos (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "Arquivos raw" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Erro" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -722,26 +771,11 @@ "Hugin não suporta estes caracteres. Favor renomear o arquivo e tentar " "novamente." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Relatório de debug gerado em \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Todos os arquivos de imagem|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." -"TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." -"HDR;*.exr;*.EXR|Arquivos JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|" -"Arquivos TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Arquivos PNG (*.png)|" -"*.png;*.PNG|Arquivos HDR (*.hdr)|*.hdr;*.HDR|Arquivos EXR (*.exr)|*.exr;*." -"EXR|Todos os Arquivos (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -753,27 +787,27 @@ msgstr "O valor \"%s\" não é um número válido." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Aviso" @@ -790,7 +824,7 @@ msgid "Could not save information into database." msgstr "Não pôde gravar informação no banco de dados." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -801,11 +835,11 @@ "%s\n" "Abortado" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Formato de imagem não suportado" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -817,7 +851,7 @@ "Hugin não lida com este tipo de imagem. Pulando esta imagem.\n" "Converta a imagem para tons de cinza e tente recarregar." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -834,13 +868,13 @@ "Hugin não lida com este tipo de imagem. Pulando esta imagem.\n" "Converta a imagem para tons de cinza ou RGB e tente recarregar." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin suporta apenas imagens RGB ou tons de cinza (com ou sem canal alfa)" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -849,7 +883,7 @@ "O arquivo \"%s\" é uma imagem em tons de cinza, mas outras imagens no " "projeto são coloridas." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -858,7 +892,7 @@ "O arquivo \"%s\" é uma imagem colorida, mas outras imagens no projeto são em " "tons de cinza." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -867,7 +901,7 @@ "Hugin não lida com tal mistura de tipos de imagem. Pulando esta imagem.\n" "Converta a imagem para tons de cinza ou RGB e tente recarregar." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -876,7 +910,7 @@ "O arquivo \"%s\" não tem um perfil icc embutido, mas outras imagens no " "projeto têm um perfil \"%s\" embutido." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -885,7 +919,7 @@ "O arquivo \"%s\" tem um perfil icc \"%s\" embutido, mas outras imagens no " "projeto não têm perfil icc embutido." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -894,7 +928,7 @@ "O arquivo \"%s\" tem o perfil \"%s\" icc embutido, mas outras imagens no " "projeto têm perfil \"%s\" embutido." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -902,7 +936,7 @@ "O Hugin espera que todas as imagens possuam o mesmo perfil de cores.\n" "Favor converter todas as imagens para o mesmo perfil e tentar novamente." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -910,7 +944,7 @@ "O Hugin detectou pilhas de imagens nas que foram adicionadas e vai atribuir " "números de pilhas correspondentes para estas imagens." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -919,11 +953,11 @@ "Hugin detectou pilhas de imagens no projeto. Números de pilhas serão " "reatribuídos baseados nesta detecção. Os números atuais serão sobrescritos." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "A posição das imagens em cada pilha deve ser ligada?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -936,25 +970,25 @@ "fino da posição (por exemplo ao fotografar à mão livre), então não ligue as " "posições." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Ligar posição" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Não ligar posição" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Não atribuir pilhas" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Manter as pilhas existentes" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -964,16 +998,16 @@ "encontrada.\n" "Favor selecionar manualmente a imagem correta." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Arquivo de imagem não encontrado" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Selecione a imagem %s" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -984,16 +1018,17 @@ "\n" "Pressione OK para removê-lo(s)." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Erro Detectado" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Adicionar imagens" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -1002,32 +1037,32 @@ "Erro, o modelo espera %d imagens,\n" "o projeto atual contém %d imagens\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Não foi possível aplicar o modelo" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Erro abrindo arquivo de projeto" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultado" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "diretório xrc não encontrado no pacote (bundle)" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Erro Fatal" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1061,7 +1096,7 @@ "das imagens já adicionadas. Favor verificar as imagens outra vez, se você " "selecionou as imagens corretas." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Adicionar Imagem: cancelar" @@ -1074,9 +1109,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1093,7 +1128,7 @@ msgstr "Procurando linhas..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Terminado" @@ -1107,11 +1142,11 @@ "Favor rodar \"achar linhas\" antes. Se não encontrar linhas (arestas), " "altere os parâmetros." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Otimizando parâmetros de distorção de lente..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1121,145 +1156,145 @@ "Favor rodar \"achar linhas\" e \"otimizar\" antes de gravar os dados de " "lente. Se não forem achadas linhas, alterar os parâmetros." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Salvar parâmetros de lente em um arquivo '.ini'" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Gravar parâmetros de lente em banco de dados" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Gravando parâmetros de lente..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Salvar lente" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Salvar arquivo de projeto" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Arquivos de projeto (*.pto)|*.pto|Todos os arquivos(*)|*" # keypoint = control point? -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Removendo arquivos temporários..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "mostra esta mensagem de ajuda" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "executar o assistente" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "monte panorama com tal projeto" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "número de threads usados" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "prefixo para montagem de panorama" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "Utilize comandos definidos pelo usuário no arquivo" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "Utilize comandos definidos pelo usuário no arquivo" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "só imprime os comandos" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Sistema operacional: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bits" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bits" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arquitetura: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Memória livre: %lld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Página de código ativa: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Versão: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Caminho para recursos: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Caminho para dados: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Banco de dados de câmera e lente do Hugin: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "\"Multi-threading\" usando std::thread do C++11 e OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Perfil do monitor: %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Bibliotecas" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "" "Autopano, disponível em http://autopano.kolor.com não está disponível para " "OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Usando Autopano-Sift como alternativa" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1267,64 +1302,65 @@ "Pelo menos um campo de entrada está vazio.\n" "Por favor verifique os valores." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Tente conectar todas as imagens que se sobrepõem." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Só funciona em pares de imagens sem pontos de controle." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Selecione o programa detector de pontos de controle" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Executáveis (*.exe,*.vbs,*.cmd,*.bat)|*.exe;*.vbs;*.cmd,*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "esquerda x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "esquerda y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "direita x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "direita y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Alinhamento" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distância" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "novo ponto de controle adicionado" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "procurando por pontos similares..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Erro durante refinamento" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " @@ -1333,20 +1369,24 @@ "Ponto refinado, ângulo: %.0f grau, coeficiente de correlação: %0.3f, " "curvatura: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" "altere os pontos, ou pressione o botão direito do mouse para adicionar o par" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Ponto estimado fora da imagem" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "Distância entre pontos de controle muito curta; omitindo ajuste fino." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Ponto similar não encontrado." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1354,7 +1394,7 @@ "Uma transformação interna deu errado.\n" "Verifique que o ponto esteja dentro da imagem." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1365,31 +1405,36 @@ "O coeficiente de correlação (%.3f) é menor do que o limite configurado nas " "preferências." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Adicionar nova linha" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linha %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Correlação" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "Linha vertical" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "Linha horizontal" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1399,38 +1444,38 @@ "Para criar menos pontos,\n" "use um valor alto." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Limite de detecção de cantos" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Criar pontos de controle" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Escala de detecção de cantos" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Erro durante criação de pontos de controle:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Selecione ponto na imagem à direita" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Selecione ponto na imagem à esquerda" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Criar pontos de controle (configuração atual: %s) " -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1438,35 +1483,35 @@ "Não é possível executar o celeste sem pelo menos um ponto de controle " "conectando as duas imagens" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Executando Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Carregando arquivo modelo" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Removidos %lu pontos de controle" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Resultado do Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Limpando" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Criar pontos de controle" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1474,19 +1519,20 @@ "Criar pontos de controle para o par de imagens com o detetor de pontos de " "controle atualmente selecionado na aba de fotos." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Tenta remover pontos de controle de nuvens" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Limpar pontos de controle" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Remover pontos de controle de bordas por modelo estatístico" @@ -1498,23 +1544,23 @@ msgid "Could not process event!" msgstr "Não foi possível processar o evento!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Imagem esquerda" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Imagem direita" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1522,7 +1568,7 @@ "Insira o valor mínimo para erro de pontos de controle.\n" "Todos os pontos com valor maior serão selecionados" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Selecione Pontos de Controle" @@ -1599,60 +1645,60 @@ "Arraste para mover as imagens (opcionalmente usando shift para restrições) " "ou gire-as pressionando botão direito ou Ctrl enquanto as arrasta." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Pré-visualização rápida do panorama" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Arquivo" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "Imagens mostradas" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Todas" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Nenhum" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Esconder" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV (Campo de Visualização Vertical)" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "arraste para alterar o campo vertical de visão" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV (Campo de Visualização Horizontal)" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "arraste para alterar o campo horizontal de visão" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Pré-visualização" @@ -1660,85 +1706,90 @@ msgid "Overview" msgstr "Pré-visualização" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Retorna os parâmetros de projeção para seus valores padrão." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "parâmetro:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "não há imagens carregadas" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu imagens carregadas." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "As imagens estão conectadas por %lu pontos de controle.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Encontrados %lu grupos de imagens desconectadas: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Imagens ou pontos de controle foram alterados, um novo alinhamento é " "necessário." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Erro médio após otimização: %.1f pixel, máximo: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Retilinear" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cilíndrico" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Valor precisa ser numérico (yaw)." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Valor precisa ser numérico (pitch)." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Valor precisa ser numérico (roll)." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "O valor de X deve ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Valor de Y precisa ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Valor de Z precisa ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Valor precisa ser numérico." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "Valor para compressão de faixa fora da faixa válida." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1750,55 +1801,55 @@ "Mas este projeto tem parâmetros Tpy e Tpp não-nulos.\n" "Estes parâmetros Tpy e Tpp devem ser reiniciados para zero?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "diferença" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Auto-recorte" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Calculando recorte ótimo" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Topo precisa ser um inteiro maior que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "esquerda precisa ser um inteiro maior que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "direita precisa ser um inteiro maior que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "embaixo precisa ser um inteiro maior que 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "o limite esquerdo deve ter valor menor do que o da direita" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "o limite superior deve ter valor menor do que o inferior" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "HFOV inválido. O valor máximo para essa projeção é %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "VFOV inválido. O valor máximo para essa projeção é %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1806,7 +1857,7 @@ "Com um grande campo visual, panoramas com projeção retilinear ficam muito " "repuxados nas bordas. \n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1814,16 +1865,16 @@ "Como o campo visual é bastante amplo apenas na direção horizontal, " "experimente uma projeção cilíndrica." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" "Para um panorama bastante amplo, experimente uma projeção equirretangular." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Você pode experimentar também a projeção Panini." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1835,7 +1886,7 @@ "Uma projeção equirretangular consegue ajustar a mesma imagem numa altura " "menor." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1846,7 +1897,7 @@ "Projeções cilíndricas preservam linhas verticais, ao contrário das " "equirretangulares." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1856,7 +1907,7 @@ "A projeção estereográfica é conforme, ao contrário desta olho-de-peixe. \n" "Projeções conformes preservam os ângulos, ajudando a ver detalhes." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1868,13 +1919,13 @@ "A projeção olho-de-peixe comprime, de modo que se pode manter um campo " "visual grande e ainda ter razoável visualização no meio da imagem." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "Usar projeção retilinear para o panorama preserva as linhas retas." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1884,27 +1935,27 @@ "projeção. \n" "Se quiser vê-la novamente, re-ative a barra nas preferências." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaico" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaico, individual" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfera" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Plano do mosaico" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1915,12 +1966,12 @@ "\n" "O panorama deve ser reotimizado agora?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "A estratégia selecionada para o otimizador é \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1928,7 +1979,7 @@ "A região selecionada não contém imagens ativas.\n" "Favor selecionar uma região coberta por ao menos 2 imagens." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1936,7 +1987,7 @@ "A região selecionada é coberta por uma imagem apenas.\n" "Não se pode criar pontos de controle para uma só imagem." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1950,27 +2001,27 @@ "\n" "Continuar assim mesmo?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Procurando pontos de controle" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Processando" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Remapear imagem para projeção de panorama..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Emparelhando por pontos de interesse..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Verificando resultados..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1981,7 +2032,7 @@ "\n" "O panorama deve ser reotimizado agora?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1991,7 +2042,7 @@ # verificar se placa gráfica oferece estes recursos! Verificar se o driver está atualizado. # Check if the graphic card has this capabilities. Also check for updated drivers! -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2037,7 +2088,7 @@ msgstr "Número de máscaras" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Cortar" @@ -2070,7 +2121,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "A diferença máxima de Ev deve ser maior que 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Pilhas" @@ -2248,7 +2299,7 @@ msgid "Shutter speed" msgstr "Velocidade do obturador" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2395,93 +2446,93 @@ msgid "Camera response parameter" msgstr "Parâmetro de resposta da câmera" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "não ativo" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "ativo" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Lente %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Pilha %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Pilha de saída %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Camada de exposição de saída %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Ligação" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Remover ligação" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Selecionar tudo para a lente atual" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Desselecionar tudo da lente atual" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Selecionar tudo da pilha atual" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Desselecionar tudo da pilha atual" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Selecionar tudo" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Desselecionar tudo" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Editar variáveis da imagem:" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Desativar imagem" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Ativar imagem" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Ativar imagens" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Desativar imagens" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Pontos de Controle" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2514,12 +2565,26 @@ msgid "Did you know..." msgstr "Você sabia..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" +"Você selecionou apenas um arquivo RAW. Isto não é recomendado.\n" +"Todos os arquivos RAW devem ser convertidos de uma única vez." + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "Converter assim mesmo." + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versão %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2527,70 +2592,70 @@ "Erro fatal (instalação)\n" "O arquivo data/splash.png não foi encontrado em:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "A&juda" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Ações" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "Resultad&O" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Sequência definida pelo usuário %s" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Sequências de saída definidas pelo usuário" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Editar" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "Assistente definido pelo usuário: %s" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "Assistente definido pelo usuário" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Iniciado" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Otimizador" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Exposição" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "Gravar alterações no projeto antes de abrir um outro?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "Gravar alterações no projeto antes de começar um novo?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "Gravar alterações no projeto antes de fechar?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2598,7 +2663,7 @@ "Se você carregar outro projeto sem gravar, as mudanças desde a última " "gravação serão perdidas." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2606,7 +2671,7 @@ "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:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2614,40 +2679,40 @@ "Se você sair sem gravar, as alterações feitas após a última gravação serão " "perdidas." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Não gravar" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Fechar sem gravar" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "fechamento forçado" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "projeto %s salvo" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Criador de Panoramas" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Editor de panorama" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2660,35 +2725,35 @@ "\n" "Código de erro: %s" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Salvar arquivo de script PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Arquivos PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Abrir projeto: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projeto aberto" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "Carregamento cancelado" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Erro abrindo projeto: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Abrir arquivo de projeto" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2699,11 +2764,11 @@ "Este arquivo não pode ser aberto por Arquivo, Abrir.\n" "Você quer, alternativamente, adicionar esta imagem ao projeto atual?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Abrir projeto: cancelar" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2714,7 +2779,7 @@ "Este arquivo não é uma imagem válida.\n" "O arquivo será removido do projeto." -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2726,32 +2791,32 @@ "acessível.\n" "O arquivo será removido do projeto." -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Não foi possível ler o arquivo de projeto %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Abre um arquivo do Papywizard" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Arquivos XML do Papywizard (*.xml)|*.xml|Todos os Arquivos (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Escolha o modelo de projeto" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Refinando todos os pontos" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Refinando" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2780,23 +2845,23 @@ "Use a lista de pontos de controle (F3) para visualizar todos os pontos do " "projeto.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Resultado do refinamento" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Removendo pontos de controle nas máscaras" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Selecionar script python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Script python (*.py)|*.py;|Todos os arquivos(*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2805,13 +2870,13 @@ "Arquivo \"%s\" não encontrado.\n" "Talvez o arquivo tenha sido renomeado, movido ou removido." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Erro!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2819,13 +2884,13 @@ "Arquivo de modelo do Celeste em %s não encontrado, o Hugin precisa ser " "corretamente instalado." -# Celeste model file - com oé o tal modelo do Celeste? -#: hugin1/hugin/MainFrame.cpp:2136 +# Celeste model file - como é o tal modelo do Celeste? +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Não foi possível carregar o arquivo de modelo do Celeste: %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2835,7 +2900,7 @@ "deslocamento do centro de vinheta.\n" "Tais recursos não são suportados pela interface simples." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2845,7 +2910,7 @@ "parâmetros de cisalhamento.\n" "Tais recursos não são suportados pela interface simples." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2855,7 +2920,7 @@ "parâmetros de cisalhamento.\n" "Tais recursos não são suportados pela interface avançada." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." @@ -2863,11 +2928,11 @@ "A fila do assistente está vazia. Isto indica um erro no arquivo de " "assistente definido pelo usuário." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Executando o assistente" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2875,12 +2940,12 @@ "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:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Atenção, encontrados %d grupos de imagens desconectados:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2892,7 +2957,7 @@ "\n" "Após adicionar os pontos, pressione o botão \"Alinhar\" novamente" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." @@ -2900,23 +2965,23 @@ "O assistente não foi bem sucedido. Favor verificar o arquivo de projeto " "criado." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Arquivo do projeto não encontrado" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Não consegue iniciar o PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Disparou programa errado" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Tipo de máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2924,29 +2989,29 @@ "Crie uma máscara poligonal clicando com o botão esquerdo na imagem (e mesmo " "fora das bordas), defina o último ponto clicando com o botão direito." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Gravar máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Arquivos de máscara (*.msk)|*.msk|Todos os Arquivos (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Carregar máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Cancelar carregamento de máscara" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Não foi possível 'parsear' a máscara do arquivo %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Por favor insira um número válido" @@ -3092,7 +3157,7 @@ msgstr "Alinhamento fotométrico" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Carregando imagens" @@ -3136,63 +3201,67 @@ msgid "Photometric optimization finished" msgstr "Otimização fotométrica finalizada" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Adicionar fotos individualmente..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "Deixe-me selecionar diversos arquivos RAW." + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Adicionar sequência de fotos..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Imagens correspondentes não encontradas." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Editar variáveis da imagem..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Remover imagem(s) selecionada(s)" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ancorar esta imagem para posição" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ancorar esta imagem para exposição" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nova lente" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Mudar lente..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Insira novo número de lente" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Número da lente" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Alterar número da lente" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Carrega parâmetros de lente do banco de dados" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Carregar parâmetros de lente de um arquivo '.ini'" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3201,12 +3270,12 @@ "Os parâmetros que foram carregados devem ser aplicados a todas as imagens " "com a mesma lente?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Pergunta" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3217,100 +3286,100 @@ "indesejados.\n" "Aplicar os parâmetros ainda assim? " -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Gravar parâmetros de lente em um arquivo '.ini'" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Remover pontos de controle" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Imagens selecionadas sem pontos de controle." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Realmente remover %lu pontos de controle?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Remover pontos de controle" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Limpar pontos de controle" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Limpando pontos de controle" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Verificando pares" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Verificando todo o projeto" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Limpeza concluída" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Remove pontos de controle em nuvens" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Reiniciar definição de usuário.." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Reiniciar posições" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Reiniciar parâmetros de translação" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Reiniciar parâmetros de lente" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Reiniciar parâmetros fotométricos" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nova pilha" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Mudar pilha..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Insira novo número de pilha" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Pilha" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Alterar número da pilha" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Tamanho da pilha..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Qualidade:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3380,47 +3449,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Área Igual de Hammer-Aitoff" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "largura precisa ser um inteiro maior que 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "altura precisa ser um inteiro maior que 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "O limite esquerdo deve ter valor menor do que o da direita." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "O limite superior deve ter valor menor do que o inferior." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " Opções do PTmender não implementadas ainda" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr " Opções do PTblender ainda não implementadas" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " Opções para esse programa HDRMerge ainda não implementadas" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Não foi possível criar um arquivo temporário do projeto" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Especifique o prefixo de saída" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3429,15 +3498,15 @@ "Você não tem permissão para escrever na pasta \"%s\".\n" "Favor selecionar outra pasta para o arquivo de saída final." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Selecionar saída definida pelo usuário" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Saída definida pelo usuário|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3453,7 +3522,7 @@ "ou PNG para a saída." # Há um termo melhor que "tela" para "canvas"? -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3466,7 +3535,7 @@ "cortada, e monte usando a aba Montador. Montar um panorama deste tamanho " "pode tomar muito tempo e usar muita muita memória." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3478,20 +3547,20 @@ "\n" "Se este valor for elevado, reduzir tamanho do panorama ou região de recorte." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Tem certeza de que quer um panorama tão grande assim?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Montar mesmo assim" # quando surge esta mensagem? Está boa? -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Deixe-me consertar isto" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3501,7 +3570,7 @@ "Favor verificar seus ajustes, de modo que pelo menos uma imagem esteja na " "região de saída (resultado)" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3537,121 +3606,136 @@ msgid "Miscellaneous" msgstr "Miscelâneas" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Padrões do sistema" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Basco" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalão" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Tcheco" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Dinamarquês" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holandês" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Inglês" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francês" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Alemão" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Húngaro" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiano" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japonês" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polonês" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Português Brasileiro" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Russo" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Eslovaco" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Espanhol" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Sueco" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finlandês" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valenciano (Catalão do sul)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Selecione o Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Executáveis (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Selecione o Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "Selecionar dcraw" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "Selecionar RawTherapee-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Selecionar darktable-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Selecionar arquivo de argumentos ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Arquivos de argumentos ExifTool (*.arg)|*.arg|Todos os arquivos(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3660,14 +3744,14 @@ "O arquivo %s não existe.\n" "Criar o arquivo de argumentos com valores padrão?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Arquivo de argumentos ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3675,18 +3759,18 @@ "Nenhum arquivo selecionado.\n" "Criar arquivo de argumentos com valores padrão?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Selecione novo arquivo de argumentos ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Não foi possível gravar o arquivo %s." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3695,7 +3779,7 @@ "O arquivo %s não existe.\n" "Criar um exemplo de arquivo argfile de argumentos?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3703,23 +3787,24 @@ "Nenhum arquivo selecionado.\n" "Criar arquivo de exemplo de argumentos?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Realmente deseja reverter preferências para os valores padrão?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Carregar padrões" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Por favor selecione uma entrada antes" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Selecione um item" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3727,31 +3812,31 @@ "Não é possível remover a última configuração.\n" "Pelo menos um valor é requerido." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Você realmente deseja remover a configuração do detector de pontos de " "controle \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Remover configurações do detector de pontos de controle" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Carregar configurações do detector de pontos de controle" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Configurações do detector de pontos de controle (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Gravar configurações do detector de pontos de controle" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3778,50 +3863,54 @@ msgid "Remove %lu control points" msgstr "Remover %lu pontos de controle" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Pré-visualização do panorama" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opções de pré-visualização" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projeção (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Modo Homogeneizado:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Saída:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Compressão de gama:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parâmetros de Projeção" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Clique com o botão esquerdo para definir um novo ponto central e com o botão " "direito para mover o ponto para o horizonte." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centralize o panorama com botão esquerdo do mouse e configure o horizonte " @@ -3841,7 +3930,7 @@ msgid "Click a connection to edit control points." msgstr "Clique numa ligação para editar pontos de controle." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3852,29 +3941,126 @@ "Erro: %s\n" "Um motivo pode ser uma imagem inválida ou arquivo ausente." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Executável \"%s\" não encontrado.\n" +"Favor especificar um executável válido nas preferências." + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Executável \"%s\" não encontrado no PATH.\n" +"Favor especificar um executável válido nas preferências." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Executando: %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "Atualizando dados EXIF de %s" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Perfil de processamento \"%s\" não encontrado.\n" +"Favor especificar um arquivo válido ou deixar o campo em branco para os " +"valores padrão." + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Importar imagens raw" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Não conseguiu revelar o resultado da imagem de referência.\n" +"Impossível revelar demais imagens." + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Fechar" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Alerta: erro de leitura" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Os arquivos a seguir serão desconsiderados pois não foi possível ler " +"seusmetadados." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Alerta: imagens raw de câmeras diferentes" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"As seguintes imagens foram fotografadas com câmeras diferentes.\n" +"A importação de fotos raw funciona apenas com imagens da mesma máquina." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" +"Pelo menos uma imagem raw não foi convertida com sucesso.\n" +"Esta imagem(ns) será omitida." + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Selecionar perfil de revelação padrão do RT" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "perfil de revelação RT|*.pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "O diretório '%s' não existe" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Não foi possível definir a variável de ambiente PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Abrir o processador de lotes" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Abre o PTBatcher, o processador de projetos em lote do Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Abrir ferramenta de calibração de lentes" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Abre Calibrate_lens_gui, interface visual (GUI) simples para calibração de " @@ -3892,11 +4078,11 @@ "erradas." # keypoint = control point? -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "limpando arquivos de pontos de controle temporários" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3905,15 +4091,15 @@ "Por favor use %namefile, %i ou %s para especificar os arquivos de origem " "para o detector de pontos de controle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Erro no comando de detecção de pontos de controle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3925,14 +4111,14 @@ "Por favor selecione menos imagens, ou coloque as imagens\n" "em um diretório com um nome mais curto" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Muitas imagens selecionadas" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3943,38 +4129,38 @@ "\n" " Não foi possível executar o comando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Erro no wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "encontrando pontos de controle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Não foi possível executar o comando: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3983,9 +4169,9 @@ "Comando: %s\n" "falhou com código de erro: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4000,13 +4186,13 @@ "\n" "Comando executado: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Falha no detector de pontos de controle" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4014,7 +4200,7 @@ "Por favor use %i para especificar arquivos de entrada e %k para o arquivo de " "pontos de controle para a etapa de geração de pontos" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4023,12 +4209,12 @@ "indicar o arquivo de projeto para a fase de emparelhamento" # em dúvida... -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "gerando arquivo de pontos de controle" # verificar o contexto -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4041,11 +4227,11 @@ "\n" " Não foi possível executar o comando: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Padrões" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4053,253 +4239,253 @@ "Não é possível limpar lote em progresso.\n" "Deseja cancelá-lo?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "Interface do montador em lote" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Lote foi limpo." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Erro: não foi possível verificar o status, projeto %d não está na lista." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Erro: não foi possível carregar o arquivo de lote." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Lote processado com sucesso." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Processamento do lote terminou sem erros." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Inicializando desligamento..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Desligando..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Preparar para hibernar..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Iniciando hibernação..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Preparar para suspender..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Iniciando modo suspenso..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Especificar arquivo de projeto" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Nenhum prefixo de saída especificado" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Não foram especificados arquivos de projeto" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Montando" # melhor inverter a ordem, (%s no final?) -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Assistente" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Erro ao tentar remover, projeto %d não está na lista." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Erro: Não foi possível remover o arquivo de projeto " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Executando lote..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI está costurando." -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Lote já está em progresso." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Executando comando \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Montando: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Detectando agora: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Erro: não foi possível configurar o status, projeto %d não está na lista." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Fazendo praticamente nada..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Você apertou a tecla Command. " -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Você apertou a tecla Control." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Pular o carregamento da fila de processamento?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Não fazer nada" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Fechar PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Desligar computador" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Suspender computador" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Hibernar computador" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Insira a linha de comando da aplicação a ser executada:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Insira a aplicação" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Especifique um diretório para procurar por projetos" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Especifique o(s) arquivo(s) de origem do projeto" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Adicionados projetos do diretório %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Adicionar projeto %s à lista de lotes." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Enviar projeto %s para fila do assistente." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Lote pausado" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Processador em lote do Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Especifique o prefixo de saída do projeto " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "O prefixo de um alvo do assistente não pode ser modificado." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Por favor selecione um projeto" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Por favor selecione apenas um projeto" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Especifique o arquivo de lote a ser aberto" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Arquivos de lote (*.ptb)|*.ptb|Todos os Arquivos (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Não foi possível abrir a aplicação no Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Nenhum projeto selecionado. Abrir o Hugin sem nenhum projeto?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Lote pausado" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Pausando o processamento da fila do Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Continuando lote..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Processando a fila do Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4307,7 +4493,7 @@ "Há projetos com falha na lista.\n" "Removê-los também?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4315,16 +4501,16 @@ "Não é possível remover projeto em progresso.\n" "Deseja cancelá-lo?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Removido o projeto %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Selecione um projeto para ser removido" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4332,16 +4518,16 @@ "Não é possível reiniciar um projeto em progresso.\n" "Deseja cancelá-lo?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Reiniciado projeto %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Selecione um projeto para reiniciar" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4349,15 +4535,15 @@ "Não é possível reiniciar projetos em progresso.\n" "Deseja cancelar todo o lote?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Especifique o arquivo de lote a ser salvo" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Arquivo de lote (*.ptb)|*.ptb;|Todos os arquivos(*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4367,15 +4553,15 @@ "Isto pode ter efeitos negativos no desempenho.\n" "Limpar a fila de lotes agora?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Limpar a fila de lotes agora" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Manter a fila de lotes" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Iniciando lote" @@ -4411,7 +4597,7 @@ msgid "E&xit" msgstr "Sai&r\tAlt-X" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4421,11 +4607,11 @@ "Se você fechar o diálogo, irá perdê-los. \n" "Continuar mesmo assim?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Aceito" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4435,11 +4621,11 @@ "Se você continuar, eles serão desprezados.\n" "Ainda deseja continuar?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Parar" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4448,7 +4634,7 @@ "O diretório %s não existe. \n" "Favor fornecer um diretório pré-existente." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4456,7 +4642,7 @@ "Você não selecionou um panorama possível. \n" "Favor selecionar pelo menos um panorama e tentar outra vez." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4466,141 +4652,143 @@ "Talvez você não tenha permissão para escrita nestes diretórios ou o disco " "esteja cheio." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Remove a imagem desse projeto" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Divide aqui em dois panoramas" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Lendo arquivo %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Iniciar" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Achados %d possíveis panoramas." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Não achou panoramas possíveis." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d imagens: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Detectado erro de sintaxe nos parâmetros, abortando." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "Montador em lote PTBatcherGUI iniciado." -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Aguardando" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Em progresso" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Completo" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Falhou" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Arquivo faltando" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pausado" # onde aparece isto? -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projeto" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefixo de saída" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Status" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Última modificação" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Formato de saída" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projeção" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Tamanho" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" # deixar "id"? Onde aparece? -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Erro, não foi possível converter o id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistente" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Mudar prefixo" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Reiniciar projeto" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Editar com Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Remover" @@ -4636,16 +4824,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Arquivos de log (*.log)|*.log|Todos os arquivos(*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Não foi possível localizar o arquivo de projeto \"%s\"." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Especifique a origem do arquivo de projeto" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4655,7 +4843,7 @@ "Hugin não suporta este nome. Favor fornecer um nome válido." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Sobre o Hugin" @@ -4689,19 +4877,19 @@ msgstr "Sistema" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4779,8 +4967,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Escolher..." @@ -4870,7 +5061,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opções" @@ -4902,10 +5093,6 @@ msgid "Send selected panoramas to queue" msgstr "Enviar panoramas selecionados para a fila" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Fechar" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Procurando panoramas" @@ -5002,12 +5189,12 @@ msgstr "&Minimizar para a barra de tarefas" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "Sai&r" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Sair do programa" @@ -5111,72 +5298,182 @@ msgid "adddir" msgstr "Somar diretório" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "par de imagem anterior" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "próximo par de imagem" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Descrição:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "modo:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Tipo:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "linha vertical" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Todas as imagens de uma vez" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "linha horizontal" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama com pilhas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Panorama multi-linhas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "encaixar na janela" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Panorama multi-linhas com pilhas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Refinamento" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Panorama pré-alinhado" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Tenta otimizar o ponto ativo" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detector" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "auto refinamento" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Detecção em uma etapa" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "auto adicionar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Programa:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "" -"adicionar ponto de controle imediatamente quando selecionado um segundo " -"ponto de controle" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumentos:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "auto estimar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Parâmetros para limpeza:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"tenta estimar o deslocamento entre as imagens para uso na criação de pontos " -"de controle" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Detecção em duas etapas" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 +# está bom? +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Descritor de padrões:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Emparelhador de padrões:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detector para pilhas" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Deixar em branco se não for para usar um detector de pontos de controle em " +"pilhas." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Opção Avançada" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Este ajuste não tem opções avançadas." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"As seguintes variáveis serão substituídas antes da execução:\n" +"%o -- projeto de saída (0.oto será adicionado quando usar Autopano)\n" +"%p -- número de pontos de controle entre cada par\n" +"%v -- Campo visual horizontal da primeira imagem\n" +"%f -- projeção da primeira imagem (0-4, como no panotools)\n" +"%i -- arquivos de imagem\n" +"%namefile -- arquivo que contém os nomes dos arquivos de imagem\n" +"%s -- script de entrada para o panotools\n" +"%k -- arquivo(s) intermediário(s) de pontos" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parâmetros para o Detector de Pontos de Controle" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "par de imagem anterior" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "próximo par de imagem" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "modo:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "linha vertical" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "linha horizontal" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "encaixar na janela" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Refinamento" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Tenta otimizar o ponto ativo" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "auto refinamento" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "auto adicionar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "" +"adicionar ponto de controle imediatamente quando selecionado um segundo " +"ponto de controle" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "auto estimar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"tenta estimar o deslocamento entre as imagens para uso na criação de pontos " +"de controle" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 msgid "&Delete" msgstr "&Remover" @@ -5206,7 +5503,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Apagar " @@ -5214,156 +5511,190 @@ msgid "Select by Distance" msgstr "Selecionar pela Distância" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Descrição:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Alerta: nomes de arquivo inválidos" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Tipo:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"Os arquivos a seguir já existem.\n" +"Eles serão sobre-escritos ao executar a importação raw.\n" +"Você deseja sobre-escrevê-los?" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (por A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Sim" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Todas as imagens de uma vez" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Não" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama com pilhas" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Editar Script do Panorama Tools" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Panorama multi-linhas" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Esse é o script que será enviado para o \"engine\" do Panorama Tools. A " +"edição dessas linhas só deve ser feita por usuários avançados." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Panorama multi-linhas com pilhas" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Continuar com essas alterações" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Panorama pré-alinhado" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Descartar alterações e cancelar" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detector" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Agrupar por:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Detecção em uma etapa" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Sobreposição mínima:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Programa:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Sobreposição mínima para detecção de pilha de saída\n" +"Com -1 as pilhas definidas no projeto serão usadas." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumentos:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Máxima diferença Ev:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Parâmetros para limpeza:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Diferença máxima de Ev para detecção de camadas de saída" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Detecção em duas etapas" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "\"Display\"" -# está bom? -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Descritor de padrões:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Geral" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Emparelhador de padrões:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Dados EXIF" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detector para pilhas" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Posições" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Deixar em branco se não for para usar um detector de pontos de controle em " -"pilhas." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parâmetros de Lente" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Opção Avançada" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Parâmetros fotométricos" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Este ajuste não tem opções avançadas." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Tipo da lente" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Adicionar imagens..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Tipo da Lente:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Multiplicador de distância focal:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Emparelhamento de padrões" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Configurações:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" msgstr "" -"As seguintes variáveis serão substituídas antes da execução:\n" -"%o -- projeto de saída (0.oto será adicionado quando usar Autopano)\n" -"%p -- número de pontos de controle entre cada par\n" -"%v -- Campo visual horizontal da primeira imagem\n" -"%f -- projeção da primeira imagem (0-4, como no panotools)\n" -"%i -- arquivos de imagem\n" -"%namefile -- arquivo que contém os nomes dos arquivos de imagem\n" -"%s -- script de entrada para o panotools\n" -"%k -- arquivo(s) intermediário(s) de pontos" +"Executar o detector de pontos de controle escolhido nas imagens selecionadas" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Otimizar" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geométrico:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Calcular" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parâmetros para o Detector de Pontos de Controle" +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotométrico:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Nomes de arquivo inválidos" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Imagem Selecionada" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Editar Script do Panorama Tools" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Ler parâmetros de lente..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Esse é o script que será enviado para o \"engine\" do Panorama Tools. A " -"edição dessas linhas só deve ser feita por usuários avançados." +"Informe dados do Campo de Visão Horizontal (HFOV) ou distância focal ou " +"fator de corte:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Continuar com essas alterações" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV - Campo de Visão Horizontal (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Descartar alterações e cancelar" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "graus" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Dados da câmera e lente" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Guinada:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Inclinação:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Giro:" @@ -5371,34 +5702,11 @@ msgid "Translation parameter" msgstr "Parâmetro de translação" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Posições" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "ângulo de visão (v):" @@ -5498,7 +5806,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Ajuda" @@ -5541,8 +5849,8 @@ msgstr "Carregar" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Salvar" @@ -5554,122 +5862,44 @@ msgid "Manipulate image variables" msgstr "Manipular variáveis da imagem" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Agrupar por:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Sobreposição mínima:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Sobreposição mínima para detecção de pilha de saída" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Máxima diferença Ev:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Diferença máxima de Ev para detecção de camadas de saída" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "\"Display\"" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Geral" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Dados EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parâmetros de Lente" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Parâmetros fotométricos" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Tipo da lente" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Adicionar imagens..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Tipo da Lente:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Multiplicador de distância focal:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Emparelhamento de padrões" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Configurações:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "" -"Executar o detector de pontos de controle escolhido nas imagens selecionadas" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Otimizar" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geométrico:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Calcular" - -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotométrico:" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Imagem Selecionada" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Ler parâmetros de lente..." - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "" -"Informe dados do Campo de Visão Horizontal (HFOV) ou distância focal ou " -"fator de corte:" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV - Campo de Visão Horizontal (v):" - -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "graus" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" +msgstr "referência de balanço de branco:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "dcraw" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "Parâmetros adicionais para dcraw:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Processando perfil:" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "Deixar em branco para usar os ajustes padrão no RawTherapee" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "darktable" + +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "Conversor RAW" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Dados da câmera e lente" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importar" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5814,14 +6044,6 @@ msgid "Don't ask again" msgstr "Não perguntar novamente" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Sim" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Não" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5885,21 +6107,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importa posições do XML do Papywizard" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Desfazer" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Desfaz a última ação" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Refazer" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Refaz a última ação" @@ -5941,12 +6163,12 @@ msgid "Use only normal control points in optimization." msgstr "Usar só pontos de controle normais na otimização." -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Otimizar" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Re-executa o otimizador com as configurações atuais" @@ -5974,15 +6196,15 @@ msgid "Run a python script" msgstr "Rodar um script python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Visualizar" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "Tela Cheia" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Mostra a janela principal do Hugin em tela cheia" @@ -6058,19 +6280,19 @@ msgid "Show the Stitcher panel" msgstr "Mostrar o painel do montador" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "&Simples" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "&Avançada" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "&Especialista" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "&Interface" @@ -6090,86 +6312,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "Monta o panorama aplicando instruções definidas num arquivo" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Informação a respeito dos diferentes botões, etc." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "Di&ca do Dia" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Mostra uma das dicas do dia." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Atalhos de &Teclado" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "atalhos de teclado" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Perguntas Frequentes" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Sobre" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Preferências" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Novo" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Novo projeto" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Abrir" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Abrir projeto" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Salvar" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Salvar arquivo do projeto atual" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Salvar &Como" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Salvar projeto atual como um novo arquivo" @@ -6185,18 +6407,18 @@ "Grava o projeto atual como um script do PTStitcher, útil para processamento " "em lote (\"batch\")" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "Projetos recentemente &utilizados" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Lista de arquivos de projeto mais utilizados" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "Executar processamento em &Lote" @@ -6283,7 +6505,7 @@ msgid "Show the OpenGL preview image" msgstr "Mostrar a janela de pré-visualização OpenGL" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Pré-visualização do panorama" @@ -6340,15 +6562,10 @@ msgstr "Exclui região de todas as imagens com esta lente" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exportar" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importar" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Copiar" @@ -6392,11 +6609,11 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" -"Aplica todas as mudanças a todas as imagens com a mesma lente que a(s) " -"imagem(ns) selecionada(s)." +"Aplica todas as mudanças a todas as imagens com a mesma lente que a(s) imagem" +"(ns) selecionada(s)." #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 #: hugin1/hugin/xrc/pano_panel.xrc:376 @@ -6497,7 +6714,8 @@ msgid "execute the PTOptimizer engine" msgstr "executar o PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientação da Imagem" @@ -6542,39 +6760,39 @@ msgid "Interpolator (i):" msgstr "Interpolador (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicúbico)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilinear" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Vizinho mais próximo" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "valores aproximados entre os pixels de origem" @@ -6602,7 +6820,7 @@ msgid "Enfuse options" msgstr "Opções do Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Campo de visão:" @@ -6770,10 +6988,6 @@ msgid "Image fusion:" msgstr "Misturador de imagens:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Misturador HDR:" @@ -6878,15 +7092,15 @@ msgid "Output parameters" msgstr "Parâmetros de saída" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Modo de costura suavizada:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "costura não suavizada (mais rápido)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "costura suavizada" @@ -6954,27 +7168,40 @@ msgid "This affects the control points editor and mask editor." msgstr "Isto afeta o editor de pontos de controle e o de máscaras." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "Executável do dcraw:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(deixe em branco para usar valor padrão do sistema)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "Executável do RT-cli:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "Executável do darktable-cli:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Opções de arquivo" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Diretório temporário:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(deixe em branco para usar valor padrão do sistema)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Nome padrão de projeto:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Prefixo padrão de saída:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7005,43 +7232,43 @@ "%lens - lente (da primeira imagem)\n" "%projectname - nome do arquivo do projeto (apenas para prefixo de saída)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Nomes de arquivo padrões" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Nomes de arquivo" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Carregamento de imagens" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Alinhar imagens automaticamente após carregamento" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Detetar linhas verticais" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Detecta linhas verticais nas imagens para nivelar o panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Remover pontos de controle de nuvens (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Etapas opcionais do assistente" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Auto alinhamento" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7049,68 +7276,68 @@ "Número de pontos de controle\n" "por sobreposição" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Diminuir panorama final" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "porcentagem da largura máxima da imagem" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor de Pontos de Controle" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Visualização HDR e 16 bits" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Curvas" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "linear" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logarítmico" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gama 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "usado para mostrar na interface (UI)" # será emenda? onde usa? -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Largura do Patch:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixels" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Largura da área de pesquisa:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "porcentagem da largura da imagem" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "largura da área de pesquisa local:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Limite de correlação:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7118,11 +7345,11 @@ "0: sem similaridade\n" "1: similaridade máxima" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Limite para pico de curvatura:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7130,116 +7357,112 @@ "0: sem pico\n" "0.2: pico distintivo" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Procura de rotação" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Ativar procura de rotação (lento, mas mais preciso)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Ângulo de início:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Ângulo de parada:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Passos:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Detectores de Pontos de Controle" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programas para Detecção de Pontos de Controle" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Novo..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Editar..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Mover acima" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Mover abaixo" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Marcar como padrão" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "O assistente está usando os valores padrão." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Formato de saída" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Formato de arquivo padrão:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "tipo de arquivo padrão para panorama final" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Compressão TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "compressão TIFF padrão" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Qualidade JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "valor da compressão JPEG padrão" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Homogeneizador" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Homogeneizador padrão:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Homogeneizador padrão a ser usado em projetos novos." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processador" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "O motor que executa a montagem" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Iniciar trabalhos de montagem imediatamente" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7249,19 +7472,19 @@ "Senão, o processador inicia \"suspenso\" e o usuário deve iniciar o " "processamento manualmente." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Sobrescrever arquivos existentes" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "ALERTA: arquivos existentes serão sobrescritos sem aviso." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Saída verbosa" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7269,19 +7492,19 @@ "Habilita pegar os detalhes, úteis para relatar um bug ou para ver o " "progresso do projeto." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Montando" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Copia metadados para os arquivos-resultado usando o ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Opções do EXifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7295,7 +7518,7 @@ "Para criar um arquivo 'argfile' de exemplo deixe as caixas de texto vazias e " "aperte \"Editar...\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7303,19 +7526,19 @@ "O seguinte arquivo de argumentos será usado para copiar etiquetas da " "primeira imagem para todas as imagens intermediárias." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Arquivo de argumentos intermediário para ExifTool:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Deixar em branco para usar valor padrão" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Editar arquivo de argumentos ExifTool selecionado" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7326,27 +7549,27 @@ "Ele é aplicado adicionalmente ao arquivo de argumentos acima para as imagens " "intermediárias." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Arquivo de argumentos ExifTool final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Criar metadados XMP Photo Sphere" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Isto só será feito para imagens de saída equirretangulares" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Opções avançadas" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Número de threads:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7358,81 +7581,81 @@ "Defina este número no máximo igual ao número de processadores (núcleos) " "disponíveis no seu sistema" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 para detecção automática" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Montando (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Interpolador (i) padrão:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Criar imagens recortadas por padrão" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Usar GPU para remapeamento (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "Usando GPU para remapeamento" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Usar GPU da placa de vídeo para aumentar velocidade do remapeamento" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Usar programa Enblend alternativo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Executável do Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Argumentos Padrão:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" -"Esses são os valores padrão para projetos novos.\n" +"Esses são os valores padrão para novos projetos.\n" "Eles podem ser alterados individualmente por projeto na aba do Montador.\n" -"Não use as opções -w, -o e --compression, elas são ajustadas pelo hugin" +"Não use as opções -w, -o nem --compression, elas são ajustadas pelo hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Usar programa Enfuse alternativo" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Executável do Enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programas" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parâmetros do celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Limite do SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7440,19 +7663,19 @@ "maior que 0.5: menos sensível\n" "menor que 0.5: mais sensível" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Tamanho do filtro Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "pequeno" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "grande" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7460,7 +7683,7 @@ "grande é mais preciso\n" "pequeno pode examinar pontos de controle próximos às bordas da imagem" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7471,55 +7694,55 @@ "Para acelerar a computação, é usado apenas um sub-conjunto aleatório de " "pontos." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Número de pontos por imagem:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Otimizador fotométrico" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Alertas" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Mostra mensagem sobre gravação do projeto e prefixo de saída" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "Mostra alerta sobre grande diferença de exposição ao adicionar imagens" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Após ferramenta \"editar pontos de controle\"" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Pergunta ao usuário" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Reotimizar panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Não otimizar o panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Editar pontos de controle (na janela de previsão rápida)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Miscelânea" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Preferências - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." @@ -7527,11 +7750,11 @@ "Este arquivo 'argfile' é chamado com a linha de comando\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Editar arquivo de argumentos ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." @@ -7539,7 +7762,7 @@ "Este arquivo 'argfile' é chamado com a linha de comando\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7575,11 +7798,11 @@ "\n" "Os marcadores de posição são sensíveis a maiúsculas e minúsculas." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centralizar a previsão horizontalmente" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centralizar" @@ -7587,13 +7810,15 @@ msgid "Show the whole panorama" msgstr "Mostrar todo o panorama" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estimar campo de visão" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Encaixar" @@ -7601,7 +7826,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automaticamente alinha um horizonte ondulado" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Alinhar" @@ -7701,32 +7927,32 @@ "Seta o valor de exposição do panorama conforme a exposição média de todas as " "imagens." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Apontador de cinza" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" "Corrige o balanço de branco global ao selecionar uma área de cinza neutro." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Editar pontos de controle" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Criar ou apagar pontos de controle no retângulo selecionado." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Fundo:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Escala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7740,154 +7966,142 @@ "* Clique numa linha para abrir as respectivas imagens na aba de Pontos de " "Controle." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Leiaute" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "x" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Guias:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Regra dos terços" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Razão áurea" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Método diagonal" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Triângulo áureo (para baixo)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Triângulo áureo (para cima)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automaticamente alinha um horizonte ondulado." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Modo de arrasto:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Aplicar" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Move o panorama ou arrasta imagens para a posição" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Mover/arrastar" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Deixe a região de corte como o maior retângulo coberto por imagens" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "Auto-recorte HDR" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Deixe a região de corte como o maior retângulo coberto por pilhas de imagens" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "esquerda:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "topo:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "direita:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "embaixo:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Ajusta o corte para a maior área possível" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Mudar a região de recorte do panorama" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "Editor do panorama (&e)" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "Visão geral (&O)" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Mostra uma visão geral da esfera do panorama." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "&Grade" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Mostra uma grade." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "Todas as imagens" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "Imagem com exposição &mediana de cada pilha" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "Imagem mais clara de cada pilha" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "Imagem mais escura de cada pilha" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "Manter as imagens atualmente selecionadas" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "&Reiniciar seleção" @@ -8199,6 +8413,90 @@ "com imagens com bastante sobreposição e com vários pontos de controle, bem " "distribuídos." +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "" +#~ "Favor adicionar pelo menos uma imagem raw à lista antes de importá-la." + +#~ msgid "Import Raw Files" +#~ msgstr "Importar arquivos raw" + +#~ msgid "(WB reference)" +#~ msgstr "(referência de balanço de branco)" + +#~ msgid "Images" +#~ msgstr "Imagens" + +#~ msgid "Add image(s)..." +#~ msgstr "Adicionar imagem(ens)..." + +#~ msgid "Add other images to list" +#~ msgstr "Adiciona outras imagens à lista" + +#~ msgid "Remove image" +#~ msgstr "Remover imagem" + +#~ msgid "Remove selected image from list" +#~ msgstr "Remover imagem selecionada da lista" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "Marcar a imagem selecionada como referência para balanço de branco." + +#~ msgid "Converter settings" +#~ msgstr "Ajustes do conversor" + +#~ msgid "Import &raw file(s)..." +#~ msgstr "Importar arquivo(s) &raw..." + +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "Converter arquivo raw para TIFF e adicionar TIFF ao projeto atual" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Move o panorama ou arrasta imagens para a posição" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Mudar a região de recorte do panorama" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Usar GPU para remapeamento (EXPERIMENTAL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Todos os arquivos de imagem|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*." +#~ "TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*." +#~ "HDR;*.exr;*.EXR|Arquivos JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|" +#~ "Arquivos TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Arquivos PNG (*." +#~ "png)|*.png;*.PNG|Arquivos HDR (*.hdr)|*.hdr;*.HDR|Arquivos EXR (*.exr)|*." +#~ "exr;*.EXR|Todos os Arquivos (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (por A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "x" + #~ msgid "Interface" #~ msgstr "Interface" @@ -8800,8 +9098,8 @@ #~ msgid "set pitch for selected image(s)" #~ msgstr "" -#~ "Ajusta o valor de inclinação (\"pitch\") para a(s) imagem(s) " -#~ "selecionada(s)" +#~ "Ajusta o valor de inclinação (\"pitch\") para a(s) imagem(s) selecionada" +#~ "(s)" #~ msgid "set roll for selected image(s)" #~ msgstr "" @@ -9338,9 +9636,6 @@ #~ msgid "Flatfield" #~ msgstr "Falhou" -#~ msgid "Image file:" -#~ msgstr "Arquivo da imagem:" - #~ msgid "Polynomial" #~ msgstr "Polinomial" @@ -9376,10 +9671,6 @@ #~ msgid "y:" #~ msgstr "y:" -#, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "Adicionar projeto..." - #~ msgid "Nona" #~ msgstr "Nona" diff -Nru hugin-2018.0.0+dfsg/src/translations/ro.po hugin-2019.0.0+dfsg/src/translations/ro.po --- hugin-2018.0.0+dfsg/src/translations/ro.po 2018-01-13 07:52:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/ro.po 2019-02-17 15:24:33.000000000 +0000 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: Hugin 0.8.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2011-01-19 14:51+0200\n" "Last-Translator: Mihai \n" "Language-Team: <>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" @@ -50,15 +50,15 @@ msgid "Searching for best crop..." msgstr "căutând puncte de control de tip nor..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Programul extern %s nu a fost găsit in pachet, revenind la calea sistem" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -85,9 +85,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Fişierul %s există. Suprascrie?" @@ -126,7 +126,7 @@ msgstr "Factorul de decupare trebuie sa fie pozitiv." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -136,24 +136,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 #, fuzzy msgid "Hugin" msgstr "Maghiară" @@ -175,8 +179,8 @@ msgstr "Fisheye cadru complet" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Equirectangular" @@ -208,11 +212,13 @@ msgid "builtin" msgstr "inclus" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "customizare (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Liniar" @@ -237,16 +243,16 @@ msgid "Error loading lens parameters" msgstr "Eroare la încărcarea parametrilor lentilei" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Salvează fişierul cu parametrii lentilei" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Fişiere proiect lentile (*.ini)|*.ini|Toare fişierele (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Salvează proiect" @@ -278,22 +284,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Eroare în a suspenda procesul %ld, cod 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Renunţă" @@ -331,12 +338,12 @@ msgid "Panorama Tools" msgstr "Unelte panoramă" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "nu pod deschide scriptul : %s" @@ -346,8 +353,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "eroare la parsarea scriptului panotools: %s" @@ -361,17 +368,17 @@ msgid "Could not create temporary file" msgstr "Nu pot crea fişier temporar" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Eroare în timpul îmbinării" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -379,11 +386,11 @@ "Suprascrie imaginile existente?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Suprascrie imaginile existente" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -392,314 +399,324 @@ "Eroare la îmbinarea proiectului\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 #, fuzzy msgid "Error during running assistant" msgstr "Eroare în timpul îmbinării" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, fuzzy, c-format msgid "" "Error while running assistant\n" "%s" msgstr "eroare la parsarea scriptului panotools: %s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Îmbinând panorama" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "Versiunea %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "" "\n" " directorul curent:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "Prefix ieşire" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Îmbinator:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "Eroare internă" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Expunere:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Opţiuni enfuse" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Opţiuni enfuse" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "Număr de puncte per imagine" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "Straturi expunere îmbinate" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "Dimensiune canva panoramă" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 #, fuzzy msgid "Projection:" msgstr "Proiecţie" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 #, fuzzy msgid "Panorama Outputs:" msgstr "Ieşire normală:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 #, fuzzy msgid "High dynamic range" msgstr "Interval dinamic redus" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 #, fuzzy msgid "Remapped Images:" msgstr "Imagini re-mapate" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 #, fuzzy msgid "Blended layers of similar exposure, without exposure correction" msgstr "Imagini ieşire re-mapate cu corecţie de expunere" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "Salvează imaginile decupate" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "Număr de procesoare:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 #, fuzzy msgid "Filename:" msgstr "Nume-fişier" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "Dimensiune canva panoramă" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "Tip lentilă:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "Expunere (EV)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "Imagini re-mapate" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "Aliniere imagini" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "Imagini ieşire re-mapate cu corecţie de expunere" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "Straturi expunere îmbinate" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "Schimbă numărul de lentilă" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "Imagini re-mapate" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "Schimbă numărul de lentilă" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Îmbinând %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 #, fuzzy msgid "first image" msgstr "Salvează imaginile decupate" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 #, fuzzy msgid "last image" msgstr "Adaugă imagine" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 #, fuzzy msgid "directory" msgstr "Caută în dosar" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 #, fuzzy msgid "Camera maker" msgstr "Cameră şi lentile" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 #, fuzzy msgid "Camera model" msgstr "Răspuns cameră:" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -707,36 +724,70 @@ msgid "Lens" msgstr "Lentilă" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 #, fuzzy msgid "unknown projection" msgstr "Proiecţie" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Adaugă imagini" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Încărcând imaginea %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Eroare" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -744,26 +795,11 @@ "again." msgstr "" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Toate fişierele imagine|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" -"*.EXR|Fişiere JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Fişiere TIFF (*." -"tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Fişiere PNG (*.png)|*.png;*.PNG|" -"Fişiere HDR (*.hdr)|*.hdr;*.HDR|Fişiere EXR (*.exr)|*.exr;*.EXR|Toate " -"fişierele (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -775,27 +811,27 @@ msgstr "Introduce un număr valid" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Avertisment" @@ -811,7 +847,7 @@ msgid "Could not save information into database." msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -822,11 +858,11 @@ "%s\n" "Anulez" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Format de imagine neacceptat" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -835,7 +871,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -846,77 +882,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -924,44 +960,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "Re-setează proiect" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "Opţiuni linie de comandă" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "Suprascrie imaginile existente" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Fişierul imagine nu a fost găsit" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Selectează editor de imagini" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -969,17 +1005,18 @@ "Press OK to remove." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 #, fuzzy msgid "Error Detected" msgstr "Eroare în a executa %s" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Adaugă imagini" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -988,32 +1025,32 @@ "Eroare, şablonul are nevoie de %d imagini,\n" "proiectul curent conţine %d imagini\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Nu am putut aplica şablonul" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Eroare la încărcarea fişierului proiect" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "Dosarul xrc nu a fost găsit în pachet" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Eroare fatală" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1043,7 +1080,7 @@ "Please check the image again, if you selected the correct images." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Adaugă imagini: anulează" @@ -1056,9 +1093,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1074,7 +1111,7 @@ msgstr "Schimbă lentilă..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 #, fuzzy msgid "Finished" msgstr "Fisheye" @@ -1086,256 +1123,261 @@ "parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " "there are no lines found, change the parameters." msgstr "" -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 #, fuzzy msgid "Save lens parameters to ini file" msgstr "Salvează parametrii lentilelor în fişier" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "Salvează parametrii lentilelor în fişier" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #, fuzzy msgid "Saving lens data" msgstr "Încarcă parametri lentile..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 #, fuzzy msgid "Save lens" msgstr "Salvează lentile..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Salvează fişierul proiect" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Fişiere proiect (*.pto)|*.pto|Toate fişierele (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "Rulând Celeste" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "Număr de procesoare:" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "Rulând comanda \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, fuzzy, c-format msgid "Operating System: %s" msgstr "Creând nuanţe de gri %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, fuzzy, c-format msgid "Architecture: %s" msgstr "Arhitectural" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, fuzzy, c-format msgid "Version: %s" msgstr "Versiunea %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "Informaţii cameră şi lentile" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano de la http://autopano.kolor.com nu este disponibil pentru OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 #, fuzzy msgid "Using Autopano-Sift instead" msgstr "Vrei să utilizezi Autopano-Sift în loc?" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "" -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 #, fuzzy msgid "Only work on image pairs without control points." msgstr "Nu pot estima poziţia imaginii fără puncte de control" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 #, fuzzy msgid "Select control point detector program" msgstr "Selectează Punctele de control" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 #, fuzzy msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Executabile (*.exe,*.vbs,*.cmd)|*.exe;*.vbs;*.cmd" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "x stânga" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "y stănga" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "x dreapta" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "y dreapta" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Aliniere" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Distanţă" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "punct de control nou adăugat" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "căutând puncte similare..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Eroare la reglarea fină" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Punct reglat fin, unghi: %.0f gr, coeficient de corelaţie: %0.3f, curbură: " -"%0.3f %0.3f " +"Punct reglat fin, unghi: %.0f gr, coeficient de corelaţie: %0.3f, curbură: %" +"0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "" "Schimbă punctele, sau apasă butonul dreapta la mouse pentru a adăuga perechea" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Punct estimat în afara imaginii" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 #, fuzzy msgid "No similar point found." msgstr "Nici un punct similar nu a fost găsit" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, fuzzy, c-format msgid "" "Check the similarity visually.\n" @@ -1346,31 +1388,37 @@ "Coeficientul de corelaţie (%.3f) este mai mic decât pragul setat in " "preferinţe." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Adaugă o nouă linie" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linia %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Prag corelaţie:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "Linie vert." -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "Linie oriz." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1380,38 +1428,38 @@ "Pentru a crea mai puţine puncte,\n" "introduce un număr mai mare." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Prag pentru detecţia colţurilor" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Creează puncte de control" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Scară pentru detecţia colţurilor" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Eroare în timpul creării punctelor de control:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Selectează punct în imaginea din dreapta" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1419,57 +1467,58 @@ "Nu pot rula celeste fără măcar un punct de control sa conecteze cele două " "imagini" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Rulând Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 #, fuzzy msgid "Loading model file" msgstr "Încărcând imaginea %s" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, fuzzy, c-format msgid "Removed %lu control points" msgstr "Şters %d puncte de control" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Rezultat celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 #, fuzzy msgid "Cleaning" msgstr "Avertisment" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Creează" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Încearcă să şteargă puncte de control din nori" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Şterge batch" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "" @@ -1481,23 +1530,23 @@ msgid "Could not process event!" msgstr "Nu am putut procesa evenimentul!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Img. stânga" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Img. dreapta" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1505,7 +1554,7 @@ "Introduce eroarea minimă a punctelor de control.\n" "Toate punctele cu o eroare mai mare vor fi selectate" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Selectează Punctele de control" @@ -1581,60 +1630,60 @@ "Trage pentru a muta imaginile (opţional utilizează shift pentru a " "constrânge), sau înfăşoară cu dreapta-trage sau ctrl-trage." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Pre-vizualizare rapidă panoramă" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Fişier" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "imagini afişate" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Toate" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Nimic" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOF" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "trage pentru a selecta câmpul de vedere vertical" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOF" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "trage pentru a selecta câmpul de vedere orizontal" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Pre-vizualizare" @@ -1643,89 +1692,94 @@ msgid "Overview" msgstr "Pre-vizualizare" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 #, fuzzy msgid "No images loaded." msgstr "nici o imagine încărcată" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, fuzzy, c-format msgid "%lu images loaded." msgstr "%d imagini încărcate." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, fuzzy, c-format msgid "Images are connected by %lu control points.\n" msgstr "Imaginile sunt conectate de %d puncte de control.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Au fost găsite %d grupuri de imagini neconectate: " -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Imaginile sau punctele de control s-au schimbat, o nouă aliniere este " "necesară." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Eroare medie după optimizare: %.1f pixeli, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rectiliniu" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cilindric" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Valoarea derivei trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Valoarea înclinaţiei trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Valoarea rotaţiei trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 #, fuzzy msgid "X value must be numeric." msgstr "Valoarea derivei trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 #, fuzzy msgid "Y value must be numeric." msgstr "Valoarea derivei trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 #, fuzzy msgid "Z value must be numeric." msgstr "Valoarea derivei trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Valoarea trebuie să fie numerică." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1733,77 +1787,77 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "diferenţă" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 #, fuzzy msgid "Autocrop" msgstr "Automat" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 #, fuzzy msgid "Calculating optimal crop" msgstr "Calculează dimensiunea optimă" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Sus trebuie să fie un întreg mai mare ca 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "Stânga trebuie să fie un întreg mai mare ca 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "dreapta trebuie să fie un întreg mai mare ca 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "jos trebuie să fie un întreg mai mare ca 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Valoare HFOV invalidă. HFOV maxim pentru această proiecţie este %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Valoare VFOV invalidă. VFOV maxim pentru această proiecţie este %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1811,14 +1865,14 @@ "space." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" "Cylindrical projection preserves vertical lines, unlike equirectangular." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1826,7 +1880,7 @@ "easier on the eye." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1834,41 +1888,41 @@ "field of view and still have a reasonable coverage of the middle." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" "If you want to see the bar again, activate the bar in the preferences again." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 #, fuzzy msgid "Mosaic plane" msgstr "Biplan" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1876,24 +1930,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1902,31 +1956,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "Creează puncte de control" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "Procesare" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "căutând puncte similare..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "Schimbă lentilă..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1934,13 +1988,13 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." msgstr "" -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -1983,7 +2037,7 @@ msgstr "Număr de procesoare:" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Decupare" @@ -2020,7 +2074,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "" @@ -2221,7 +2275,7 @@ msgid "Shutter speed" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "" @@ -2396,101 +2450,101 @@ msgid "Camera response parameter" msgstr "Răspuns cameră" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "Lentilă" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "Ieşire" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Straturi expunere îmbinate" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Legatură" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 #, fuzzy msgid "Select all" msgstr "Re-setează tot" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 #, fuzzy msgid "Unselect all" msgstr "selectează" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 #, fuzzy msgid "Edit image variables..." msgstr "Variabile imagine:" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "S&alvează ca" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "S&alvează ca" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "imagini afişate" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Număr de puncte per imagine" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 #, fuzzy msgid "Control points" msgstr "Puncte de control" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2525,12 +2579,24 @@ msgid "Did you know..." msgstr "" -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Versiunea %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2538,126 +2604,126 @@ "Eroare de instalare\n" "Fişierul data/splash.png nu a fost găsit la:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Ajutor" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 #, fuzzy msgid "&Actions" msgstr "Opţiuni" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Ieşire" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Editare" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Rulând Celeste" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Rulând Celeste" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Început" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimizator" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Expunere" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "închidere forţată" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "proiect salvat %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 #, fuzzy msgid "Hugin - Panorama Stitcher" msgstr "Hugin - interfaţă Panorama Tools" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 #, fuzzy msgid "Panorama editor" msgstr "Pre-vizualizare panoramă" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2666,36 +2732,36 @@ "(Error code: %s)" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Salvează fişierul script PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Fişiere PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Deschide proiect: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Proiect deschis" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Încărcând imaginile" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Eroare la deschiderea proiectului: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Deschide fişier proiect" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2703,11 +2769,11 @@ "Do you want to add this image file to the current project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Deschide proiect: anulează" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2715,7 +2781,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2723,34 +2789,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, fuzzy, c-format msgid "Could not read project file %s." msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Deschide un fişier proiect" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Fişiere batch (*.ptb)|*.ptb;|Toate fişierele (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Alege proiectul şablon" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Reglând fin toate punctele" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Reglând-fin" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2779,94 +2845,94 @@ "Foloseşte lista Punctelor de control (F3) pentru a vedea toate punctele din " "proiectul curent\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Rezultat reglaj fin" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 #, fuzzy msgid "Removing control points in masks" msgstr "Şters %d puncte de control" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 #, fuzzy msgid "Select python script" msgstr "Selectează tipul autopano" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 #, fuzzy msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Fişier batch (*.ptb)|*.ptb;|Toate fişierele (*)|*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" "Maybe file was renamed, moved or deleted." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Eroare!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, fuzzy, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." msgstr "" "Fişierul model Celeste nu a fost găsit, Hugin trebuie instalat corespunzător." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, fuzzy, c-format msgid "Could not load Celeste model file %s" msgstr "Eroare: Nu pot şterge fişierul proiect " -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 #, fuzzy msgid "Running assistant" msgstr "Rulând Celeste" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Avertisment %d au fost găsite grupuri de imagini neconectate:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2879,31 +2945,31 @@ "\n" "După adăugarea punctelor, apasă butonul \"Aliniază\" încă o dată" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 #, fuzzy msgid "Project file not found" msgstr "Fişierul imagine nu a fost găsit" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 #, fuzzy msgid "Mask type" msgstr "Tip lentilă:" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 #, fuzzy msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " @@ -2912,33 +2978,33 @@ "Centrează panorama cu butonul stânga maus, setează orizontul cu butonul " "dreapta" -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 #, fuzzy msgid "Save mask" msgstr "S&alvează ca" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 #, fuzzy msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Fişiere batch (*.ptb)|*.ptb;|Toate fişierele (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 #, fuzzy msgid "Load mask" msgstr "Încărcând imaginile" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 #, fuzzy msgid "Load mask: cancel" msgstr "Adaugă imagini: anulează" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, fuzzy, c-format msgid "Could not parse mask from file %s." msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Introduce un număr valid" @@ -3075,7 +3141,7 @@ msgstr "Aliniere fotometrica" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Încărcând imaginile" @@ -3119,195 +3185,199 @@ msgid "Photometric optimization finished" msgstr "Optimizare fotometrică terminată" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Adaugă imaginile..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Adaugă imagini în serii de timp..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 #, fuzzy msgid "No matching images found." msgstr "Încărcând imaginile" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Variabile imagine:" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Şterge imaginile selectate" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ancorează această imagine la poziţie" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ancorează această imagine la expunere" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 #, fuzzy msgid "New lens" msgstr "Lentilă nouă" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Schimbă lentilă..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Introduce noul număr de lentilă" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Număr lentilă" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Schimbă numărul de lentilă" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "Încarcă parametri lentile..." -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 #, fuzzy msgid "Load lens from ini file" msgstr "Încarcă parametrii lentilelor din fişier" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Întrebare" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" "Apply settings anyway?" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 #, fuzzy msgid "Save lens to ini file" msgstr "Salvează parametrii lentilelor în fişier" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 #, fuzzy msgid "Remove control points" msgstr "Şters %d puncte de control" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 #, fuzzy msgid "Selected images have no control points." msgstr "Cel puţin o imagine nu are puncte de control." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, fuzzy, c-format msgid "Really delete %lu control points?" msgstr "Şterge %d puncte de control?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Şterge puncte de control" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 #, fuzzy msgid "Clean control points" msgstr "Creează puncte de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 #, fuzzy msgid "Cleaning Control points" msgstr "căutând puncte de control" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 #, fuzzy msgid "Checking whole project" msgstr "Alege proiectul şablon" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 #, fuzzy msgid "Remove control points on clouds" msgstr "Şters %d puncte de control" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 #, fuzzy msgid "Reset positions" msgstr "Re-setează proiect" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "Leagă parametrii" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 #, fuzzy msgid "Reset lens parameters" msgstr "Parametri lentile" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 #, fuzzy msgid "Reset photometric parameters" msgstr "Parametri lentile" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 #, fuzzy msgid "Change stack..." msgstr "Schimbă lentilă..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 #, fuzzy msgid "Enter new stack number" msgstr "Introduce noul număr de lentilă" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 #, fuzzy msgid "stack number" msgstr "Număr lentilă" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 #, fuzzy msgid "Change stack number" msgstr "Schimbă numărul de lentilă" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 #, fuzzy msgid "Set stack size..." msgstr "Schimbă lentilă..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Calitate:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3380,63 +3450,63 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Arie egală azimutală Lambert" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "lăţimea trebuie să fie un întreg mai mare ca 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "înălţimea trebuie să fie un întreg mai mare ca 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "Opţiunile PTmender nu sunt încă implementate" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Opţiunile PTblender nu sunt încă implementate" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 #, fuzzy msgid "Could not create temporary project file" msgstr "Nu pot crea fişier temporar" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Specifică prefixul ieşirii" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3446,7 +3516,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3455,7 +3525,7 @@ "a long time and a large amount of memory." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3463,27 +3533,27 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 #, fuzzy msgid "Stitch anyway" msgstr "Îmbină acum!" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3513,218 +3583,237 @@ msgid "Miscellaneous" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Implicit system" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalană" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Chineză (Simplificat)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Cehă" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 #, fuzzy msgid "Danish" msgstr "Spaniolă" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Olandeză" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Engleză" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Franceză" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Germană" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Maghiară" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italiană" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japoneză" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Poloneză" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugheză (Brazilia)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Rusă" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovacă" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spaniolă" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Suedeză" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Selectează Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Executabile (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Selectează Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Re-setează tot" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Selectează PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Re-setează tot" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Fişiere proiect (*.pto)|*.pto|Toate fişierele (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Sigur reiniţializează preferinţele afişate cu valorile implicite?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Încarcă implicite" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 #, fuzzy msgid "Please select an entry first" msgstr "Selectează o imagine si încearcă din nou" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 #, fuzzy msgid "Select Entry" msgstr "Selectează Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 #, fuzzy msgid "Delete control point detector setting" msgstr "Şterge puncte de control" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 #, fuzzy msgid "Load control point detector settings" msgstr "Arată distanţele tuturor punctelor de control" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 #, fuzzy msgid "Save control point detector settings" msgstr "Arată distanţele tuturor punctelor de control" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3749,50 +3838,55 @@ msgid "Remove %lu control points" msgstr "Şters %d puncte de control" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Pre-vizualizare panoramă" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Opţiuni pre-vizualizare" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "proiecţie (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Mod îmbinare:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Ieşire:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Compresie:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parametri proiecţie" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Clic stânga pentru a defini un nou punct central, clic dreapta pentru a muta " "punctul la orizont." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centrează panorama cu butonul stânga maus, setează orizontul cu butonul " @@ -3813,7 +3907,7 @@ msgid "Click a connection to edit control points." msgstr "Clic pentru a crea sau edita puncte de control aici." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3821,30 +3915,112 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "autopano.exe nu a fost găsit. Specifică o cale validă în preferinţe" + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "autopano.exe nu a fost găsit. Specifică o cale validă în preferinţe" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Închide" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "Procesor batch" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Deschide PTBatcher, procesorul batch pentru proiecte Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3856,11 +4032,11 @@ "settings." msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, fuzzy, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3869,16 +4045,16 @@ "Foloseşte %namefile, %i sau %s pentru a specifica fişierele intrare pentru " "autopano-sift" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 #, fuzzy msgid "Error in control point detector command" msgstr "Eroare în timpul creării punctelor de control:\n" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 #, fuzzy msgid "" "Command line for control point detector too long.\n" @@ -3891,14 +4067,14 @@ "Selectează mai puţine imagini, sau plasează imaginile într-un dosar cu\n" "o cale mai scurtă" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Prea multe imagini selectate" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3906,38 +4082,38 @@ " Could not execute command: %s" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Eroare wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "căutând puncte de control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, fuzzy, c-format msgid "Could not execute command: %s" msgstr "Nu pot executa comanda: " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, fuzzy, c-format msgid "" "Command: %s\n" @@ -3946,9 +4122,9 @@ "\n" "eşuat cu codul de eroare: " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, fuzzy, c-format msgid "" "Could not open %s for reading\n" @@ -3963,14 +4139,14 @@ "\n" "Comanda autopano: " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 #, fuzzy msgid "Control point detector failure" msgstr "Tabelul punctelor de &control" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 #, fuzzy msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " @@ -3979,17 +4155,17 @@ "Foloseşte %namefile, %i sau %s pentru a specifica fişierele intrare pentru " "autopano-sift" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3998,12 +4174,12 @@ " Could not execute command: %s" msgstr "" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 #, fuzzy msgid "Default" msgstr "Deflate" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4011,261 +4187,261 @@ "Nu pot termina batch-ul curent.\n" "Vrei să-l anulezi?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 #, fuzzy msgid "PTBatcherGUI" msgstr "PTStitcher" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Batch terminat." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, fuzzy, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "Eroare: Nu am putut obţine statusul, proiect cu index" -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Eroare: Nu am putut încărca fişierul batch." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Batch-ul s-a terminat cu succes." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Batch-ul s-a terminat cu erori." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Iniţializare oprire..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Oprire..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Iniţializare oprire..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Iniţializare oprire..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Salvează fişierul proiect" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Prefixul ieşirii nu a fost specificat" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Nici un fişier proiect specificat" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Îmbinând" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, fuzzy, c-format msgid "%s - Assistant" msgstr "Asistent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, fuzzy, c-format msgid "Error removing, project with id %d is not in list." msgstr "Eroare ştergere, proiect cu id " -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Eroare: Nu pot şterge fişierul proiect " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Rulând batch..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTStitcher" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Batch-ul este deja în curs." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "Rulând comanda \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, fuzzy, c-format msgid "Now stitching: %s" msgstr "Îmbinând %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, fuzzy, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "Eroare: Nu pot seta statusul, proiect cu index " -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Nefăcând multe..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "Îmbinare" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTStitcher" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Închide la sfârşit" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Introduce aplicaţia în linie de comandă ce trebuie executată:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Introduce aplicaţie" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Specifică un dosar în care să caut proiecte" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Specifică fişierul sursă al proiectului" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "Proiecte adăugate din dosarul " -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, fuzzy, c-format msgid "Add project %s to stitching queue." msgstr "Adaugă un proiect la lista de batch-uri." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 #, fuzzy msgid "Batch stopped" msgstr "Batch suspendat" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 #, fuzzy msgid "Hugin's Batch processor" msgstr "&Rulează procesor batch" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Specifică prefixul ieşire pentru proiect " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Selectează un proiect" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Selectează un proiect" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Specifică un fişier batch pentru a deschide" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Fişiere batch (*.ptb)|*.ptb;|Toate fişierele (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Nu pot deschide aplicaţia în Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Nici un proiect selectat. Deschide Hugin fără proiect?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Batch suspendat" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Continuând batch..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4273,7 +4449,7 @@ "Lista conţine proiecte eşuate.\n" "Să le şterg şi pe acestea?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4281,16 +4457,16 @@ "Nu pot şterge proiecte în curs.\n" "Vrei să anulez?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "Proiect şters " -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Selectează un proiect să şterg" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4298,16 +4474,16 @@ "Nu pot re-seta proiecte în curs.\n" "Vrei să anulez?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "Re-setează proiect " -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Selectează un proiect să re-setezi" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4315,31 +4491,31 @@ "Nu pot re-seta proiecte în curs.\n" "Vrei să anulez batch-ul?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Specifică un fişier batch să salvez" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Fişier batch (*.ptb)|*.ptb;|Toate fişierele (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Şterge batch" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 #, fuzzy msgid "Starting batch" msgstr "începe batch" @@ -4382,187 +4558,189 @@ msgid "E&xit" msgstr "&Ieşire\tAlt-X" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" "Continue anyway?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" "Do you still want to continue?" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 #, fuzzy msgid "Stop" msgstr "sus:" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" "Please give an existing directory." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " "full." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "Şterge imaginile selectate din proiect" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "Îmbinând panorama" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, fuzzy, c-format msgid "Reading file %s" msgstr "Încărcând imaginea %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 #, fuzzy msgid "Start" msgstr "Început" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 #, fuzzy msgid "No possible panoramas found." msgstr "Nici un punct similar nu a fost găsit" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, fuzzy, c-format msgid "%d images: %s" msgstr "Adaugă imagini" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Eroare de sintaxă în parametri, anulez." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 #, fuzzy msgid "PTBatcherGUI started" msgstr "PTStitcher" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Aşteptând" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "În curs" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Terminat" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Eşuat" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fişier lipsă" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Suspendat" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Proiect" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefix ieşire" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Stare" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Ultima modificare" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Format ieşire" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Proiecţie" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Dimensiune" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Eroare, nu pot converti id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Asistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Schimbă prefix" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Re-setează proiect" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Editare cu Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 #, fuzzy msgid "Remove" @@ -4600,16 +4778,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Fişiere proiect (*.pto)|*.pto|Toate fişierele (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Nu pot deschide fişierul proiect:" -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Specifică fişierul sursă al proiectului" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4617,7 +4795,7 @@ msgstr "" #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Despre Hugin" @@ -4654,19 +4832,19 @@ msgstr "Implicit system" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4748,8 +4926,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Alege..." @@ -4843,7 +5024,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Opţiuni" @@ -4880,10 +5061,6 @@ msgid "Send selected panoramas to queue" msgstr "Panorama îmbinată (enfuse)" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Închide" - #: hugin1/hugin/xrc/batch_frame.xrc:479 #, fuzzy msgid "Searching panoramas" @@ -4991,12 +5168,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Ieşire" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Ieşire program" @@ -5101,47 +5278,164 @@ msgid "adddir" msgstr "adddir" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "perechea precedentă de imagini" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "următoarea pereche de imagini" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "mod:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +#, fuzzy +msgid "Description:" +msgstr "Fişier script:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "linie verticală" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Tip:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "linie orizontală" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +#, fuzzy +msgid "All images at once" +msgstr "Adaugă imagini: anulează" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "potriveşte în fereastră" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +#, fuzzy +msgid "Multi-row panorama" +msgstr "Pre-vizualizare panoramă" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Reglează-fin" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 #, fuzzy -msgid "Tries to optimize the currently active point" -msgstr "încearcă să optimizeze punctul curent activ." +msgid "Prealigned panorama" +msgstr "Pre-vizualizare panoramă" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +#, fuzzy +msgid "Detector" +msgstr "Mercator" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +#, fuzzy +msgid "Program:" +msgstr "Panoramă" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Parametri:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +#, fuzzy +msgid "Cleanup arguments:" +msgstr "Parametri impliciţi:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +#, fuzzy +msgid "Feature matcher:" +msgstr "Batch terminat." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +#, fuzzy +msgid "Advanced option" +msgstr "Opţiuni enfuse" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +#, fuzzy +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"următoarele şabloane vor fi substituite înainte de a rula:\n" +"%o -- proiect ieşire (0.oto va fi adăugat la utilizarea Autopano)\n" +"%p -- număr de puncte de control între fiecare pereche\n" +"%v -- HFOV al primei imagini\n" +"%f -- Proiecţia primei imagini (0-4, ca în panotools)\n" +"%i -- fişiere imagine\n" +"%namefile -- fişier care conţine nume de fişier\n" +"%s -- script panotools intrare" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +#, fuzzy +msgid "Parameters for Control Point Detectors" +msgstr "Şterge puncte de control" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "perechea precedentă de imagini" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "următoarea pereche de imagini" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "mod:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "linie verticală" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "linie orizontală" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "potriveşte în fereastră" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Reglează-fin" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +#, fuzzy +msgid "Tries to optimize the currently active point" +msgstr "încearcă să optimizeze punctul curent activ." + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 msgid "auto fine-&tune" msgstr "®laj-fin automat" @@ -5198,7 +5492,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Şterge" @@ -5206,164 +5500,196 @@ msgid "Select by Distance" msgstr "Selectează după distanţă" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +#: hugin1/hugin/xrc/dlg_warning.xrc:55 #, fuzzy -msgid "Description:" -msgstr "Fişier script:" +msgid "Warning: Invalid filenames" +msgstr "Parametri impliciţi:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Tip:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (by A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 #, fuzzy -msgid "All images at once" -msgstr "Adaugă imagini: anulează" +msgid "No" +msgstr "Nimic" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Editează script-ul Panorama Tools" + +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." msgstr "" +"Acesta este script-ul ce va fi trimis către motorul Panorama Tools. " +"Editarea acestor linii este o tehnică avansată." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -#, fuzzy -msgid "Multi-row panorama" -msgstr "Pre-vizualizare panoramă" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Continuă cu aceste schimbări" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Renunţă la schimbări şi anulează" + +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -#, fuzzy -msgid "Prealigned panorama" -msgstr "Pre-vizualizare panoramă" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" + +#: hugin1/hugin/xrc/images_panel.xrc:67 #, fuzzy -msgid "Detector" -msgstr "Mercator" +msgid "Maximum Ev difference:" +msgstr "diferenţă" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "" + +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "General" + +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "" + +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 #, fuzzy -msgid "Program:" -msgstr "Panoramă" +msgid "Positions" +msgstr "Contopire imagini" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Parametri:" +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parametri lentile" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +#: hugin1/hugin/xrc/images_panel.xrc:96 #, fuzzy -msgid "Cleanup arguments:" -msgstr "Parametri impliciţi:" +msgid "Photometric parameters" +msgstr "Aliniere fotometrica" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:130 +#, fuzzy +msgid "Lens type" +msgstr "Tip lentilă:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:145 +#, fuzzy +msgid "Add images..." +msgstr "Adaugă imagini" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Tip lentilă:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Multiplicator lungime focală:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 #, fuzzy -msgid "Feature matcher:" +msgid "Feature Matching" msgstr "Batch terminat." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:242 +#, fuzzy +msgid "Settings:" +msgstr "Vignetare:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +#: hugin1/hugin/xrc/images_panel.xrc:254 #, fuzzy -msgid "Advanced option" -msgstr "Opţiuni enfuse" +msgid "Run selected control point detector on the selected images" +msgstr "Şterge punctele de control ce conectează imaginile selectate" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimizează" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +#: hugin1/hugin/xrc/images_panel.xrc:293 #, fuzzy -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +msgid "Geometric:" +msgstr "Geometric" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" msgstr "" -"următoarele şabloane vor fi substituite înainte de a rula:\n" -"%o -- proiect ieşire (0.oto va fi adăugat la utilizarea Autopano)\n" -"%p -- număr de puncte de control între fiecare pereche\n" -"%v -- HFOV al primei imagini\n" -"%f -- Proiecţia primei imagini (0-4, ca în panotools)\n" -"%i -- fişiere imagine\n" -"%namefile -- fişier care conţine nume de fişier\n" -"%s -- script panotools intrare" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +#: hugin1/hugin/xrc/images_panel.xrc:314 #, fuzzy -msgid "Parameters for Control Point Detectors" -msgstr "Şterge puncte de control" +msgid "Photometric:" +msgstr "Fotometric" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -#, fuzzy -msgid "Invalid filenames" -msgstr "Parametri impliciţi:" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Imagine selectată" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Editează script-ul Panorama Tools" +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Încarcă parametri lentile..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Acesta este script-ul ce va fi trimis către motorul Panorama Tools. " -"Editarea acestor linii este o tehnică avansată." +"Introduce câmpul de vedere orizontal (HFOV) sau lungimea focală şi factorul " +"de decupare:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Continuă cu aceste schimbări" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Renunţă la schimbări şi anulează" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "grade" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Informaţii cameră şi lentile" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Derivă:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Înclinaţie:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Rotaţie:" @@ -5372,36 +5698,11 @@ msgid "Translation parameter" msgstr "Leagă parametrii" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -#, fuzzy -msgid "Y:" -msgstr "Derivă:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -#, fuzzy -msgid "Positions" -msgstr "Contopire imagini" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "grade vedere (v):" @@ -5505,7 +5806,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Ajutor" @@ -5548,8 +5849,8 @@ msgstr "Încărcând imaginile" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Salvează" @@ -5562,130 +5863,47 @@ msgid "Manipulate image variables" msgstr "Variabile imagine:" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:67 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Maximum Ev difference:" -msgstr "diferenţă" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "General" +msgid "WB reference:" +msgstr "&Preferinţe" -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parametri lentile" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -#, fuzzy -msgid "Photometric parameters" -msgstr "Aliniere fotometrica" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -#, fuzzy -msgid "Lens type" -msgstr "Tip lentilă:" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -#, fuzzy -msgid "Add images..." -msgstr "Adaugă imagini" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Tip lentilă:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Multiplicator lungime focală:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -#, fuzzy -msgid "Feature Matching" -msgstr "Batch terminat." - -#: hugin1/hugin/xrc/images_panel.xrc:242 -#, fuzzy -msgid "Settings:" -msgstr "Vignetare:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -#, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "Şterge punctele de control ce conectează imaginile selectate" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimizează" - -#: hugin1/hugin/xrc/images_panel.xrc:293 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 #, fuzzy -msgid "Geometric:" -msgstr "Geometric" +msgid "Additional dcraw parameters:" +msgstr "Leagă parametrii" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 #, fuzzy -msgid "Photometric:" -msgstr "Fotometric" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Imagine selectată" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Încarcă parametri lentile..." +msgid "Processing profile:" +msgstr "Procesare" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Introduce câmpul de vedere orizontal (HFOV) sau lungimea focală şi factorul " -"de decupare:" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "grade" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Informaţii cameră şi lentile" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5845,15 +6063,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -#, fuzzy -msgid "No" -msgstr "Nimic" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5913,21 +6122,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Anulează" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Anulează ultima acţiune" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Refă" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Refă ultima acţiune" @@ -5975,12 +6184,12 @@ msgid "Use only normal control points in optimization." msgstr "Număr de puncte per imagine" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimizare" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Rulează optimiza-torul cu setările curente" @@ -6012,15 +6221,15 @@ msgid "Run a python script" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Vizualizare" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "" @@ -6107,20 +6316,20 @@ msgid "Show the Stitcher panel" msgstr "Ajutor îmbinător batch" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Opţiuni enfuse" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Interfaţă utilizator" @@ -6142,86 +6351,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Informaţie pe diferitele butoane şi aşa mai departe." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Informaţia zilei" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Arată una din informaţiile zilei" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "Scurtături &tastatură" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "scurtături tastatură" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Întrebări frecvente" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Despre" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Preferinţe" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nou" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Proiect nou" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Deschide" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Deschide proiect" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Salvează" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Salvează fişierul proiect" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "S&alvează ca" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Salvează proiectul într-un fişier nou" @@ -6237,20 +6446,20 @@ "Scrie proiectul curent într-un fişier script compatibil PTStitcher, util la " "procesarea batch" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Specifică fişierul sursă al proiectului" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 #, fuzzy msgid "List of most recently used project files" msgstr "Specifică fişierul sursă al proiectului" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Rulează procesor batch" @@ -6339,7 +6548,7 @@ msgid "Show the OpenGL preview image" msgstr "Arată imaginea de pre-vizualizare OpenGL" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Pre-vizualizare panoramă" @@ -6399,16 +6608,11 @@ msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 #, fuzzy msgid "Export" msgstr "Expunere" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "" @@ -6456,8 +6660,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6570,7 +6774,8 @@ msgid "execute the PTOptimizer engine" msgstr "execută motorul PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientare imagine" @@ -6616,39 +6821,39 @@ msgid "Interpolator (i):" msgstr "Interpolator (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubic)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilinear" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Cel mai apropiat vecin" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "aproximarea valorilor dintre pixelii sursă" @@ -6677,7 +6882,7 @@ msgid "Enfuse options" msgstr "Opţiuni enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 #, fuzzy msgid "Field of View:" msgstr "Câmp de vedere" @@ -6842,10 +7047,6 @@ msgid "Image fusion:" msgstr "Contopire imagini" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "Îmbinator HDR:" @@ -6950,16 +7151,16 @@ msgid "Output parameters" msgstr "Parametri personalizaţi mai jos" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Mod îmbinare:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "eroare enblend" @@ -7031,32 +7232,48 @@ msgid "This affects the control points editor and mask editor." msgstr "Şters %d puncte de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Executabil enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +#, fuzzy +msgid "(leave empty for OS default)" +msgstr "lasă gol pentru valoarea implicită sistem" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Executabil enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Executabil enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 #, fuzzy msgid "File Options" msgstr "Opţiuni fişiere" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 #, fuzzy msgid "Temporary dir:" msgstr "Director temporar:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -#, fuzzy -msgid "(leave empty for OS default)" -msgstr "lasă gol pentru valoarea implicită sistem" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 #, fuzzy msgid "Default project filename:" msgstr "Deschide un fişier proiect" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 #, fuzzy msgid "Default output prefix:" msgstr "Specifică prefixul ieşirii" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7074,113 +7291,113 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 #, fuzzy msgid "Default filenames" msgstr "Parametri impliciţi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 #, fuzzy msgid "Filenames" msgstr "Nume-fişier" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Încărcare imagini" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Aliniază imaginile automat după încărcare" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 #, fuzzy msgid "Detect vertical lines" msgstr "linie verticală" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 #, fuzzy msgid "Remove cloud-like control points (Celeste)" msgstr "Şters %d puncte de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Aliniere automată" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" msgstr "Număr de puncte de control per suprapunere" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Redu panorama finală" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "procent din lăţimea maximă" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor puncte de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "Afişaj HDR şi 16 bit" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Curbă" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "liniară" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmică" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "folosită la afişarea în GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Lăţimea zonei:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixeli" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Lăţimea ariei de căutare:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "procent din lăţimea imaginii" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Lăţimea ariei de căutare locale:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Prag corelaţie:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7188,11 +7405,11 @@ "0: nici o similaritate\n" "1: similaritate maximă" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Prag curbură maximă:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 #, fuzzy msgid "" "0: no peak\n" @@ -7201,168 +7418,164 @@ "0: nici un vârf\n" " 0.2: vârf distinct" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Căutare rotaţie" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Activează căutare rotaţie (încet, dar mai precis)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Unghi pornire:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Unghi final:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Paşi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 #, fuzzy msgid "Control Point Detectors" msgstr "Editor puncte de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 #, fuzzy msgid "Control Point Detector Programs" msgstr "Editor puncte de control" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 #, fuzzy msgid "New..." msgstr "Nou" -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 #, fuzzy msgid "Edit..." msgstr "&Editare" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Mută în sus" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Mută în jos" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 #, fuzzy msgid "Set default" msgstr "Implicit system" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 #, fuzzy msgid "Output Format" msgstr "Format ieşire" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 #, fuzzy msgid "Default File Format:" msgstr "Parametri impliciţi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 #, fuzzy msgid "TIFF Compression:" msgstr "Compresie:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 #, fuzzy msgid "JPEG Quality:" msgstr "Calitate:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "Îmbinator:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "Parametri impliciţi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 #, fuzzy msgid "Processor" msgstr "Procesor batch" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " "has to start the processing manually." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 #, fuzzy msgid "Overwrite existing files" msgstr "Suprascrie imaginile existente" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 #, fuzzy msgid "Verbose Output" msgstr "Ieşire detaliată" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Îmbinare" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Opţiuni enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7371,58 +7584,58 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "lasă gol pentru valoarea implicită sistem" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 #, fuzzy msgid "Advanced options" msgstr "Opţiuni enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 #, fuzzy msgid "Number of threads:" msgstr "Număr de procesoare:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 #, fuzzy msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " @@ -7434,86 +7647,86 @@ "Setează această valoare cu numărul de procesoare sau nuclee de procesor " "disponibile în sistem." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "Îmbinare" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 #, fuzzy msgid "Default Interpolator (i):" msgstr "Interpolator (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 #, fuzzy msgid "Create cropped images by default" msgstr "Salvează imaginile decupate" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Utilizează program Enblend alternativ" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Executabil enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Parametri impliciţi:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 #, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Aceştia sunt parametrii impliciţi. Se pot schimba pentru proiecte " "individuale în fila Îmbinare.\n" "Nu seta parametrii -w, -o şi --compression, sunt setaţi de hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Utilizează program Enfuse alternativ" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Executabil enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 #, fuzzy msgid "Programs" msgstr "Panoramă" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parametri celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Prag SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7521,19 +7734,19 @@ "mai mare decât 0.5: mai puţin sensibil\n" "mai mic decât 0.5: mai sensibil" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "mărime filtru Gabor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "mic" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "mare" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7541,7 +7754,7 @@ "mare este mai precis\n" "mic poate examina puncte de control aproape de marginea imaginii" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7552,78 +7765,78 @@ "Pentru a grăbi calculul, doar un sub-set de puncte selectate aleator este " "utilizat." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 #, fuzzy msgid "Number of points per image: " msgstr "Număr de puncte per imagine" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 #, fuzzy msgid "Photometric optimizer" msgstr "Optimizare fotometrică" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "Avertisment" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "Optimizare panoramă" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "Optimizează acum!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "&Fereastră pre-vizualizare rapidă" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Preferinţe - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "Selectează punct în imaginea din stânga" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7643,11 +7856,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centrează pre-vizualizarea orizontal" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centru" @@ -7655,13 +7868,15 @@ msgid "Show the whole panorama" msgstr "Arată întreaga panoramă" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Estimează câmpul de vedere" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Potrivire" @@ -7670,7 +7885,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Îndreptează automat un orizont vălurit" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Îndreptează" @@ -7768,34 +7984,34 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "&Editare" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "Şterge puncte de control" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 #, fuzzy msgid "Scale:" msgstr "Salvează" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7803,163 +8019,150 @@ "* Click a line to edit the associated images in the Control Points tab." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 #, fuzzy msgid "Golden ratio" msgstr "Nume-fişier" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Îndreptează automat un orizont vălurit" -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 #, fuzzy msgid "Drag mode:" msgstr "Trage pentru a muta." -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Aplică" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -#, fuzzy -msgid "Move the panorama or drag images into position" -msgstr "Trage imaginile la poziţie" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 #, fuzzy msgid "Move/Drag" msgstr "Trage" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 #, fuzzy msgid "HDR Autocrop" msgstr "Automat" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "stânga:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "sus:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "dreapta:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "jos:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Schimbă regiunea de decupare a panoramei" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 #, fuzzy msgid "Panorama &editor" msgstr "Pre-vizualizare panoramă" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 #, fuzzy msgid "&Overview" msgstr "Pre-vizualizare" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 #, fuzzy msgid "Shows the overview of the panorama sphere." msgstr "Arată întreaga panoramă" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Adaugă imagini" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "schimbă lentila imaginilor selectate" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Re-setează proiect" @@ -8250,6 +8453,65 @@ "imagini suprapuse foarte mult şi multe puncte de control bine distribuite." #, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Preferinţe" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Imagini" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Adaugă imagini" + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Adaugă altă imagine la proiectul curent" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "S&alvează ca" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Şterge imaginile selectate" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Scară pentru detecţia colţurilor" + +#, fuzzy +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Trage imaginile la poziţie" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Schimbă regiunea de decupare a panoramei" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Toate fişierele imagine|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" +#~ "*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;" +#~ "*.exr;*.EXR|Fişiere JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Fişiere " +#~ "TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Fişiere PNG (*.png)|*.png;*." +#~ "PNG|Fişiere HDR (*.hdr)|*.hdr;*.HDR|Fişiere EXR (*.exr)|*.exr;*.EXR|Toate " +#~ "fişierele (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (by A. Jenny)" + +#, fuzzy +#~ msgid "Y:" +#~ msgstr "Derivă:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#, fuzzy #~ msgid "Interface" #~ msgstr "Interfaţă utilizator" @@ -8972,10 +9234,6 @@ #~ msgid "autopano failure" #~ msgstr "eşuare autopano" -#~ msgid "" -#~ "autopano.exe not found. Please specify a valid path in the preferences" -#~ msgstr "autopano.exe nu a fost găsit. Specifică o cale validă în preferinţe" - #~ msgid "no command in undo history" #~ msgstr "Nici o comandă în istoricul de anulări" @@ -9236,9 +9494,6 @@ #~ msgid "PTStitcher note" #~ msgstr "Notă PTStitcher" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Selectează PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "Nici un PTStitcher.exe selectat" diff -Nru hugin-2018.0.0+dfsg/src/translations/ru.po hugin-2019.0.0+dfsg/src/translations/ru.po --- hugin-2018.0.0+dfsg/src/translations/ru.po 2018-01-13 07:52:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/ru.po 2019-02-17 15:24:33.000000000 +0000 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: Hugin 2011.0.0\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2017-09-18 13:59+0400\n" "Last-Translator: Victor Ryzhykh \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n" -"%100>=20) ? 1 : 2);\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n%" +"100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.5.5\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 @@ -47,15 +47,15 @@ msgid "Searching for best crop..." msgstr "Поиск оптимальной обрезки..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Внешняя программа %s не найдена в поставке Hugin, возврат к системному пути" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -82,9 +82,9 @@ msgstr "Файлы BMP (*.bmp)|*.bmp|Файлы PNG (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Файл %s уже существует. Перезаписать?" @@ -122,7 +122,7 @@ msgstr "Кроп-фактор должен быть положительным." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -135,24 +135,28 @@ "Вы хотите по-прежнему использовать это завышенное значение?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -173,8 +177,8 @@ msgstr "Полнокадровый РыбийГлаз" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Эквидистантная" @@ -205,11 +209,13 @@ msgid "builtin" msgstr "встроенное" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "Другой (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Линейный" @@ -234,16 +240,16 @@ msgid "Error loading lens parameters" msgstr "Ошибка загрузки параметров объектива" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Сохранить файл параметров объектива" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Файлы данных объектива (*.ini)|*.ini|Все файлы (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Сохранить проект" @@ -279,22 +285,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Ошибка приостановки процесса %ld, код 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Отмена" @@ -329,12 +336,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Не удалось открыть файл проекта:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "не удалось открыть скрипт: %s" @@ -344,8 +351,8 @@ msgid "Project %s does not contain any active images." msgstr "Проект %s не содержит активных снимков." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "ошибка при синтаксическом разборе скрипта panotools: %s" @@ -359,17 +366,17 @@ msgid "Could not create temporary file" msgstr "Не удалось создать временный файл" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "Очередь пуста. Этого никогда не должно происходить." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Ошибка в процессе сборки" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -377,11 +384,11 @@ "Перезаписать существующие снимки?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Перезаписать существующие снимки" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -390,12 +397,12 @@ "Ошибка при сборке проекта\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Ошибка при работе ассистента" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -404,272 +411,282 @@ "Ошибка при работе ассистента\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Сшивается панорама..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "Платформа:" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Версия:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Текущий каталог:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Префикс вывода:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Инструмент совмещения:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "внутренний" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Слияние экспозиции:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Версия ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "ExifTool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "ОШИБКА" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Число активных снимков:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Значение результирующей экспозиции: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Размер холста: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Проекция:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Использовать GPU для переделки:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Выводы панорамы:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Коррекция экспозиции, узкий динамический диапазон" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Сначала сведение экспозиций, затем объединение" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Сначала объединение, затем сведение экспозиций " -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Широкий динамический диапазон" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Переделанные снимки:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Без экспокоррекции, узкий динамический диапазон" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Сведённые стопки:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Стопки с различными экспозициями" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Слои:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Совмещённые слои со схожей экспозицией без экспокоррекции" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Первый входной снимок" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Количество:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Имя файла:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Размер: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Тип отклика:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Значение экспозиции: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Переделка и совмещение снимков LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Переделка снимков LDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Совмещение снимков..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Переделка снимков LDR и совмещение слоев экспозиций..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Переделка снимков LDR без экспокоррекции..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Совмещение слоя экспозиции %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Слияние всех слоев экспозиций..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Совмещение стопки номер %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Совмещение всех стопок..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Переделка снимков HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Слияние HDR-стопки номер %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Совмещение стопок HDR..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Обновление метаданных..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Сшиваем с использованием \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "первый снимок" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "последний снимок" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "каталог" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Производитель камеры" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Модель камеры" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -677,35 +694,69 @@ msgid "Lens" msgstr "Объектив" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "неизвестная проекция" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Файл снимка:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Читается файл %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Ошибка" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -716,25 +767,11 @@ "Hugin не может работать с такими файлами. Переименуйте ваш файл(ы) и " "попробуйте снова." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Отладочный отчет сгенерирован в \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Все файлы снимков|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"Файлы JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Файлы TIFF (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы HDR (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Все файлы (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -746,27 +783,27 @@ msgstr "Введено \"%s\" - это недопустимое число." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Предупреждение" @@ -783,7 +820,7 @@ msgid "Could not save information into database." msgstr "Невозможно сохранить информацию в базу данных." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -794,11 +831,11 @@ "%s\n" "Прерывание" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Неподдерживаемый формат снимков" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -811,7 +848,7 @@ "Преобразуйте снимок в снимок с оттенками серого и попробуйте загрузить его " "снова." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -822,12 +859,12 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " @@ -836,7 +873,7 @@ "Файл \"%s\" - снимок в оттенках серого, в то время как остальные снимки в " "проекте - цветные." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " @@ -845,7 +882,7 @@ "Файл \"%s\" - цветной снимок, в то время как остальные снимки в проекте - в " "оттенках серого." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -855,7 +892,7 @@ "Преобразуйте его в оттенки серого либо в RGB соответсвенно и попробуйте " "загрузить снова." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -864,7 +901,7 @@ "В файле \"%s\" нет встроенного профиля цветовой коррекции (icc), но в " "других снимках проекта есть встроенный профиль \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -873,7 +910,7 @@ "В файле \"%s\" есть встроенный профиль цветовой коррекции (icc) \"%s\", но " "в других снимках проекта нет цветовых профилей." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -882,7 +919,7 @@ "В файле \"%s\" есть встроенный профиль цветовой коррекции (icc) \"%s\", но " "в других снимках проекта встроен профиль \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -890,7 +927,7 @@ "Hugin ожидает, что все снимки используют одинаковый профиль цветов.\n" "Пожалуйста, преобразуйте все снимки к одному профилю и попробуйте снова." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -898,18 +935,18 @@ "Hugin обнаружил стопки в загруженных снимках и присвоет снимкам " "соответсвующие номера стопок." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Надо ли связать позиции снимкоа в каждой из стопок?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -917,25 +954,25 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Привязать расположение" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Не привязывать расположение" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Сохранить существующие стопки" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -944,16 +981,16 @@ "Файл проекта \"%s\" ссылается на несуществующий снимок \"%s\".\n" "Пожалуйста, укажите правильный снимок вручную." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Файл снимка не найден" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Выберите снимок %s" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -964,16 +1001,17 @@ "\n" "Нажмите ОК, чтобы удалить их." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Обнаружена ошибка" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Добавить снимки" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -982,32 +1020,32 @@ "Ошибка: шаблон прелполагает наличие %d снимков в проекте,\n" "но в текущем проекте их всего %d.\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Не удалось применить шаблон" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Ошибка при открытии проектного файла" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Результат" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc каталог не найден в поставке" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Критическая ошибка" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1040,7 +1078,7 @@ "добавленными.\n" "Проверьте снимки снова, чтобы были правильные." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Добавить снимок: отмена" @@ -1053,9 +1091,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1072,7 +1110,7 @@ msgstr "Поиск линий..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Закончено" @@ -1085,11 +1123,11 @@ "Не заданы линии.\n" "Запустите сначала \"Найти линии\". Если линий не найдено, измените настройки." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Оптимизация параметров искажения объектива..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1099,142 +1137,142 @@ "Запустите \"Найти линии\" и \"Оптимизировать\" перед сохранением данных " "объектива. Если линий не найдено, измените настройки." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Сохранить конфигурацию объектива в ini-файл" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Сохранить конфигурацию объектива в базу данных объективов" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Сохраняются данные объектива" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Сохранить объективы" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Сохранить файл проекта" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Файлы проектов (*.pto)|*.pto|Все файлы (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Удаляются временные файлы..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "показывает эту справку" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "запустить ассистента" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "запустить сшивание с текущим проектом" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "число используемых потоков:" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "префикс, используемый для сшивки" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "только вывести команды" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Операционная система: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 битная" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 битная" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Архитектура: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Свободная память: %lld Кбайт" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Активная кодировка: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Версия: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Расположение ресурсов: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Расположение данных: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "База данных камеры и объектива Hugin: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Многопоточность с использованием C++11 std::thread и OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Профиль монитора: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Библиотеки" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano от http://autopano.kolor.com не работает в Mac OS X" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Вместо него используется Autopano-Sift" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1242,85 +1280,90 @@ "Как минимум одно поле ввода не заполнено.\n" "Проверьте введенные данные." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Попытаться связать перекрывающиеся снимки" -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Работать только с парами снимков без контрольных точек" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Выберите программу определения контрольных точек" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Исполняемые файлы (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "№" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "X слева" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "Y слева" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "X справа" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "Y справа" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Выравнивание" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Расстояние" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "добавлена новая контрольная точка" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "поиск похожих точек..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Ошибка в ходе точной коррекции" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Точка настроена, угол: %.0f градусов, коэфф. корреляции: %0.3f, кривизна: " -"%0.3f %0.3f " +"Точка настроена, угол: %.0f градусов, коэфф. корреляции: %0.3f, кривизна: %" +"0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "смените точки, либо нажмите правую кнопку мыши, чтобы добавить пару" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Расчётная точка вне снимка" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Схожая точка не найдена." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1328,7 +1371,7 @@ "Внутреннее преобразование завершилось с ошибкой.\n" "Проверьте, что точка находится внутри снимка." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1338,31 +1381,37 @@ "Проверьте соответствие визуально.\n" "Коэффициент корреляции (%.3f) ниже порога, указанного в параметрах программы." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Добавить новую линию" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Линия %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Порог корреляции:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "Нормальный" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "верт. линия" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "гор. линия" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1371,38 +1420,38 @@ "Создайте контрольные точки.\n" "Чем больше число, тем меньше точек." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Порог определения углов" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Создать контрольные точки" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Масштаб определения углов" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Ошибка при создании контрольной точки:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Выберите точку в снимке справа" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Выберите точку в снимке слева" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Создато контрольную точку (текущее значение: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1410,53 +1459,54 @@ "Невозможно запустить Celeste без хотя бы одной контрольной точки, " "соединяющей два снимка." -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Выполняется Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Загружается файл модели" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Удалено %lu контрольных точек" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Результат работы Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Очистка" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Создать контрольную точку" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Пытается удалить контрольные точки из облаков" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Очистить КТ" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Удалять наружные контрольные точки статистическим методом" @@ -1468,23 +1518,23 @@ msgid "Could not process event!" msgstr "Не удалось обработать событие!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "Глоб.№КТ" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Снимок слева" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Снимок справа" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "Лок.№КТ" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1492,7 +1542,7 @@ "Введите минимальное значение ошибки контрольных точек.\n" "Будут выбраны все точки с большим значением ошибки." -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Выберите контрольные точки" @@ -1573,60 +1623,60 @@ "поворота вокруг оси с перетаскиванием правой кнопкой мыши или Ctrl" "+перетаскиванием." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Быстрый предпросмотр панорамы" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Файл" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "отображаемые снимки" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Все" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Нет" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Скрыть" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "ВертПЗ" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "Перетащите для смены вертикального поля зрения" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "ГорПЗ" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "Перетащите для изменения горизонтального поля зрения" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Предпросмотр" @@ -1634,84 +1684,89 @@ msgid "Overview" msgstr "Обзор" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Сбросить параметры проекций до значений по умолчанию." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "парам.:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Ни один снимок не загружен." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu снимков загружено." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Снимки связаны %lu контрольными точками.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "Найдено %lu несвязанных групп снимков: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "" "Снимки или контрольные точки изменились, требуется повторное выравнивание." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Средняя погрешность после оптимизации: %.1f пикселей, макс.: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Прямолинейная" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Цилиндрическая" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Значение поворота вокруг вертикали должно быть числом." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Значение наклона горизонта должно быть числом" -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Значение поворота вокруг оси должно быть числом" -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "Значение X должно быть числом." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Значение Y должно быть числом." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Значение Z должно быть числом." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Значение должно быть числом" -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1719,58 +1774,58 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "Разница" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Автообрезка" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Вычисляется оптимальная обрезка" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Верх должен быть целым числом больше 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "слева должен быть целым числом больше 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "справа должен быть целым числом больше 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "низ должен быть целым числом больше 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "левая граница должна быть меньше правой" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "верхняя граница должна быть меньше нижней" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "" "Некорректное значение ГорПЗ. Максимально ГорПЗ для этой проекции равно %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "" -"Некорректное значение ВертПЗ. Максимальное ВертПЗ для этой проекции равно " -"%lf." +"Некорректное значение ВертПЗ. Максимальное ВертПЗ для этой проекции равно %" +"lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1778,7 +1833,7 @@ "С широким углом обзора, панорамы с прямолинейной проекцией очень растянута " "по краям.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1786,15 +1841,15 @@ "Поскольку угол обзора очень широк только в горизонтальном направлении, " "попробуйте вместо этого цилиндрическую проекцию." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Для очень широкой панорамы попробуйте эквидистантную проекцию." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Вы можете попробовать и проекцию Панини." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1806,7 +1861,7 @@ "Эквидистантная проекция уместила бы то же самое содержимое в меньшее " "вертикальное пространство." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1817,7 +1872,7 @@ "Цилиндрическая проекция сохраняет вертикальные линии, в отличие от " "эквидистантной." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1828,7 +1883,7 @@ "РыбийГлаз.\n" "Она сохраняет углы вокруг точки, что облегчает зрительное восприятие." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1840,13 +1895,13 @@ "Панорама с проекцией РыбийГлаз сжимает его, так что вы можете уместиться в " "широкое поле обзора и при этом иметь разумное покрытие по центру." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "Установка панорамы на прямолинейную проекцию сохранит прямые линии." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1855,27 +1910,27 @@ "У вас есть скрытая информационная панель, которая показывает подсказки. \n" "Если вы хотите увидеть её снова, активируйте панель в настройках." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "нормальный, настраиваемый" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "мозаичный" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "мозаичный, настраиваемый" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Паносфера" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Мозаика" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1886,12 +1941,12 @@ "\n" "Следует ли перезапустить оптимизацию панорамы?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "В данный момент выбрана стратегия оптимизации \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1899,7 +1954,7 @@ "Выбранная область не содержит активных снимков.\n" "Пожалуйста, выберите область, покрываемую хотя бы двумя снимками." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1907,7 +1962,7 @@ "Выбранная область покрывается только одним снимком.\n" "Невозможно создать контрольные точки для одиночного снимка." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1921,28 +1976,28 @@ "\n" "Вы уверены, что хотите продолжить?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Поиск контрольных точек" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Обработка" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "поиск похожих точек..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Проверка результатов..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1953,7 +2008,7 @@ "\n" "Следует ли перезапустить оптимизацию панорамы?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1961,7 +2016,7 @@ "Ошибка инициализации GLEW.\n" "Окно быстрого предпросмотра не может быть открыто." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2008,7 +2063,7 @@ msgstr "Количество масок" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Обрезка" @@ -2041,7 +2096,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Максимальная разница EV должна быть больше 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Стопки" @@ -2220,7 +2275,7 @@ msgid "Shutter speed" msgstr "Выдержка" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2370,93 +2425,93 @@ msgid "Camera response parameter" msgstr "Параметр отклика камеры" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Объектив %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Стопка %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Выходная стопка %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Слой совмещенных экспозиций %d" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Связать" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Убрать связь" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Выделить все для текущего объектива" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Сбросить все для текущего объектива" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Выделить все для текущей стопки" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Сбросить выделение для текущей стопки" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Выделить все" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Сбросить все" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Редактировать переменные снимка..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Деактивировать снимок" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Активировать снимок" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Активировать снимки" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Деактивировать снимки" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Контрольные точки" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2489,12 +2544,24 @@ msgid "Did you know..." msgstr "Знаете ли вы, что..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Версия %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2502,72 +2569,72 @@ "Фатальная ошибка при установке\n" "Файл data/splash.png не был найден по адресу:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Справка" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Действия" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "&Вывод" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "Сбросить настройки пользователя..." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Правка" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Сбросить настройки пользователя..." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "запустить ассистента" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "К работе готов" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Оптимизация" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Экспозиция" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "Сохранить изменения в файле проекта перед открытием другого проекта?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "Сохранить изменения в файле проекта перед началом нового проекта?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "Сохранить изменения в файле проекта перед закрытием?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2575,7 +2642,7 @@ "Если вы загрузите доугой проект без сохранения, изменения с момента " "последнего сохранения будут потеряны" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2583,7 +2650,7 @@ "Если вы начнете новый проект без сохранения, изменения с момента последнего " "сохранения будут потеряны" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2591,40 +2658,40 @@ "Если вы выйдите без сохранения, изменения с момента последнего сохранения " "будут потеряны." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Не сохранять" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Закрыть без сохранения" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "принудительно закрыто" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "сохранён проект %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - сборщик панорам " -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Редактор панорам" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2637,36 +2704,36 @@ "\n" "(Код ошибки: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Сохранить файл сценария PTmender" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Файлы PTmender (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Открыть проект: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Проект открыт" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Загружается снимок:" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Ошибка при открытии проекта: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Открыть проектный файл" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2677,11 +2744,11 @@ "Этот файл нельзя открыть с помощью меню Файл, Открыть.\n" "Добавить этот снимок в текущий проект?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Открыть проект: отмена" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2689,7 +2756,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2697,32 +2764,32 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Не удалось прочитать проектный файл %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Открыть xml-файл Papywizard" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "XML-файлы Papywizard (*.msk)|*.msk|Все файлы (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Выберите шаблон проекта" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Точная коррекция всех точек" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Точная коррекция" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2751,23 +2818,23 @@ "Используйте Список контрольных точек (F3) для просмотра всех точек текущего " "проекта.\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Результат точной коррекции" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Удаление контрольных точек под масками" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Выберите сценарий python" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Сценарий Python (*.py)|*.py|Все файлы (*)|*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2776,13 +2843,13 @@ "Файл «%s» не найден.\n" "Возможно он был переименован, перемещён или удалён." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Ошибка!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2790,12 +2857,12 @@ "Модель Celeste искомый в %s не найдена, необходимо корректно установить " "Hugin." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Не удалось загрузить файл модели Celeste %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2805,7 +2872,7 @@ "смещение центра виньетирования.\n" "Эти возможности не поддерживаются в простом интерфейсе." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2814,7 +2881,7 @@ "Невозможно переключиться в простой интерфейс. Проект использует параметры\n" "переноса или скоса, которые не поддерживаются в простом интерфейсе." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2824,28 +2891,28 @@ "параметры\n" "переноса или скоса, которые не поддерживаются в продвинутом интерфейсе." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Выполняется ассистент" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Предупреждение, найдено %d несвязанных групп снимков:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2858,29 +2925,29 @@ "\n" "Добавив точки, снова нажмите кнопку «Объединить»." -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "Ассистент не был завершен успешно. Проверьте конечный файл проекта." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Файл проекта не найден" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Невозможно запустить PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Запущена некорректная программа" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Тип маски" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2888,29 +2955,29 @@ "Создайте многоугольную маску, щёлкая левой кнопкой мыши. Конечная точка " "устанавливается щелчком правой кнопки." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Сохранить маску" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Файлы масок (*.msk)|*.msk|Все файлы (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Загрузить маску" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Загрузка маски: отмена" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Не удалось прочитать маску из файла %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Введите правильный номер" @@ -3050,7 +3117,7 @@ msgstr "Фотометрическое выравнивание" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Загружаются снимки" @@ -3093,64 +3160,68 @@ msgid "Photometric optimization finished" msgstr "Фотометрическая оптимизация завершена" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Добавить отдельные снимки..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Добавить одновременно сделанные снимки..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Похожих снимков нет." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Редактировать переменные снимка..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Удалить выбранные снимки" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Зафиксировать позицию снимка" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Зафиксировать экспозицию снимка" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Новые объективы" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Сменить объектив..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Введите номер нового объектива" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Номер объектива" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Смена номера объектива" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Загрузить данные объектива из базы данных объективов" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Загрузить конфигурацию объектива из ini-файла" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3159,12 +3230,12 @@ "Нужно-ли загруженные параметры применять ко всем изображениям с этого " "объектива?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Вопрос" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3174,100 +3245,100 @@ "Применение параметров объектива может привести к нежелательным результатам.\n" "Стоит-ли применять параметры?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Сохранить объективы в ini-файл" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Удалить контрольные точки" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "У выбранного снимка нет контрольных точек." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Действительно удалить %lu контрольные точки?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Удалить контрольные точки" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Очистить контрольные точки" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Чистка контрольных точек" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Проверка попарно" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Проверка всего проекта" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Чистка завершена" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Удалить контрольные точки из облаков" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Сбросить настройки пользователя..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Сбросить расположение" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Сбросить параметры переноса" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Сбросить параметры объектива" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Сбросить фотометрические параметры" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Новая стопка" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Сменить стопку..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Введите новый номер стопки" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "Номер стопки" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Изменить номер стопки" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Задать размер стопки..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Качество:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3338,64 +3409,64 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Равновеликая азимутальная проекция Ламберта" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "ширина должна быть переменной больше 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "высота должна быть переменной больше 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "левая граница должна быть меньше, чем правая." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "верхняя граница должна быть меньше, чем нижняя." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "Доступ к параметрам PTmender пока не реализован" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Доступ к параметрам PTblender пока не реализован" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "" "Параметры для этой программы объединения в HDR пока что не реализованы." -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Не удалось создать временный проектный файл" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Укажите префикс выводимого файла" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "Сбросить настройки пользователя..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3410,7 +3481,7 @@ "Уменьшите размер полотна на панели сшивки или выберите в качестве выходного " "формата TIF или PNG." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3425,7 +3496,7 @@ "такого размера может занять много времени и потребовать большого объема " "памяти." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3433,26 +3504,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Вы уверены, что хотите собрать такую большую панораму?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Всё равно собрать" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Давайте исправим" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3484,121 +3555,139 @@ msgid "Miscellaneous" msgstr "Разное" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Системный" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Basque" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Каталонский" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Китайский (упрощённый)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Китайский (Традиционный)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Чешский" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Датский" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Голландский" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Английский" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Французский" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Немецкий" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Венгерский" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Итальянский" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Японский" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Польский" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Португальский (Бразилия)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Русский" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Словацкий" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Испанский" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Шведский" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Финский" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Укажите исполняемый файл Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Исполняемые файлы (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Укажите исполняемый файл Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Выделить все" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Выберите PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Выделить все" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Выберите файл конфигурации ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Файлы конфигурации ExifTool (*.arg)|*.arg|Все файлы (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3607,14 +3696,14 @@ "Файл %s не существует.\n" "Создать файл конфигурации со значениями по умолчанию?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Файл конфигурации Exiftool" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3622,47 +3711,48 @@ "Файл не выбран.\n" "Создать файл конфигурации со значениями по умолчанию?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Выберите новый файл конфигурации ExifTool" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Не удалось сохранить файл \"%s\"." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Действительно сбросить эти параметры до исходных?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "По &умолчанию" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Сначала выберите профиль" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Выберите профиль" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3670,31 +3760,31 @@ "Невозможно удалить последний профиль.\n" "Для работы программы нужен хотя бы один." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Вы действительно хотите удалить предварительные настройки определителя " "контрольных точек \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Удаление определителя контрольных точек" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Загрузить настройки определителя контрольных точек" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Настройки определителя контрольных точек (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Сохранить настройки определителя контрольных точек" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3722,50 +3812,55 @@ msgid "Remove %lu control points" msgstr "Удалить %lu контрольных точек" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Предпросмотр панорамы" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Параметры предпросмотра" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "Проекция (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Способ совмещения:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Вывод:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Сжатие:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Параметры проекции" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Щёлкните левой кнопкой мыши, чтобы определить новую центральную точку, " "щёлкните правой кнопкой, чтобы сместить точку к горизонту." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Отцентрируйте панораму левой кнопкой мыши, а правой установите горизонт." @@ -3785,7 +3880,7 @@ msgid "Click a connection to edit control points." msgstr "Щелкните соединяющую линию для редактирования контрольных точек" -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3793,29 +3888,116 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"\"%s\" не найден. Укажите правильное расположение в диалоге настройки Hugin." + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"\"%s\" не найден. Укажите правильное расположение в диалоге настройки Hugin." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Определяется: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Закрыть" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +#, fuzzy +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Следующий файл конфигурации будет использован для копирования тэгов " +"изпервого снимка в промежуточные снимки." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Каталог %s не существует" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Не удалось выставить переменную окружения PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Открыть обработчик задач" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Открывать PTBatcher, обработчик задач для файлов проекта Hugin" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "Открыть интерфейс калибровки объективов" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" "Запускает Calibrate_lens_gui, простой графический интерфейс для калибровки " @@ -3832,11 +4014,11 @@ "Возможно, программа неправильно установлена, либо неправильно указан путь к " "ней." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "очистка временных файлов ключевых точек" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3845,15 +4027,15 @@ "Используйте %namefile, %i или %s,чтобы указать входные файлы для " "определителя контрольных точек" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Ошибка в команде определителя контрольных точек" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3865,14 +4047,14 @@ "Выберите меньше снимков или поместите их \n" "в каталог с более коротким именем пути" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Выбрано слишком много снимков" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3884,38 +4066,38 @@ "\n" "Не удалось выполнить команду: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "Ошибка wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "Поиск контрольных точек" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Не удалось выполнить команду: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3924,9 +4106,9 @@ "Выполнение команды %s\n" "не удалось. Код ошибки: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3942,13 +4124,13 @@ "\n" "Выполнявшаяся команда: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Ошибка определителя контрольных точек" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3956,7 +4138,7 @@ "Используйте %i, чтобы хадать входные файлы, и %k , чтобы определить файл с " "ключевыми точками для этапа генерации ключевых файлов" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3964,11 +4146,11 @@ "Используйте %k, чтобы определить файл ключевых точек, и %o , чтобы " "определить выходной файл проекта для шага подгонки" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "создаётся ключевой файл" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3982,11 +4164,11 @@ "\n" "Не удалось выполнить команду: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "по умолчанию" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -3994,256 +4176,256 @@ "Нельзя очистить список задач в процессе выполнения.\n" "Хотите отменить?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Задачи очищены." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Ошибка: не удалось получить статус, проект с индексом %d не находится в " "списке" -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Ошибка: не удалось загрузить файл задач" -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Задача успешно завершена." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Задача завершена с ошибками." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Инициализируется выключение..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Выключение..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Инициализируется выключение..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Инициализируется выключение..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Укажите файл проекта" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Префикс выводимых файлов не указан" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Проектный файл не был указан" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s — Сшивание" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s — Ассистент" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Ошибка при удалении, проекта с id %d в списке нет." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Ошибка: не удалось удалить проектный файл" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Выполняется задача..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI занимается сшивкой" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Задача уже выполняется." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Выполняется команда \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Сшивается: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Определяется: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Ошибка: не удалось установить статус, проект с индексом %d не находится в " "списке" -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Нет выполняемых операций" -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Вы нажали клавишу Command." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Вы нажали клавишу Control." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Пропустить загрузку очереди задач?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Ничего не делать" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Закрыть PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Выключить компьютер" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Укажите исполняемое консольное приложение:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Укажите приложение" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Укажите каталог, содержащий файлы проектов" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Укажите исходные файлы проектов" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Добавлены проекты из каталога %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Добавить проект %s в очередь на обработку." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Отправить проект %s в очередь ассистента." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Задача остановлена" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Процессор задач Hugin" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Укажите префикс выводимого проекта" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Префикс цели ассистента не может быть изменен." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Выберите проект" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Пожалуйста, выберите только один проект" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Укажите открываемый файл списка задач" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Файлы задач (*.ptb)|*.ptb|Все файлы (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Не удалось открыть приложение в Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Ни один проект не выбран. Запустить Hugin без проекта?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Задача приостановлена" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Продолжение задания..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4252,7 +4434,7 @@ "которые не удалось завершить.\n" "Удалить их заодно?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4260,16 +4442,16 @@ "Невозможно удалить проект, пока выполняется пакетная сборка.\n" "Вы хотите отменить пакетную сборку?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Удален проект %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Выберите удаляемый проект" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4277,16 +4459,16 @@ "Невозможно сбросить выполняемый проект.\n" "Отменить его выполнение?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Сбросить проект %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Выберите сбрасываемый проект" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4294,30 +4476,30 @@ "Невозможно сбросить выполняемые проекты.\n" "Отменить задачу?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Укажите файл задач для сохраниения" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Файл задач (*.ptb)|*.ptb|Все файлы (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Очистить очередь заданий" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Сохранять очередь заданий" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Старт задания" @@ -4353,7 +4535,7 @@ msgid "E&xit" msgstr "В&ыход" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4363,11 +4545,11 @@ "Если вы закроете диалог, вы их потеряете.\n" "Продолжить?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Принято" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4377,11 +4559,11 @@ "Если вы закроете диалог, они будут проигнорированы.\n" "Вы все еще хотите продолжить?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Стоп" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4390,7 +4572,7 @@ "Каталог %s не существует.\n" "Укажите существующий каталог." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4398,7 +4580,7 @@ "Вы не выбрали панораму.\n" "Выберите по крайней мере одну панораму и попробуйте еще раз." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4408,141 +4590,143 @@ "Возможно, у вас нет прав на запись в эти каталоги,\n" "либо закончилось пространство на жёстком диске." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Удалить снимок из проекта" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Расщепить здесь на две панорамы" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Читается файл %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Запустить" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Найдено возможных панорам: %d" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Возможных панорам не найдено." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d снимков: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "" "Обнаружена синтаксическая ошибка в параметрах, выполнение операции " "прерывается." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI запущен" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Ожидание" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "В процессе" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Завершено" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Неудача" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Файл отсутствует" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Пауза" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Проект" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Префикс вывода" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Статус" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Последнее изменение" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Формат вывода" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Проекция" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Размер" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Ошибка, невозможно преобразовать id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Ассистент" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Сменить префикс" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Создать новый проект" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Изменить в Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Удалить" @@ -4578,16 +4762,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Файлы журналов (*.log)|*.log|Все файлы (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Не удалось прочитать проектный файл %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Укажите исходный файл проекта" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4597,7 +4781,7 @@ "Hugin не может работать с этим именем. Введите корректное имя файла." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "О Hugin" @@ -4630,19 +4814,19 @@ msgstr "Система" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "ОК" @@ -4720,8 +4904,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Выберите..." @@ -4812,7 +4999,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Опции" @@ -4844,10 +5031,6 @@ msgid "Send selected panoramas to queue" msgstr "Отправить выбранные панорамы в очередь" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Закрыть" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Ищутся панорамы" @@ -4941,12 +5124,12 @@ msgstr "&Убрать в трей" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "В&ыход" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Выход" @@ -5051,143 +5234,38 @@ msgid "adddir" msgstr "добавить каталог" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "предыдущая пара снимков" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Описание:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "следующая пара снимков" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Тип:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "режим:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Все снимки сразу" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "вертикальная линия" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Панорама со стопками" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "горизонтальная линия" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Многорядная панорама" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Масштаб:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Многорядная панорама со стопками" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "вместить в окно" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Предварительно выровненная панорама" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Точно скорректировать" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Пытается оптимизировать текущую активную точку" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" -msgstr "&Автоматическая точная коррекция" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 -msgid "auto add" -msgstr "автодобавление" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 -msgid "immediately add control point when selecting a second point" -msgstr "немедленно добавляет контрольную точку при выборе второй точки" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 -msgid "auto-estimate" -msgstr "автооценка смещения" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 -msgid "" -"tries to estimate the shift between the images and use it while placing " -"control points" -msgstr "" -"пытается оценить смещение между снимками и использовать результат при " -"расположении контрольных точек" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 -msgid "&Delete" -msgstr "&Удалить" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 -msgid "&Add" -msgstr "&Добавить" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 -msgid "add a new Point" -msgstr "добавить новую точку" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 -msgid "Create control points for current image pair" -msgstr "Создать контрольные точки для текущей пары снимков" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 -msgid "Remove control points in clouds" -msgstr "Удалить контрольные точки из облаков" - -#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 -msgid "Remove worst control points" -msgstr "Удалить наихудшие контрольные точки" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 -msgid "Control Points" -msgstr "Контрольные точки" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:17 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 -msgid "Delete" -msgstr "Удалить" - -#: hugin1/hugin/xrc/cp_list_frame.xrc:24 -msgid "Select by Distance" -msgstr "Выбрать по расстоянию" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Описание:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Тип:" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (автор - A. Jenny)" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Все снимки сразу" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Панорама со стопками" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Многорядная панорама" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Многорядная панорама со стопками" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Предварительно выровненная панорама" - -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Определитель" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Определитель" #: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 msgid "One step detector" @@ -5266,10 +5344,127 @@ msgid "Parameters for Control Point Detectors" msgstr "Параметры определителя контрольных точек" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "предыдущая пара снимков" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "следующая пара снимков" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "режим:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "вертикальная линия" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "горизонтальная линия" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Масштаб:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "вместить в окно" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Точно скорректировать" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Пытается оптимизировать текущую активную точку" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" +msgstr "&Автоматическая точная коррекция" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:267 +msgid "auto add" +msgstr "автодобавление" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:268 +msgid "immediately add control point when selecting a second point" +msgstr "немедленно добавляет контрольную точку при выборе второй точки" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:274 +msgid "auto-estimate" +msgstr "автооценка смещения" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:275 +msgid "" +"tries to estimate the shift between the images and use it while placing " +"control points" +msgstr "" +"пытается оценить смещение между снимками и использовать результат при " +"расположении контрольных точек" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:288 +msgid "&Delete" +msgstr "&Удалить" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:295 +msgid "&Add" +msgstr "&Добавить" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:296 +msgid "add a new Point" +msgstr "добавить новую точку" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:324 +msgid "Create control points for current image pair" +msgstr "Создать контрольные точки для текущей пары снимков" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:329 +msgid "Remove control points in clouds" +msgstr "Удалить контрольные точки из облаков" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:336 +msgid "Remove worst control points" +msgstr "Удалить наихудшие контрольные точки" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:4 hugin1/hugin/xrc/main_frame.xrc:30 +msgid "Control Points" +msgstr "Контрольные точки" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:17 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:758 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 +msgid "Delete" +msgstr "Удалить" + +#: hugin1/hugin/xrc/cp_list_frame.xrc:24 +msgid "Select by Distance" +msgstr "Выбрать по расстоянию" + +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" msgstr "Недопустимые имена файлов" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" + +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Да" + +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Нет" + #: hugin1/hugin/xrc/edit_script_dialog.xrc:4 msgid "Edit Panorama Tools Script" msgstr "Изменить сценарий Panorama Tools" @@ -5282,26 +5477,153 @@ "Это сценарий, передаваемый «движку» Panorama Tools. Правка этих строк для " "продвинутых." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Продолжить с этими изменениями" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Продолжить с этими изменениями" + +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Отказаться от изменений и отменить" + +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Группировать по:" + +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Минимальное перекрытие:" + +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "Минимальное перекрытие для определения выходной стопки" + +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Максимальная разница EV:" + +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Максимальная разница EV для определения результирующих слоев" + +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Показать" + +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Общие" + +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "Информация EXIF" + +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Расположение" + +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Параметры объектива" + +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Фотометрические параметры" + +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Тип объектива" + +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Добавить снимки..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Тип объектива:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Множитель фокусного расстояния:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Сопоставление свойств" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Параметры:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "" +"Запустить выбранный определитель контрольных точек на выбранных снимках" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Оптимизация" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Геометрическая:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Вычислить" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Фотометрическая:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Выберите снимок" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Загрузить данные объектива..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "Введите значение ГорПЗ, либо фокусного расстояния и кроп-фактора:" + +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "ГорПЗ (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Отказаться от изменений и отменить" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "градусов" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Данные камеры и объектива" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Вокруг вертикали:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Наклон горизонта:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Вокруг оптической оси:" @@ -5309,34 +5631,11 @@ msgid "Translation parameter" msgstr "Параметр переноса" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Расположение" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "угол обзора:" @@ -5436,7 +5735,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Справка" @@ -5476,8 +5775,8 @@ msgstr "Загрузить" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Сохранить" @@ -5490,120 +5789,47 @@ msgid "Manipulate image variables" msgstr "Редактировать переменные снимка..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Группировать по:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Минимальное перекрытие:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Минимальное перекрытие для определения выходной стопки" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Максимальная разница EV:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Максимальная разница EV для определения результирующих слоев" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Показать" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Общие" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "Информация EXIF" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Параметры объектива" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Фотометрические параметры" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Тип объектива" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Добавить снимки..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Тип объектива:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Множитель фокусного расстояния:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Сопоставление свойств" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Параметры:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +#, fuzzy +msgid "WB reference:" +msgstr "Н&астройки" -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -"Запустить выбранный определитель контрольных точек на выбранных снимках" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Оптимизация" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Геометрическая:" - -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Вычислить" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Фотометрическая:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "Дополнительные аргументы:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Выберите снимок" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Загрузить данные объектива..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "Обработка:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "Введите значение ГорПЗ, либо фокусного расстояния и кроп-фактора:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "ГорПЗ (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "градусов" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Данные камеры и объектива" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Импорт" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5749,14 +5975,6 @@ msgid "Don't ask again" msgstr "Больше не спрашивать" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Да" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Нет" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5813,21 +6031,21 @@ msgid "Import positions from Papywizard XML" msgstr "Импортировать расположение из XML-файла Papywizard" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "О&тменить" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Отменить последнее действие" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Вернуть" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Вернуть последнее действие" @@ -5870,12 +6088,12 @@ msgid "Use only normal control points in optimization." msgstr "При оптимизации, использовать только нормальные контрольные точки." -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Оптимизировать" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Повторно запустить оптимизатор с текущими параметрами" @@ -5904,16 +6122,16 @@ msgid "Run a python script" msgstr "Запустить скрипт python" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Вид" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Полноэкранный режим" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Показать основное окно Hugin на весь экран" @@ -5995,22 +6213,22 @@ msgid "Show the Stitcher panel" msgstr "Показывать панель «Сборка»" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "Простой" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Продвинутый" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "Эксперт" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "&Интерфейс" @@ -6031,86 +6249,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Некоторая информация о разных кнопках и пр." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "С&овет дня" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Показать один из советов дня" -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Горячие клавиши" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "горячие клавиши" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Часто задаваемые вопросы" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&О программе..." #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "Н&астройки" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Новый" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Создать новый проект" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Открыть" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Открыть проект" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Сохранить" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Сохранить файл текущего проекта" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Сохранить &как" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Сохранить текущий проект в новый файл" @@ -6126,19 +6344,19 @@ "Записать текущий проект в файл PTStitcher-сценария, полезный для выполнения " "задачи" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Недавние проекты" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Список недавних файлов проектов" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Запустить обработчик задач" @@ -6223,7 +6441,7 @@ msgid "Show the OpenGL preview image" msgstr "Показать OpenGL предпросмотр снимка" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Просмотреть панораму" @@ -6280,15 +6498,10 @@ msgstr "Исключенная область из всех снимков этого объектива" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Экспорт" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Импорт" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Копировать" @@ -6333,8 +6546,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6439,7 +6652,8 @@ msgid "execute the PTOptimizer engine" msgstr "запустить движок PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Ориентация снимка" @@ -6484,39 +6698,39 @@ msgid "Interpolator (i):" msgstr "Интерполятор (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Бикубический)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Сплайн 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Сплайн 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Сплайн 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Билинейный" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Ближайший сосед" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "Аппроксимация значений между исходными пикселами" @@ -6545,7 +6759,7 @@ msgid "Enfuse options" msgstr "Опции Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Поле зрения:" @@ -6707,10 +6921,6 @@ msgid "Image fusion:" msgstr "Сведение снимков:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR слияние:" @@ -6814,16 +7024,16 @@ msgid "Output parameters" msgstr "Выходные параметры" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Способ совмещения:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "ошибка enblend" @@ -6894,27 +7104,43 @@ msgid "This affects the control points editor and mask editor." msgstr "Удалить все контрольные точки из областей под масками." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Исполняемый файл Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(оставить пустым для ОС по умолчанию)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Исполняемый файл Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Исполняемый файл Enblend:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Файл опций" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Временный каталог:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(оставить пустым для ОС по умолчанию)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Имя файла проекта по умолчанию:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Префикс выводимого файла по умолчанию:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6945,43 +7171,43 @@ "%lens - объектив (первого снимка)\n" "%projectname - имя файла проекта (только для префикса выходного файла)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Имена файлов по умолчанию" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Имена файлов" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Загрузка снимка" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Автоматически объединить снимки после их загрузки" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Определить вертикальные линии" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Определить вертикальные линии на снимке для уровня панорамы" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Удалять контрольные точки, похожие на облака (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Опциональные шаги ассистента" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Автовыравнивание" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -6989,67 +7215,67 @@ "Количество точек\n" "на перекрытие" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Уменьшить конечную панораму до" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "% от макс. ширины" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Редактор контрольных точек" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR и 16-разрядный показ" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Кривая" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "линейная" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "логарифмическая" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "гамма 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "использовано для показа в GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Ширина заплатки:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "пикселов" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Ширина области поиска:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "% от ширины снимка" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Ширина местной области поиска:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Порог корреляции:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7057,11 +7283,11 @@ "0: не похожи\n" "1: максимально похожи" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Порог пиковой кривизны:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7069,116 +7295,112 @@ "0: без пика\n" "0.2: характерный пик" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Круговой поиск" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Включить круговой поиск (медленнее, но точнее)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Начальный угол:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Конечный угол:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Шагов:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Определение контрольных точек" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Программы для нахождения контрольных точек" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Новый..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Изменить..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Поднять" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Опустить" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Назначить по умолчанию" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Ассистент использует параметры по умолчанию." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Формат вывода" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Формат файла по умолчанию:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "формат по умолчанию для результирующей панорамы" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "Сжатие TIFF:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "сжатие TIFF по умолчанию" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "Качество JPEG:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "сжатие JPEG по умолчанию" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Совмещение" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Совмещение по умолчанию:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Обаботчик" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&сборка&проект" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Движок, который будет использован для сборки" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Запускать процессы сборки немедленно" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7188,19 +7410,19 @@ "из очереди. В противном случае, обработчик будет запускаться в состоянии " "ожидания и пользователь должен будет запустить процесс сборки вручную." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Перезаписать существующие файлы" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "ВНИМАНИЕ: существующие файлы будут перезаписаны без предупреждения." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Подробный вывод" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7208,19 +7430,19 @@ "Включите для получения деталей, полезно при отсылке сообщения об ошибке или " "для отслеживания хода проекта." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Сборка" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Копировать метаданные в полученные файлы с помощью ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Опции ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7234,7 +7456,7 @@ "Чтобы создать пример файла конфигурации, оставьте текстовые поля пустыми и " "нажмите \"Редактировать...\"" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7242,19 +7464,19 @@ "Следующий файл конфигурации будет использован для копирования тэгов " "изпервого снимка в промежуточные снимки." -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Промежуточный файл конфигурации ExifTool:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Оставить пустым для значания по умолчанию" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Редактировать выбранный файл конфигурации ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7265,27 +7487,27 @@ "Он применяетсся в дополнение к указанному выше файлу для промежуточных " "снимков." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Окончательный файл конфигурации ExifTool:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Дополнительные опциии" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Число потоков:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7297,47 +7519,49 @@ "Установите это значение равным количеству процессоров или ядер процессора " "вашего компьютера." -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 для автоматического определения" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Сшивание (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Интерполятор по умолчанию (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "По умолчанию создавать скадрированные снимки" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Использовать GPU для переделки (ЭКСПЕРИМЕНТАЛЬНО)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" +msgstr "Использовать GPU для переделки:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Использовать процессор видеокарты для ускорения пересчета" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Использовать замену программе Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Исполняемый файл Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Аргументы по умолчанию:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Это аргументы, используемые по умолчанию для новых проектов. Их можно менять " "для каждого отдельно взятого\n" @@ -7345,35 +7569,35 @@ "compression, они \n" "указываются программой Hugin." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Использовать замену программе Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Исполняемый файл Enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Программы" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Параметры Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Порог SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7381,19 +7605,19 @@ "больше 0.5: меньшая чувствительность\n" "меньше 0.5: большая чувствительность" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Фильтр Габора:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "малый" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "большой" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7401,7 +7625,7 @@ "большой аккуратнее\n" "малый исследует точки близко к краю снимка" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7411,57 +7635,57 @@ "цветовых значений в перекрывающихся областях.\n" "Для ускорения вычислений используется только случайное подмножество точек." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Число точек на снимок:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Фотометрическая оптимизация" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Предупреждения" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Показать сообщение о сохранении файла проекта и его префикс" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" "Показывать сообщение о большой разнице экспозиций при добавлении снимков" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "После инструмента \"редактировать КТ\"" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Спросить пользователя" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Перезапустить оптимизацию панорамы" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Не оптимизировать панораму" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "Подсказки показываются только в окне быстрого предпросмотра" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Разное" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Настройки - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 #, fuzzy msgid "" "This argfile is called with command line\n" @@ -7470,11 +7694,11 @@ "Этот файл конфигурации используется со следующей командой\n" "\"exiftool -overwrite&original -tagsfromfile image -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Редактировать файл конфигурации ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 #, fuzzy msgid "" "This argfile is called with command line\n" @@ -7483,7 +7707,7 @@ "Этот файл конфигурации используется со следующей командой\n" "\"exiftool -overwrite&original -tagsfromfile image -E -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 #, fuzzy msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" @@ -7520,11 +7744,11 @@ "\n" "Шаблоны являются регистрозависимыми." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Центрировать предпросмотр по горизонтали" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "По центру" @@ -7532,13 +7756,15 @@ msgid "Show the whole panorama" msgstr "Показать панораму целиком" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Расчитанное поле зрения" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Уместить" @@ -7546,7 +7772,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Автоматически выпрямить волнистый горизонт" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Выпрямить" @@ -7644,32 +7871,32 @@ msgstr "" "Устанавливает значение экспозиции панорамы к среднему для всех снимков." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Выбор серого" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Исправьте глобальный баланс белого, выбрав нейтрально-серую область." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "&Правка" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Создать или удалить контрольные точки в выбранном прямоугольнике." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Фон:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Масштаб:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7682,162 +7909,150 @@ "выравнивание.\n" "* Щелкните строку для редактирования контрольных точек на связанных снимках." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Размещение" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Направляющие:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Правило третей" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Золотое сечение" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Диагональ" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Метод диагонали" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Золотой треугольник (вниз)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Золотой треугольник (вверх)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Автоматически выпрямить волнистый горизонт." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Режим перемещения:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Применить" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Переместить панораму или перетащить снимки на новое место" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Сдвиг/Смещение" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Установить область обрезки в самый большой прямоугольник, покрытый снимками" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR Автообрезка" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Установить область обрезки в самый большой прямоугольник, покрытый стопками " "снимков" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "слева:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "сверху:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "справа:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "снизу:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Сброс обрезки до максимально возможной области\"" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Изменить область обрезки панорамы" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Редактор панорамы" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&Обзор" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Показать обзор сферы панорамы." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Сетка" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Показать сетку." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Все снимки" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Снимок со средней экспозицией для каждой стопки" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Самый яркий снимок из каждой стопки" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Самый темный снимок из каждой стопки" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "Оставить текущее выделение снимков" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Сбросить выделение" @@ -8062,8 +8277,8 @@ "You can press the middle mouse button to pan images in the Control Points " "tab." msgstr "" -"Соединять снимки во вкладке «Контрольные точки» можно нажатием средней " -"кнопки мыши." +"Соединять снимки во вкладке «Контрольные точки» можно нажатием средней кнопки " +"мыши." #: hugin1/hugin/xrc/data/tips.txt:27 msgid "The \"f\" key is the shortcut for Fine Tune button." @@ -8146,6 +8361,78 @@ "объединяются сильно пересекающиеся снимки с заметно удалёнными друг от друга " "контрольными точками." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "Н&астройки" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "&Снимки" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Добавить снимки..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Добавить ещё один снимок в текущий проект" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Удалить этот снимок" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Удалить выбранные снимки" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Масштаб определения углов" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "Добавить проект..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Переместить панораму или перетащить снимки на новое место" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Изменить область обрезки панорамы" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Использовать GPU для переделки (ЭКСПЕРИМЕНТАЛЬНО)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Все файлы снимков|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;" +#~ "*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;" +#~ "*.EXR|Файлы JPEG (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Файлы TIFF (*." +#~ "tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Файлы PNG (*.png)|*.png;*.PNG|Файлы " +#~ "HDR (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|Все файлы (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (автор - A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&сборка&проект" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "Интерфейс" @@ -9093,9 +9380,9 @@ #~ "Enblend can be used to smoothly blend the panorama. Use it from within " #~ "hugin by selecting \"high quality tiff file\" as output." #~ msgstr "" -#~ "Enblend может использоваться для гладкого «сведения» панорамы. " -#~ "Используйте эту программу прямо из Hugin, выбрав тип вывода «Файл TIFF с " -#~ "высоким качеством»." +#~ "Enblend может использоваться для гладкого «сведения» панорамы. Используйте " +#~ "эту программу прямо из Hugin, выбрав тип вывода «Файл TIFF с высоким " +#~ "качеством»." #~ msgid "Anchor Image" #~ msgstr "Зафиксировать снимок" @@ -9135,9 +9422,6 @@ #~ msgid "Flatfield" #~ msgstr "Плоский снимок" -#~ msgid "Image file:" -#~ msgstr "Файл снимка:" - #~ msgid "Polynomial" #~ msgstr "Многочленный" @@ -9361,10 +9645,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "Добавить проект..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9462,11 +9742,6 @@ #~ "Autopano-SIFT не найден. Укажите корректное расположение программы в " #~ "диалоге настройки." -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "" -#~ "\"%s\" не найден. Укажите правильное расположение в диалоге настройки " -#~ "Hugin." - #~ msgid "Error in Autopano command" #~ msgstr "Ошибка в команде автопанорамирования" @@ -9555,9 +9830,6 @@ #~ msgid "PTStitcher note" #~ msgstr "Сообщение от PTStitcher" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Выберите PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "PTStitcher.exe не выбран" @@ -9761,9 +10033,6 @@ #~ msgid "Please use either %namefile or %i in the autopano-sift command line." #~ msgstr "Введите либо %namefile, либо %i в строку для команды autopano-sift" -#~ msgid "Remove this image" -#~ msgstr "Удалить этот снимок" - #~ msgid "Stitching Options" #~ msgstr "Параметры сшивки" @@ -9812,9 +10081,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend:" -#~ msgid "Additional Arguments:" -#~ msgstr "Дополнительные аргументы:" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "Не указывайте ключи -w и -o, они уже используются" diff -Nru hugin-2018.0.0+dfsg/src/translations/sk.po hugin-2019.0.0+dfsg/src/translations/sk.po --- hugin-2018.0.0+dfsg/src/translations/sk.po 2018-01-13 07:52:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/sk.po 2019-02-21 18:03:16.000000000 +0000 @@ -2,21 +2,21 @@ # Copyright (C) YEAR Pablo dAngelo # 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, 2017. +# Jozef Riha , 2006-2011. +# Kornel Benko , 2013-2018. msgid "" msgstr "" "Project-Id-Version: hugin\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" -"PO-Revision-Date: 2017-12-06 20:27+0000\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" +"PO-Revision-Date: 2019-02-21 17:09+0000\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"Language: sk\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" "X-Poedit-Language: Slovak\n" "X-Poedit-Country: SLOVAKIA\n" @@ -49,16 +49,16 @@ msgid "Searching for best crop..." msgstr "Vyhľadávam najlepšie orezanie..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Externý program %s nebol nájdený v sade dodávanej s programom, vraciam sa k " "systémovej ceste" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -85,9 +85,9 @@ msgstr "Bitmapa (*.bmp)|*.bmp|PNG-File (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Súbor %s existuje. Prepísať?" @@ -124,7 +124,7 @@ msgstr "Faktor orezania musí byť kladné číslo." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -137,24 +137,28 @@ "Ozaj chcete použiť takú vysokú hodnotu?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -175,8 +179,8 @@ msgstr "Plnoformátové rybie oko" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Skoroobdĺžniková" @@ -207,11 +211,13 @@ msgid "builtin" msgstr "zabudovaný" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "Vlastný (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Lineárny" @@ -235,16 +241,16 @@ msgid "Error loading lens parameters" msgstr "Chyba počas načítania parametrov šošovky" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Uložiť súbor s parametrami šošovky" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Súbory s projektami šošovky (*.ini)|*.ini|Všetky súbory (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Uložiť projekt" @@ -280,22 +286,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Chyba pri pozastavovaní procesu %ld, kód 1" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Zrušiť" @@ -329,12 +336,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Nepodarilo sa otvoriť súbor s projektom:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "nepodarilo sa otvoriť skript: %s" @@ -344,8 +351,8 @@ msgid "Project %s does not contain any active images." msgstr "Projekt %s neobsahuje žiadne aktívne obrázky." -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "chyba počas analýzy panotools skriptu: %s" @@ -359,17 +366,17 @@ msgid "Could not create temporary file" msgstr "Nemožno vytvoriť dočasný súbor" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "Front je prázdny. To by sa nikdy stať nemalo." -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Chyba počas lepenia" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -377,11 +384,11 @@ "Prepísať existujúce súbory?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Prepísať existujúce obrázky" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -390,12 +397,12 @@ "Chyba pri lepení projektu\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Chyba počas spúšťania asistenta" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -404,272 +411,282 @@ "Chyba počas spúšťania asistenta\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 msgid "Stitching panorama..." msgstr "Lepím panorámu..." -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "System (OS):" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 msgid "Version:" msgstr "Verzia:" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 msgid "Working directory:" msgstr "Pracovný adresár:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 msgid "Output prefix:" msgstr "Predpona pre výstup:" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Miešač:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "Neznámi miešač (enblend --version zlyhal)" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 msgid "internal" msgstr "Interné" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Exposure fusion:" msgstr "Expozičné splynutie:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "Neznámy program na expozičné splynutie (enfuse --version zlyhal)" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 msgid "ExifTool version:" msgstr "Exiftool verzia:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "ExifTool:" msgstr "Exiftool:" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "ZLYHAL" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 msgid "Number of active images:" msgstr "Počet aktívnych obrázkov:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, c-format msgid "Output exposure value: %.1f" msgstr "Výstupná hodnota expozície %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, c-format msgid "Canvas size: %dx%d" msgstr "Veľkosť plátna: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "ROI: (%d, %d) - (%d, %d)" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "FOV: %.0fx%.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projekcia:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "Using GPU for remapping:" msgstr "Použiť grafický čip na premapovanie:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "áno" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "nie" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panoramatický výstup:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Expozícia upravená, nízky dynamický rozsah" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Expozičné splynutie zo štósov" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Expozícia splynútená z akéhokoľvek rozloženia" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Vysoký dynamický rozsah" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Premapované obrázky:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Bez korekcie expozície, nízky dynamický rozsah" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Kombinované štósy:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "Štósy splynútené podľa expozície" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Vrstvy:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Zmiešané vrstvy s podobnou expozíciou, bez korekcie expozície" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 msgid "First input image" msgstr "Prvý vstupný obrázok" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 msgid "Number:" msgstr "Číslo:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Názov súboru:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, c-format msgid "Size: %dx%d" msgstr "Rozmer: %dx%d" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 msgid "Response type:" msgstr "Typ odozvy:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "HFOV: %.0f" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, c-format msgid "Exposure value: %.1f" msgstr "Hodnota expozície: %.1f" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "Premapovanie a miešanie LDR obrázkov..." -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 msgid "Remapping LDR images..." msgstr "Premapovanie LDR obrázkov..." -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 msgid "Blending images..." msgstr "Miešanie obrázkov..." -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "Premapovanie LDR obrázkov a miešanie expozičných vrstiev..." -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 msgid "Remapping LDR images without exposure correction..." msgstr "Premapovanie LDR obrázkov bez expozičnej korekcie..." -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, c-format msgid "Blending exposure layer %u..." msgstr "Miešanie expozičnej vrstvy %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "Splynutie všetkých expozičných vrstiev..." -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, c-format msgid "Fusing stack number %u..." msgstr "Splynutie štósu číslo %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "Miešanie všetkých štósov..." -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 msgid "Remapping HDR images..." msgstr "Premapovanie HDR obrázkov..." -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, c-format msgid "Merging HDR stack number %u..." msgstr "Zlúčenie hdr štósu číslo %u..." -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "Miešanie hdr štósov..." -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "Aktualizovanie metadát..." -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, c-format msgid "Stitching using \"%s\"" msgstr "Lepím používaním \"%s\"" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "Prvý obrázok" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "Posledný obrázok" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "adresár" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "Výrobca kamery" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "Model kamery" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -677,35 +694,67 @@ msgid "Lens" msgstr "Šošovka" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "Neznáma projekcia" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +msgid "All Image files" +msgstr "Všetky obrázkové súbory" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "JPEG súbory (*.jpg,*.jpeg)" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "TIFF súbory (*.tif,*.tiff)" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "PNG súbory (*.png)" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "HDR súbory (*.hdr)" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "EXR súbory (*.exr)" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "Všetky súbory (*)" + +#: hugin1/base_wx/platform.cpp:93 +msgid "Raw files" +msgstr "RAW súbory" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Chyba" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -716,26 +765,11 @@ "Hugin nedokáže pracovať s takýmito názvami súborov. Prosím premenujte vaše " "súbory a skúste to znovu." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "Ladiace správy generované v \"%s\"." -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Všetky súbory obrázkov|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*." -"png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff,*.hdr;*.HDR;*.exr;" -"*.EXR|JPEG súbory (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Súbory TIFF (*." -"tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Súbory PNG (*.png)|(*.png)|*.png;*.PNG|" -"Súbory HDR (*.hdr)|*.hdr;*.HDR|Súbory EXR (*.exr)|*.exr;*.EXR|Všetky súbory " -"(*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, c-format msgid "Camera %s (%s)" @@ -747,27 +781,27 @@ msgstr "Vstup \"%s\" nie je platné číslo." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Varovanie" @@ -784,7 +818,7 @@ msgid "Could not save information into database." msgstr "Nepodarilo sa uložiť informáciu do databázy." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -795,11 +829,11 @@ "%s\n" "Zrušiť" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Nepodporovaný súborový formát obrázku" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -811,7 +845,7 @@ "Hugin tento typ nepodporuje. Obraz sa preskakuje.\n" "Preveďte to na šedý obrázok a skúste to nahrať znovu." -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -827,27 +861,27 @@ "Hugin tento typ nepodporuje. Obraz sa preskakuje.\n" "Preveďte to na šedý alebo RGB obrázok a skúste to nahrať znovu." -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" "Hugin podporuje len šedé alebo RGB obrázky (bez alebo s alpha kanálom)." -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "Súbor \"%s\" je šedý obrázok, ale iné obrázky v projekte sú farebné." -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "Súbor \"%s\" farebný obrázok, ale iné obrázky v projekte sú šedé." -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 msgid "" "Hugin does not support this mixing. Skipping this image.\n" "Convert this image to grayscale or RGB image respectively and try loading " @@ -856,7 +890,7 @@ "Hugin nepodporuje také miešanie. Obraz sa preskakuje.\n" "Preveďte to na šedý alebo farebný obrázok a skúste to nahrať znovu." -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " @@ -865,7 +899,7 @@ "Súbor \"%s\" neobsahuje icc profil, ale iné obrázky v projekte obsahujú " "profil \"%s\"." -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -874,7 +908,7 @@ "Súbor \"%s\" obsahuje icc profil \"%s\", ale iné obrázky v projekte " "neobsahujú žiadny profil pre farbu." -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " @@ -883,7 +917,7 @@ "Súbor \"%s\" obsahuje profil \"%s\", ale iné obrázky v projekte obsahujú " "žiadny \"%s\" profil pre farbu." -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." @@ -891,7 +925,7 @@ "Hugin očakáva že všetky obrázky obsahujú ten istý profil.\n" "Prosím preveďte všetky obrázky to na ten istý profil a skúste znovu." -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." @@ -899,7 +933,7 @@ "Hugin má štósy obrázkov objavené v pridaných obrázkoch a priradí im " "príslušné číslo štósu." -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " @@ -908,11 +942,11 @@ "Hugin má štósy obrázkov objavené v celkovom projekte. Čísla štósov budú " "priradené na základe tejto detekcie. Existujúce číslovanie štósov sa zmení." -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "Mali by sa spojiť pozície v každom štóse obrázkov?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -923,25 +957,25 @@ "štóse môžu spojiť. To pomáha Huginovi spracovať panorámu. Nespájajte keď " "štósy potrebujú jemné ladenie pozície (napr. keď sa fotografuje z ruky)." -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 msgid "Link position" msgstr "Spojiť pozíciu" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 msgid "Don't link position" msgstr "Nespájať pozíciu" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "Nepriraďovať štósy" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 msgid "Keep existing stacks" msgstr "Držať existujúce štósy" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" @@ -950,16 +984,16 @@ "Projektový súbor \"%s\" referuje obrázok \"%s\" ktorý tu nie je.\n" "Prosím vyberte manuálne správny obrázok." -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Obrázok nenájdený" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, c-format msgid "Select image %s" msgstr "Vyberte obrázok %s" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -970,16 +1004,17 @@ "\n" "Stlačte OK na ich odstránenie." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Detekovaná chyba" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Pridať obrázky" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -988,32 +1023,32 @@ "Chyba, šablóna očakáva %d obrázkov,\n" "aktuálny projekt obsahuje %d obrázkov\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Nepodarilo sa použiť šablónu" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Chyba pri načítaní súboru projektu" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Výsledok" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "adresár xrc nebol nájdený v balíku" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Fatálna chyba" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1045,7 +1080,7 @@ "EXIF informácia pridaných obrázkov (%s) nesúhlasí s už pridanými obrázkami.\n" "Skontrolujte, prosím, či ste vybrali správne obrázky." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Pridať obrázok: zrušiť" @@ -1058,9 +1093,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1077,7 +1112,7 @@ msgstr "Hľadám priamky..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Hotovo" @@ -1091,11 +1126,11 @@ "Prosím spusťte najprv \"Nájsť priamky\". Pokiaľ sa žiadna priamka nenájde, " "skúste zmeniť parametre." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimalizuj parametre skreslenia šošovky..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1105,142 +1140,142 @@ "Prosím spusťte najprv \"Nájsť priamky\" a \"Optimalizovať\" pred ukladaním " "dát šošovky. Pokiaľ sa žiadna priamka nenájde, skúste zmeniť parametre." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "Uložiť parametre šošovky do ini súboru" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 msgid "Save lens parameters to lens database" msgstr "Uložiť parametre šošovky databázy pre šošovku" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "Uložiť parametre šošovky" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Uložiť šošovku" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Uložiť súbor s projektom" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Súbory projektu (*.pto)|*.pto|Všetky súbory (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 msgid "Removing temporary files..." msgstr "Odstraňujem dočasné súbory..." -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "zobrazuje túto pomocnú správu" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 msgid "execute assistant" msgstr "Spustiť asistenta" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "Spustiť lepenie s daným projektom" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 msgid "number of used threads" msgstr "Počet použitých vlákien" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "predpona použitá na zlepenie" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "použite užívateľom definované príkazy v danom súbore" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "použite užívateľom definované príkazy asistenta v danom súbore" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 msgid "only print commands" msgstr "Len zobraziť príkazy" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Operačný systém: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bitov" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bitov" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Architektúra: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, c-format msgid "Free memory: %lld kiB" msgstr "Voľná pamäť: %lld kB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktívna kódová stránka: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Verzia: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Cesta ku zdrojom: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Cesta k dátam: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, c-format msgid "Hugins camera and lens database: %s" msgstr "Huginova databáza pre kamery a šošovky: %s" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "Viaccestné použitím C++11 std::thread a OpenMP" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, c-format msgid "Monitor profile: %s" msgstr "Dozerať profil: %s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "Knihovne" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano z http://autopano.kolor.com nie je k dispozícii pre OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Používam Autopano-Sift ako náhradu" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1248,85 +1283,91 @@ "Prinajmenšom jedno vstupné pole je prázdne.\n" "Skontrolujte, prosím, váš vstup." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Snažte sa prepojiť všetky prekrývajúce sa obrázky." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Funguje iba pre páry obrázkov bez kontrolných bodov." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Vyberte program na detekciu kontrolných bodov" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Spustiteľné (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "ľavá x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "ľavá y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "pravá x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "pravá y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Zarovnanie" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Vzdialenosť" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "pridaný nový kontrolný bod" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "vyhľadávam podobné body..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Chyba počas dolaďovania" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Bod doladený, uhol: %.0f°, korelačný koeficient: %0.3f, zakrivenie: %0.3f " -"%0.3f " +"Bod doladený, uhol: %.0f°, korelačný koeficient: %0.3f, zakrivenie: %0.3f %" +"0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "Zmeňte body alebo stlačte pravé tlačidlo pre pridanie dvojice" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Odhadovaný bod je mimo obrázok" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" +"Dištancia kontrolných bodou pre čiary je moc malá, preskakujem ladenie." + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Žiaden podobný bod nebol nájdený." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." @@ -1334,7 +1375,7 @@ "Zlá interná transformácia.\n" "Overte či bod je vnútri obrázku." -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1345,31 +1386,36 @@ "Koeficient korelácie (%.3f) je nižší ako je spodná hranica zadaná v " "nastaveniach." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "Pridať novú čiaru" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Čiara %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +msgid "Correlation" +msgstr "Korelácia" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normálne" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "vert. čiara" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "horiz. čiara" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1379,38 +1425,38 @@ "Pre vytvorenie menšieho počtu bodov,\n" "zadajte vyššie číslo." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Detekcia prahu rohu" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Vytvoriť kontrolné body" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Detekcia miery rohu" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Chyba počas vytvárania kontrolných bodov:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Vybrať bod v pravom obrázku" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Vybrať bod v ľavom obrázku" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "Vytvoriť kontrolné body (Aktuálne nastavené: %s)" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" @@ -1418,35 +1464,35 @@ "Nemôžem spustiť Celeste, ak nie je definovaný ani jeden kontrolný bod medzi " "obrázkami" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Spúšťam Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Nahrávam modelový súbor" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "Odstránených %lu kontrolných bodov" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Výsledok Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Čistím" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 msgid "Create cp" msgstr "Vytvoriť kontrolné body" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." @@ -1454,19 +1500,20 @@ "Vytvoriť kontrolné body pre dvojicu obrázkov s aktuálne vybraným detektorom " "kontrolných bodov na paneli Fotografie." -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Pokúsi sa odstrániť kontrolné body z oblakov" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 msgid "Clean cp" msgstr "Vyčistiť kontrolné body" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Odstrániť vzdialené kontrolné body pomocou štatistických metód" @@ -1478,23 +1525,23 @@ msgid "Could not process event!" msgstr "Nie je možné spracovať udalosť!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "Ľavý Obr." -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "Pravý Obr." -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1502,7 +1549,7 @@ "Zadajte minimálnu chybu kontrolného bodu.\n" "Všetky body s vyššou chybou budú vybrané" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Vyberte kontrolné body" @@ -1578,60 +1625,60 @@ "bude pohyb obmedzený). Pre klopenie ich uchopte pravým tlačidlom myši alebo " "použite ľavé s klávesom Ctrl." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Rýchly náhľad panorámy" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&Súbor" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "zobrazené obrázky" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Všetky" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Žiaden" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Skryť" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "ťahajte myšou pre zmenu vertikálneho zorného poľa" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "ťahajte myšou pre zmenu horizontálneho zorného poľa" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Náhľad" @@ -1639,143 +1686,148 @@ msgid "Overview" msgstr "Prehľad" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "Obnoví parametre projekcie na ich štandardné hodnoty." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "Nie sú nahrané žiadne obrázky." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu obrázkov načítaných." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Obrázky sú prepojené %lu kontrolnými bodmi.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "bolo nájdených %lu neprepojených skupín obrázkov: %s\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "Obrázky alebo kontrolné body sa zmenili, je potrebné nové zarovnanie." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Priemerná chyba po optimalizácii: %.1f pixlov, max: %.1f" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Obdĺžniková" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindrická" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Hodnota otočenia musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Hodnota sklonu musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Hodnota klopenia musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "Hodnota X musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Hodnota Y musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Hodnota Z musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Hodnota musí byť číselná." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "Hodnota kompresie je mimo platného rozsahu." + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" "But your project has non-zero Tpy and Tpp parameters.\n" "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -"Mód pre mozaiku/plochu funguje správne len pre premapovanú plochu s " -"otočením(yaw)=0 a sklonom(pitch)=0.\n" +"Mód pre mozaiku/plochu funguje správne len pre premapovanú plochu s otočením" +"(yaw)=0 a sklonom(pitch)=0.\n" "Ale váš projekt má nenulové parametre Tpy a Tpp.\n" "Nulovať Tpy a Tpp parametre?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "rozdiel" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Autoorez" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Počítam optimálny orez" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Vrch musí byť celé číslo väčšie než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "ľavá musí byť celé číslo väčšie než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "pravá musí byť celé číslo väčšie než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "spodok musí byť celé číslo väčšie než 0" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "ľavý okraj musí byť menší ako pravý" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "horný okraj musí byť menší ako spodný" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Nesprávna hodnota HFOV. Maximálna HFOV pre tento projekt je %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Nesprávna hodnota VFOV. Maximálna VFOV pre tento projekt je %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1783,7 +1835,7 @@ "So širokým zorným poľom sú panorámy s obdĺžnikovou projekciou veľmi " "natiahnuté smerom k okrajom.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1791,15 +1843,15 @@ "Pretože zorné pole je veľmi široké iba v horizontálnom smere, skúste radšej " "cylindrickú projekciu." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Pre veľmi širokú panorámu skúste radšej skoroobdĺžnikovú projekciu." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " Môžete tiež skúsiť Paniniho projekciu." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1811,7 +1863,7 @@ "Skoroobdĺžniková projekcia umiestni rovnaký obsah do menšieho vertikálneho " "priestoru." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1822,7 +1874,7 @@ "Cylindrická projekcia zachováva vertikálne čiary, narozdiel od " "skoroobdĺžnikovej." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1833,7 +1885,7 @@ "Konformná projekcia zachováva uhly okolo bodu, čím sa stáva často " "prirodzenejšia pre ľudský zrak." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1845,7 +1897,7 @@ "Projekcia Rybie oko ho zhutňuje, takže dokážete vmestiť široké zorné pole a " "stále zachovať slušné pokrytie stredu." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1853,7 +1905,7 @@ "Nastavenie panorámy na obdĺžnikovú projekciu zaistí, že rovné čiary ostanú " "rovnými." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1863,27 +1915,27 @@ "projekcie.\n" "Ak chcete opäť zobraziť tento panel, aktivujte ho v nastaveniach." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "bežné, individuálne" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mozaika" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mozaika, individuálne" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosféra" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mozaiková plocha" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1894,12 +1946,12 @@ "\n" "Re-optimalizovať teraz panorámu?" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "Aktuálna vybraná stratégia optimalizácie je \"%s\"." -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." @@ -1907,7 +1959,7 @@ "Vybraná oblasť neobsahuje žiadne aktívne obrázky.\n" "Vyberte prosím oblasť prekrytá najmenej dvoma obrázkami." -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." @@ -1915,7 +1967,7 @@ "Vybraná oblasť je prekrytá len jedným obrázkom.\n" "Nemôžem vytvoriť kontrolné body len v jednom obrázku." -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1929,27 +1981,27 @@ "\n" "Rozhodne pokračovať?" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 msgid "Searching control points" msgstr "Hľadať kontrolné body" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 msgid "Processing" msgstr "Spracovanie" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "Premapovať obrázok do projekcie panorámy..." -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 msgid "Matching interest points..." msgstr "Zodpovedajúce zaujímavé body..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 msgid "Checking results..." msgstr "Kontrolujem výsledky..." -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1960,7 +2012,7 @@ "\n" "Re-optimalizovať teraz panorámu?" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1968,7 +2020,7 @@ "Chyba počas inicializácie GLEW\n" "Okno rýchleho náhľadu sa nepodarilo otvoriť." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -2015,7 +2067,7 @@ msgstr "Počet masiek" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Orezať" @@ -2048,7 +2100,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "Maximálny rozdiel Ev musí byť väčší ako 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "Štósy" @@ -2225,7 +2277,7 @@ msgid "Shutter speed" msgstr "Rýchlosť závierky" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2373,94 +2425,94 @@ msgstr "Parametre odozvy kamery" # premiestnenie -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "neaktívne" # premiestnenie -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "aktívne" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "Šošovka %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "Štós %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "Výstupný štós %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "Výstupná vrstva expozície %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Pripojenie" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "Odpojiť" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "Vybrať všetko pre súčasnú šošovku" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "Zrušiť všetko pre súčasnú šošovku" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "Vybrať všetko pre súčasný štós" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "Zrušiť všetko pre súčasný štós" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "Vybrať všetko" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "Zrušiť výber" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "Upraviť premenné obrázku..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 msgid "Deactivate image" msgstr "Dezaktivujte obrázok" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 msgid "Activate image" msgstr "Aktivujte obrázok" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 msgid "Activate images" msgstr "Aktivujte obrázky" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 msgid "Deactivate images" msgstr "Dezaktivujte obrázky" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "Kontrolné body" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2493,12 +2545,26 @@ msgid "Did you know..." msgstr "Vedeli ste, že..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" +"Vybrali ste len jeden raw-súbor. To sa neodporúča.\n" +"Všetky raw-súbory by sa mali prestaviť spolu." + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "Aj tak konvertovať." + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Verzia %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2506,70 +2572,70 @@ "Fatálna chyba inštalácie\n" "Súbor data/splash.png nebol nájdený v:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Pomocník" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Akcie" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 msgid "&Output" msgstr "Výstup" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "Užívateľom definované poradie: %s" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "Užívateľom definované východné poradia" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Editovať" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, c-format msgid "User defined assistant: %s" msgstr "Užívateľom definovaný asistent: %s" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 msgid "User defined assistant" msgstr "Spustiť definovaného asistenta" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Naštartovaný" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimalizátor" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Expozícia" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 msgid "Save changes to the project file before opening another project?" msgstr "Uložiť zmeny do projektového súboru pred otvorením iného projektu?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 msgid "Save changes to the project file before starting a new project?" msgstr "Uložiť zmeny do projektového súboru pred štartom nového projektu?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 msgid "Save changes to the project file before closing?" msgstr "Uložiť zmeny do projektového súboru pred uzatvorením?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 msgid "" "If you load another project without saving, your changes since last save " "will be discarded." @@ -2577,7 +2643,7 @@ "Ak naložíte iný projekt bez uloženia, zmeny ktoré ste urobili od posledného " "uloženia budú zahodené." -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." @@ -2585,7 +2651,7 @@ "Ak štartujete iný projekt bez uloženia, zmeny ktoré ste urobili od " "posledného uloženia budú zahodené." -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 msgid "" "If you close without saving, your changes since your last save will be " "discarded." @@ -2593,40 +2659,40 @@ "Ak zavriete bez uloženia, zmeny ktoré ste urobili od posledného uloženia " "budú zahodené." -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Neukladať" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Uzatvoriť bez uloženia" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "vynútené zavretie" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "projekt %s uložený" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Program na tvorbu panorám" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "Editor panorámy" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2639,35 +2705,35 @@ "\n" "(Kód chyby: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Uložiť PTmender skriptovací súbor" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "Súbory PTmenderu (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Otvoriť projekt: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekt otvorený" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 msgid "Loading canceled" msgstr "Nahrávanie zrušené" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Chyba pri otváraní projektu: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Otvoriť súbor s projektom" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2678,11 +2744,11 @@ "Preto nemôže byť otvorený pomocou ponuky Súbor->Otvoriť.\n" "Chcete namiesto toho pridať tento obrázok do súčasného projektu?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Otváranie projektu: zrušiť" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2693,7 +2759,7 @@ "Súbor nie je platný obrázok.\n" "Tento súbor bude z projektu vysunutý. " -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2704,32 +2770,32 @@ "Súbor bol premenovaný, vymazaný alebo je na nedostupnej jednotke.\n" "Tento súbor bude z projektu vysunutý. " -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Nepodarilo sa prečítať súbor s projektom %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 msgid "Open Papywizard xml file" msgstr "Otvoriť Papywizard xml súbor" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Papywizard xml súbory (*.xml)|*.xml|Všetky súbory (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Vyberte šablónu projektu" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Dolaďovanie všetkých bodov" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Dolaďovanie" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2757,23 +2823,23 @@ "Použite Zoznam kontrolných bodov (F3) pre zobrazenie všetkých bodov " "aktuálneho projektu\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Doladený výsledok" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Odstraňujem kontrolné body v maskách" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Vyberte python skript" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python skript (*.py)|*.py|Všetky súbory (*)|*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2782,13 +2848,13 @@ "Súbor \"%s\" nebol nájdený.\n" "Možno bol súbor premenovaný, presunutý alebo vymazaný." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Chyba!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2796,12 +2862,12 @@ "Modelový súbor Celeste očakávaný v %s nebol nájdený, Hugin musí byť korektne " "nainštalovaný." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Nepodarilo sa načítať modelový súbor Celeste %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2811,7 +2877,7 @@ "posun stredu vignetácie.\n" "Tieto vlastnosti nie sú podporované v jednoduchom rozhraní." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2821,7 +2887,7 @@ "šmykové parametre.\n" "Tieto vlastnosti nie sú podporované v jednoduchom rozhraní." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2831,7 +2897,7 @@ "šmykové parametre.\n" "Tieto vlastnosti nie sú podporované v pokročilom rozhraní." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." @@ -2839,11 +2905,11 @@ "Front asistenta je prázdny. To naznačuje chybu v definovanom súboru " "asistenta." -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Spúšťam asistenta" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." @@ -2851,12 +2917,12 @@ "Asistent nenašiel vertikálne čiary. Pridajte prosím vertikálne čiary v " "editore panorámy a optimalizujte projekt manuálne. " -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Varovanie: Bolo nájdených %d neprepojených skupín obrázkov:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 msgid "" "Please create control points between unconnected images using the Control " "Points tab in the panorama editor.\n" @@ -2868,30 +2934,30 @@ "\n" "Po pridaní bodov, opäť stlačte tlačidlo \"Zarovnať\"" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "" "Asistent skončil s chybou. Prosím, skontrolujte výsledný projektový súbor." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "Projekt nenájdený" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "Nedá sa spustiť PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "Spustil sa nesprávny program" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Typ masky" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2899,29 +2965,29 @@ "Vytvorte masku ako mnohouholník klikaním ľavým tlačidlom myši na obrázku, " "posledný bod nastavíte kliknutím pravým tlačidlom." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Uložiť masku" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Súbory masky (*.msk)|*.msk|Všetky súbory (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Načítať masku" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Načítať masku: zrušiť" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Nepodarilo sa analyzovať masku zo súboru %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Prosím zadajte platné číslo" @@ -3067,7 +3133,7 @@ msgstr "Fotometrické zarovnanie" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Nahrávam obrázky" @@ -3111,63 +3177,67 @@ msgid "Photometric optimization finished" msgstr "Fotometrická optimalizácia bola dokončená" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Pridať jednotlivé obrázky..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "Nechaje ma vybrať niekoľko raw-súborou." + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Pridať časové série obrázkov..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "Nenašiel sa ani jeden vyhovujúci obrázok." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 msgid "Manipulate image variables..." msgstr "Upraviť premenné obrázku..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Odstrániť vybraný obrázok(ky)" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Ukotviť tento obrázok pre pozíciu" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Ukotviť tento obrázok pre expozíciu" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "Nová šošovka" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Zmeniť šošovky..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Vložte nové číslo šošovky" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Číslo šošovky" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Zmeniť číslo šošovky" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 msgid "Load lens from lens database" msgstr "Načítať šošovku z databázy pre šošovky" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "Načítať šošovku z ini súboru" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3176,12 +3246,12 @@ "Mali by sa vybrané parametre aplikovať na všetky obrázky s tou istou " "šošovkou?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Otázka" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3191,100 +3261,100 @@ "Použitím parametrov šošovky môže dôjsť k nechceným dôsledkom.\n" "Naozaj použiť?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "Uložiť parametre šošovky do ini súboru" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "Odstrániť kontrolné body" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "Vybrané obrázky neobsahujú žiadne kontrolné body." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "Naozaj vymazať %lu kontrolných bodov?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Vymazať kontrolné body" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Vyčistiť kontrolné body" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Čistím kontrolné body" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Kontrolujem páry" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Kontrolujem celý projekt" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Dokončenie čistenia" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "Odstrániť kontrolné body v mrakoch" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "Obnoviť vlastné nastavenia..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "Obnoviť pozície" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "Resetovať parametre premiestnenia" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "Obnoviť parametre šošovky" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "Obnoviť fotometrické parametre" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Nový štós" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Zmeniť štós..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Zadajte nové číslo štósu" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "číslo štósu" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Zmeniť číslo štósu" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "Nastaviť veľkosť štósu..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Kvalita:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3354,47 +3424,47 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff Equal Area" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "šírka musí byť celé číslo väčšie než 0" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "výška musí byť celé číslo väčšie než 0" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "Ľavý okraj musí byť menší ako pravý." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "Horný okraj musí byť menší ako spodný." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "Zatiaľ neimplementované voľby PTmenderu" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "Zatiaľ neimplementované voľby PTblenderu" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " Voľby pre tento HDRMerge program zatiaľ neboli implementované" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Nemožno vytvoriť dočasný projektový súbor" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Vyberte predponu pre výstup" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" @@ -3403,15 +3473,15 @@ "Nemáte povolenie písať do adresára \"%s\".\n" "Vyberte prosím iný adresár na finálny výstup." -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "Vyberte výstup definovaný užívateľom" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "Užívateľom definovaný výstup|*.executor" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3426,7 +3496,7 @@ "Znížte rozmer plátna v paneli 'Lepič' alebo zvoľte TIF či PNG ako východzí " "formát." -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3439,7 +3509,7 @@ "orezania a zošite panorámu v paneli Lepiča. Zošívanie panorámy takejto " "veľkosti by mohlo zabrať dlhý čas a veľké množstvo pamäte." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3451,19 +3521,19 @@ "\n" "Ak je to príliš veľké, redukujte rozsah plátna panorámy alebo orezu." -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Určite chcete zošiť takú veľkú panorámu?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Lepiť aj tak" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Dovoľte mi to opraviť" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3473,7 +3543,7 @@ "Skontrolujte vaše nastavenia, tak aby aspoň jeden obrázok bol vo výstupnej " "oblasti." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3498,8 +3568,8 @@ "contains %lu images." msgstr "" "Aktuálny projekt nezodpovedá súboru Papywizard xml.\n" -"Papywizard-súbor \"%s\" obsahuje %lu obrázkov, ale Huginov projekt obsahuje " -"%lu obrázkov." +"Papywizard-súbor \"%s\" obsahuje %lu obrázkov, ale Huginov projekt obsahuje %" +"lu obrázkov." #: hugin1/hugin/PapywizardImport.cpp:464 msgid "Connecting overlapping images" @@ -3509,121 +3579,136 @@ msgid "Miscellaneous" msgstr "Rôzne" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Systémové nastavenie" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "Baskičtina" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Katalánčina" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Čínština (zjednodušená)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Čínština (tradičná)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Čeština" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "Dánčina" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holandčina" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Angličtina" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Francúzština" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Nemčina" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Maďarčina" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Taliančina" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japončina" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Poľština" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugalčina (brazílska)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Ruština" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovenčina" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Španielčina" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Švédčina" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Fínčina" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "Valentínčina (Južné Katalánsko)" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Vyberte Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Spustiteľné (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Vyberte Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +msgid "Select dcraw" +msgstr "Vybrať dcraw" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +msgid "Select RawTherapee-cli" +msgstr "Vyberte RawTherapee-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +msgid "Select Darktable-cli" +msgstr "Vyberte Darktable-cli" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "Vybrať Exiftool súbor argumentov" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Exiftool súbory argumentov (*.arg)|Všetky súbory (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3632,14 +3717,14 @@ "Súbor %s neexistuje.\n" "Vytvoriť súbor argumentov so štandardnými značkami?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool súbor argumentov" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3647,18 +3732,18 @@ "Žiadny súbor nie je vybraný.\n" "Vytvoriť súbor argumentov so štandardnými značkami?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "Vybrať nový Exiftool súbor argumentov" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "Súbor \"%s\" sa nedal uložiť." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" @@ -3667,7 +3752,7 @@ "Súbor %s neexistuje.\n" "Vytvoriť príkladný súbor argumentov?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" @@ -3675,23 +3760,24 @@ "Žiadny súbor nie je vybraný.\n" "Vytvoriť príkladný súbor argumentov?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Skutočne nastaviť zobrazené nastavenia na východzie hodnoty?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Nahrať východzie" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Vyberte, prosím, najprv záznam" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Vyberte záznam" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3699,30 +3785,30 @@ "Nemôžete vymazať posledné nastavenie.\n" "Je vyžadované aspoň jedno nastavenie." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "" "Naozaj chcete odstrániť nastavenia pre detektor kontrolných bodov \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Vymazanie nastavenia detektora kontrolných bodov" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Načítať nastavenia detektora kontrolných bodov" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "Nastavenia detektora kontrolných bodov (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Uložiť nastavenia detektora kontrolných bodov" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3750,50 +3836,54 @@ msgid "Remove %lu control points" msgstr "Odstrániť %lu kontrolných bodov" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Náhľad panorámy" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Nastavenia náhľadu" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projekcia (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Režim miešania:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Výstup:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +msgid "Range compression:" +msgstr "Rozsah kompresie:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Parametre projekcie" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Kliknite ľavým tlačidlom pre nový stredový bod, pravým pre presunutie bodu " "na horizont." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Panorámu centrujete ľavým tlačidlom myši, horizont nastavíte pravým tlačidlom" @@ -3812,7 +3902,7 @@ msgid "Click a connection to edit control points." msgstr "Kliknite na spojenie pre úpravu kontrolných bodov." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3823,30 +3913,127 @@ "Chyba: %s\n" " Jeden z dôvodov môze byť neplatný alebo chýbajúci obrázok." -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Spustiteľný program \"%s\" nebol nájdený.\n" +"Zadajte, prosím, platný spustiteľný program v preferenciach." + +#: hugin1/hugin/RawImport.cpp:93 +#, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "" +"Spustiteľný program \"%s\" nebol nájdený v PATH.\n" +"Zadajte, prosím, platný spustiteľný program v preferenciach." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, c-format +msgid "Executing: %s %s" +msgstr "Spúšťam: %s %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "Obnovujem EXIF informácie pre %s" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" +"Súbor pre profil \"%s\" nebol nájdený.\n" +"Zadajte, prosím, platný súbor alebo nechajte to pole prázdne pre štandardné " +"nastavenia." + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "Importovať RAW obrázky" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" +"Nie je možné spracovať výstup referenčného obrázku.\n" +"Nemôžem spracovať ďalšie obrázky." + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Zavrieť" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "Varovanie: Chyba čítania" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" +"Nasledovné súbory budú vynechané lebo metadáty týchto súborov sa nedali " +"načítať." + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "Varovanie: RAW obrázky z rozličných kamier" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" +"Nasledovné obrázky boli snímané s inou kamerou ako tie ostatné.\n" +"RAW-import pracuje len pre obrázky rovnakej kamery." + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" +"Prinajmenšom jeden RAW obrázok nebol úspešne konvertovaný.\n" +"Také obrázky sa vynechajú" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "Vyberte štandardný profil pre RT spracovanie" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "RT spracujúci profil|*.pp3" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "Adresár '%s' neexistuje" # Nepodarilo sa nastaviť premennú prostredia PYTHONHOME -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "Could not set environment variable PYTHONHOME" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 msgid "Open Batch Processor" msgstr "Otvoriť Dávkový Procesor" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Otvorí PTBatcher, dávkový procesor pre projektové súbory Huginu" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 msgid "Open Lens calibrate tool" msgstr "(Open Lens) rozhranie kalibrácie šošovky" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "Otvorí Calibrate_lens_gui, jednoduchá GUI na kalibráciu šošovky" @@ -3861,11 +4048,11 @@ "Možno nie je správne nainštalovaný alebo ste zadali nesprávnu cestu v " "nastaveniach." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "čistím dočasné súbory s kľúčovými bodmi" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3874,15 +4061,15 @@ "Používajte, prosím, %namefile, %i alebo %s pre určenie vstupných súborov pre " "detektor" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Chyba v príkaze detektora kontrolných bodov" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3894,14 +4081,14 @@ "Vyberte prosím menej obrázkov alebo vložte obrázky do priečinka\n" "s kratším názvom cesty" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "Vybraných príliš mnoho obrázkov" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3913,38 +4100,38 @@ "\n" " Chyba pri spustení príkazu: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "chyba v wxExecute" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "hľadám kontrolné body" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Nebolo možné spustiť príkaz: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3953,9 +4140,9 @@ "Príkaz: %s\n" "skončil s chybovým kódom: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3970,13 +4157,13 @@ "\n" "Spúšťaný príkaz: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "Zlyhanie detektora kontrolných bodov" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -3984,7 +4171,7 @@ "Použite, prosím, %i pre určenie vstupných súborov, %k pre určenie kľúčového " "súboru na generovanie kľúčových krokov" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -3992,11 +4179,11 @@ "Prosím, použite %k pre určenie súborov s kľúčovými bodmi a %o pre určenie " "výstupu pre súbor projektu kroku zhody" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "generujem súbor s kľúčovými bodmi" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4009,11 +4196,11 @@ "\n" " Chyba pri spustení príkazu: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Východzie" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4021,250 +4208,250 @@ "Nemôžem vyčistiť dávkovú úlohu, ktorá prebieha.\n" "Chcete ju zrušiť?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Vyčistená dávková úloha." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "Chyba: Nemôžem zistiť stav, projekt s indexom %d nie je v zozname." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Chyba: Nemožno načítať súbor dávkovej úlohy." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Dávková úloha úspešne skončila." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Dávková úloha skončila s chybami." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Spúšťam vypínanie..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Vypínam..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "Príprava na prezimovanie..." -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 msgid "Initializing hibernating..." msgstr "Inicializácia prezimovania..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "Príprava na prerušenie..." -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 msgid "Initializing suspend mode..." msgstr "Inicializácia stavu prerušenia..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 msgid "Specify project file" msgstr "Určite súbor s projektom" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Nebola zvolená žiadna predpona výstupu" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Neboli vybrané žiadne súbory projektu" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Lepím" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Asistent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Chyba pri odstraňovaní, projekt s id %d nie je v zozname." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Chyba: Nemôžem vymazať súbor s projektom " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Spúšťam dávkovú úlohu..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI lepí" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Dávková úloha už prebieha." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, c-format msgid "Running command \"%s\"" msgstr "Spúšťam príkaz \"%s\"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Teraz lepím: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Teraz hľadám: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "Chyba: Nemôžem nastaviť stav, projekt s indexom %d nie je v zozname." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Nerobí mnoho..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "Stlačili ste príkazový kláves." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "Stlačili ste kontrolný kláves." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "Preskočiť nahranie dávkového frontu?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 msgid "Do nothing" msgstr "Nič nerobiť" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 msgid "Close PTBatcherGUI" msgstr "Zavrieť PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 msgid "Shutdown computer" msgstr "Vypnúť počítač" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "Prerušiť počítač" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "Prezimovať počítač" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Prosím zadajte riadok príkazového riadku, ktorý sa má spustiť:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Zadajte aplikáciu" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Zadajte adresár, v ktorom sa budú hľadať súbory projektov" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Určite zdrojový(é) súbor(y) projektu" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, c-format msgid "Added projects from dir %s" msgstr "Projekty pridané z adresára %s" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Pridáva projekt %s do zoznamu fronty na lepenie." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Pridáva projekt %s do frontu asistenta." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Dávková úloha zastavená" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Huginov dávkový procesor" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Vyberte predponu pre výstup projektu " -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Predpona pre cieľ asistenta nemôže byť zmenený." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Vyberte, prosím, projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 msgid "Please select only one project" msgstr "Vyberte len jeden projekt prosím" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Zadajte súbor s dávkovou úlohou, ktorý sa má otvoriť" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Súbory dávky (*.ptb)|*.ptb|Všetky súbory (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Nemôžem otvoriť app v Hugine." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Nebol vybraný projekt. Otvoriť Hugin bez projektu?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Dávková úloha pozastavená" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "Prerušenie spracovania dávkového frontu Hugina" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Dávková úloha pokračuje..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "Spracovanie dávkového frontu Hugina" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4272,7 +4459,7 @@ "V zozname sú projekty, ktoré zlyhali.\n" "Odstrániť ich tiež?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4280,16 +4467,16 @@ "Nemôžem odstrániť projekt, ktorý prebieha.\n" "Chcete ho zrušiť?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, c-format msgid "Removed project %s" msgstr "Odstránený projekt %s" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Prosím vyberte projekt, na odstránenie" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4297,16 +4484,16 @@ "Nemôžem resetovať projekt, ktorý prebieha.\n" "Chcete ho zrušiť?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, c-format msgid "Reset project %s" msgstr "Resetovať projekt %s" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Prosím vyberte projekt, ktorý chcete resetovať" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4314,15 +4501,15 @@ "Nemôžem resetovať projekty, ktoré prebiehajú.\n" "Chcete zrušiť dávkovú úlohu?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Zadajte súbor, do ktorého chcete uložiť dávkovú úlohu" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Súbor dávky (*.ptb)|*.ptb|Všetky súbory (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" @@ -4332,15 +4519,15 @@ "To môže mať negatívne efekty na výkonnosť.\n" "Vyčistiť teraz dávkový front?" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Clear batch queue now" msgstr "Vyčistiť dávkový front" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "Držať dávkový front" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Spustiť dávkovú úlohu" @@ -4376,7 +4563,7 @@ msgid "E&xit" msgstr "&Koniec" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4386,11 +4573,11 @@ "Ak zavriete toto dialógové okno, stratíte ich.\n" "Chcete napriek tomu pokračovať?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Prijaté" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4400,11 +4587,11 @@ "Ak budete pokračovať, budú zahodené.\n" "Chcete pokračovať?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Zastaviť" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4413,7 +4600,7 @@ "Adresár %s neexistuje.\n" "Prosím, zadajte existujúci adresár." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4421,7 +4608,7 @@ "Nevybrali ste žiadnu možnú panorámu.\n" "Prosím, vyberte aspoň jednu panorámu a skúste to znovu." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4430,139 +4617,141 @@ "Nepodarilo sa zapísať všetky súbory projektu.\n" "Možno nemáte práva zápisu pre tieto adresáre alebo je váš pevný disk plný." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 msgid "Remove image from project" msgstr "Odstrániť obrázok z tohto projektu" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 msgid "Split here into two panoramas" msgstr "Rozdeliť tu na dve panorámy" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Načítam súbor %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Spustiť" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Nájdených %d možných panorám." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Žiadne možné panorámy neboli nájdené." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d obrázkov: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "%M:%S min" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "%S s" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Objavená syntaktická chyba v parametroch, končím." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI štartoval" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Čakám" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Prebieha" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Hotové" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Zlyhanie" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Súbor chýba" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pozastavené" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Predpona pre výstup" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Stav" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Naposledy menený" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Formát pre výstup" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projekcia" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Veľkosť" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Chyba, neviem konvertovať id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Asistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Zmeniť predponu" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Resetovať projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Upraviť pomocou Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Odstrániť" @@ -4597,16 +4786,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Súbory s logom (*.log)|Všetky súbory (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Nepodarilo sa nájsť užívateľom definovaný výstupný súbor \"%s\"." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Určite zdrojový súbor projektu" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4617,7 +4806,7 @@ "súboru." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "O Hugine" @@ -4650,19 +4839,19 @@ msgstr "Systém" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4740,8 +4929,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Vybrať..." @@ -4833,7 +5025,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Voľby" @@ -4865,10 +5057,6 @@ msgid "Send selected panoramas to queue" msgstr "Odoslať vybrané panorámy do frontu" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Zavrieť" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Prehľadávam panorámu" @@ -4962,12 +5150,12 @@ msgstr "Minimalizovať do podnosu" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Koniec" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Ukončí program" @@ -5071,6 +5259,115 @@ msgid "adddir" msgstr "adddir" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Popis:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Typ:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Všetky obrázky naraz" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panoráma so štósmi" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "Viacriadková panoráma" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Viacriadková panoráma so štósmi" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Vopred zarovnaná panoráma" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Jednokrokový detektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Program:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argumenty:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Čistiace prepínače:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Dvojkrokový detektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Popisovač vlastností:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Hľadač spoločných vlastností:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detektor štósov" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "" +"Ponechať prázdne, ak by nemal byť spustený detektor kontrolných bodov pre " +"štósy." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Pokročilé voľby" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Toto nastavenie nemá žiadne pokročilejšie voľby." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"nasledujúce vzory budú interpretované pred spustením:\n" +"%o -- výstupný projekt (0.oto bude pripojené pri použití Autopano)\n" +"%p -- počet kontrolných bodov medzi každým párom\n" +"%v -- HFOV prvého obrázku\n" +"%f -- projekcia prvého obrázku (0-4, ako v panotools)\n" +"%i -- súbory s obrázkami\n" +"%namefile -- súbor, ktorý obsahuje názvy súborov s obrázkami\n" +"%s -- vstupný skript pre panotools\n" +"%k -- medziľahlé kľúčové súbory" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parametre pre detektory kontrolných bodov" + #: hugin1/hugin/xrc/cp_editor_panel.xrc:32 msgid "previous image pair" msgstr "predchádzajúci obrázkový pár" @@ -5102,7 +5399,7 @@ msgstr "prispôsobiť oknu" #: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 msgid "Fine-tune" msgstr "Doladiť" @@ -5164,7 +5461,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Vymazať" @@ -5172,155 +5469,189 @@ msgid "Select by Distance" msgstr "Vybrať podľa vzdialenosti" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Popis:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +msgid "Warning: Invalid filenames" +msgstr "Varovanie: Neplatné mená súborov" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Typ:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" +"Nasledovné súbory už existujú.\n" +"Budú prepísané keď sa spustí RAW-import.\n" +"Chcete prepísať tieto súbory?" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (autor A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "Áno" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Všetky obrázky naraz" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "Nie" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panoráma so štósmi" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Editovať skript Panorama Tools" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "Viacriadková panoráma" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Toto je skript, ktorý bude odoslaný do Panorama Tools. Editovanie týchto " +"riadkov je doporučené skúseným užívateľom." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Viacriadková panoráma so štósmi" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Pokračovať s týmito zmenami" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Vopred zarovnaná panoráma" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Zahodiť zmeny a zrušiť" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "Triediť podľa:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Jednokrokový detektor" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "Minimálne prekrytie:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" +"Minimálne prekrytie na zistenie výstupného štósu\n" +"Keď -1, budú použité v projekte uvedené štósy." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argumenty:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "Maximálny Ev rozdiel:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Čistiace prepínače:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "Maximálny Ev rozdiel na zistenie výstupných vrstiev" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Dvojkrokový detektor" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "Displej" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Popisovač vlastností:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Všeobecné" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "Hľadač spoločných vlastností:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF dáty" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detektor štósov" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "Umiestnenie" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "" -"Ponechať prázdne, ak by nemal byť spustený detektor kontrolných bodov pre " -"štósy." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Parametre šošovky" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Pokročilé voľby" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "Fotometrické parametre" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Toto nastavenie nemá žiadne pokročilejšie voľby." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "Typ šošovky" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"nasledujúce vzory budú interpretované pred spustením:\n" -"%o -- výstupný projekt (0.oto bude pripojené pri použití Autopano)\n" -"%p -- počet kontrolných bodov medzi každým párom\n" -"%v -- HFOV prvého obrázku\n" -"%f -- projekcia prvého obrázku (0-4, ako v panotools)\n" -"%i -- súbory s obrázkami\n" -"%namefile -- súbor, ktorý obsahuje názvy súborov s obrázkami\n" -"%s -- vstupný skript pre panotools\n" -"%k -- medziľahlé kľúčové súbory" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "Pridať obrázky..." + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Typ šošovky:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Násobič ohniskovej vzdialenosti:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "Hľadanie Spoločných Vlastností" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Nastavenia:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +msgid "Run selected control point detector on the selected images" +msgstr "Spustiť vybraný detektor kontrolných bodov na zvolené obrázky" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimalizovať" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parametre pre detektory kontrolných bodov" +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "Geometria:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "Neplatné mená súborov" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "Vypočítať" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Editovať skript Panorama Tools" +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "Fotometrika:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Vybraný obrázok" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Načítať údaje šošovky..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Toto je skript, ktorý bude odoslaný do Panorama Tools. Editovanie týchto " -"riadkov je doporučené skúseným užívateľom." +"Zadajte horizontálne zorné pole (HFOV) alebo ohniskovú vzdialenosť a faktor " +"orezania:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Pokračovať s týmito zmenami" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Zahodiť zmeny a zrušiť" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "stupňov" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Údaje o kamere a šošovke" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Otočenie:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Sklon:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Klopenie:" @@ -5328,34 +5659,11 @@ msgid "Translation parameter" msgstr "Parametre premiestnenia" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "Umiestnenie" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "stupne pohľadu (v):" @@ -5455,7 +5763,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Pomocník" @@ -5497,8 +5805,8 @@ msgstr "Nahrať" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Uložiť" @@ -5510,121 +5818,45 @@ msgid "Manipulate image variables" msgstr "Ovplyvniť premenné obrázku" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "Triediť podľa:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "Minimálne prekrytie:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "Minimálne prekrytie na zistenie výstupného štósu" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "Maximálny Ev rozdiel:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "Maximálny Ev rozdiel na zistenie výstupných vrstiev" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "Displej" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Všeobecné" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF dáty" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Parametre šošovky" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "Fotometrické parametre" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "Typ šošovky" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "Pridať obrázky..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Typ šošovky:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Násobič ohniskovej vzdialenosti:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "Hľadanie Spoločných Vlastností" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Nastavenia:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -msgid "Run selected control point detector on the selected images" -msgstr "Spustiť vybraný detektor kontrolných bodov na zvolené obrázky" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimalizovať" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "Geometria:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 +msgid "WB reference:" +msgstr "WB referencia:" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "Vypočítať" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "dcraw" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "Fotometrika:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +msgid "Additional dcraw parameters:" +msgstr "Ďalšie dcraw argumenty:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Vybraný obrázok" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "RawTherapee" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Načítať údaje šošovky..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +msgid "Processing profile:" +msgstr "Spracovanie profilu:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -"Zadajte horizontálne zorné pole (HFOV) alebo ohniskovú vzdialenosť a faktor " -"orezania:" +"Pre použitie štandardných nastavení v RawTherapee to nechajte to prázdne" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "darktable" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "stupňov" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "RAW konvertor" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Údaje o kamere a šošovke" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Importovať" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5769,14 +6001,6 @@ msgid "Don't ask again" msgstr "Nepýtať sa znova" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "Áno" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "Nie" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5839,21 +6063,21 @@ msgid "Import positions from Papywizard XML" msgstr "Importovať pozície od Papywizard XML" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "S&päť" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Odvolať poslednú akciu" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Dopredu" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Opakovať odvolanú akciu" @@ -5895,12 +6119,12 @@ msgid "Use only normal control points in optimization." msgstr "Použiť len normálne kontrolné body pri optimalizácii." -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "Op&timalizovať" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Znovu spustiť optimalizátor s aktuálnym nastavením" @@ -5928,15 +6152,15 @@ msgid "Run a python script" msgstr "Spustiť Python skript" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "Z&obraziť" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 msgid "Full &Screen" msgstr "Na celú obrazovku" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "Zobrazí hlavné okno Huginu na celej obrazovke" @@ -6012,19 +6236,19 @@ msgid "Show the Stitcher panel" msgstr "Zobraziť panel Lepenie" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "Jednoduché" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 msgid "&Advanced" msgstr "Pokročilé" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "Expertné" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 msgid "&Interface" msgstr "Rozhranie" @@ -6044,86 +6268,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "Lepiť s nastaveniami pre výstupné poradie definované užívateľom" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Zopár informácií o rozdielnych tlačidlách atď." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Tip dňa" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Zobraz jeden z tipov dňa." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Klávesové skratky" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "klávesové skratky" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Často kladené otázky (FAQ)" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&O programe" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Nastavenia" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nový" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nový projekt" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Otvoriť" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Otvoriť projekt" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Uložiť" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Uložiť aktuálny projekt" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Uložiť &ako" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Uložiť aktuálny projekt do nového súboru" @@ -6139,18 +6363,18 @@ "Uložiť tento projekt do PTStitcher-kompatibilného skriptovacieho súboru, " "užitočné pri spracovaní frontov" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 msgid "Most recently &used projects" msgstr "Naposledy použité projekty" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Zoznam naposledy použitých súborov projektu" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Spustiť dávkový procesor" @@ -6235,7 +6459,7 @@ msgid "Show the OpenGL preview image" msgstr "Zobrazí OpenGL náhľad obrázku" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Náhľad panorámy" @@ -6292,15 +6516,10 @@ msgstr "Vylúčiť oblasť zo všetkých obrázkov tejto šošovky" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Exportovať" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Importovať" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopírovať" @@ -6344,8 +6563,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" "Uplatní všetky zmeny na každý orázok so stejnou šošovkou ako vybrané obrázky." @@ -6448,7 +6667,8 @@ msgid "execute the PTOptimizer engine" msgstr "spustí PTOptimizer" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Orientácia obrázku" @@ -6493,39 +6713,39 @@ msgid "Interpolator (i):" msgstr "Interpolátor (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bikubicky)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Krivka 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Krivka 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Krivka 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilineárne" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Najbližší sused" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "odhad hodnôt medzi zdrojovými bodmi" @@ -6553,7 +6773,7 @@ msgid "Enfuse options" msgstr "Voľby Enfuse" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Zorné pole:" @@ -6715,10 +6935,6 @@ msgid "Image fusion:" msgstr "Splynutie obrázku:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR spájač:" @@ -6822,15 +7038,15 @@ msgid "Output parameters" msgstr "Výstupné parametre" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 msgid "Seam blend mode:" msgstr "Režim spájania ševu:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "tvrdý šev (rýchlejšie)" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 msgid "blend seam" msgstr "splývavý šev" @@ -6899,27 +7115,40 @@ msgid "This affects the control points editor and mask editor." msgstr "Toto ovplyvňuje editory pre kontrolné body a masky." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +msgid "dcraw executable:" +msgstr "spustiteľný súbor dcraw:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(nechajte prázdne pre východzie nastavenie OS)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +msgid "RT-cli executable:" +msgstr "Spustiteľný program s RT-cli:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +msgid "darktable-cli executable:" +msgstr "spustiteľný program darktable-cli:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Možnosti súboru" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Dočasný adresár:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(nechajte prázdne pre východzie nastavenie OS)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "Štandardné meno súboru projektu:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "Štandardný prefix pre výstup:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6950,43 +7179,43 @@ "%lens - šošovka (prvého obrázku)\n" "%projectname - názov súboru projektu (len pre výstupný prefix)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "Štandardné mená súborov" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "Mená súborov" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Načítanie obrázku" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Automaticky zarovnať obrázky po ich načítaní" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "Hľadať vertikálne čiary" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "Hľadať vertikálne čiary v obrázkoch na vyrovnanie panorámy" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Odstrániť kontrolné body, ktoré vyzerajú ako oblaky (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "Voliteľné kroky asistenta" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Auto-zarovnanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -6994,67 +7223,67 @@ "Počet kontrolných bodov\n" "na jedno prekrytie" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Znížiť rozlíšenie finálnej panorámy" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "percent max. šírky" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "Editor kontrolných bodov" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR a 16-bitové zobrazenie" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Krivka" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "lineárna" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmická" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gama 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "použitá pre zobrazovanie v GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Šírka záplaty:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "bodov" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Šírka vyhľadávacieho poľa:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "percent šírky obrázku" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Šírka lokálneho vyhľadávacieho poľa:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Korelačný prah:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7062,11 +7291,11 @@ "0: žiadna podobnosť\n" "1: maximálna podobnosť" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Prah vrcholu zakrivenia:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7074,116 +7303,112 @@ "0: žiadny vrchol\n" "0.2: zreteľný vrchol" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Rotačné hľadanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Povoliť rotačné hľadanie (pomalšie, ale presnejšie)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Štartovací uhol:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Konečný uhol:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Kroky:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "Detektory kontrolných bodov" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "Programy na detekciu kontrolných bodov" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Nový..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Úpravy..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Presun hore" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Presun dole" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Nastaviť východzie hodnoty" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Asistent používa štandardné nastavenie." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Výstupný formát" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Štandardný Formát Súboru:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "štandardný východzí formát pre cieľové panoráma" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF Kompresia:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "štandardná TIFF kompresia" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG Kvalita:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "štandardné nastavenie JPEG kompresie" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 msgid "Blender" msgstr "Miešač" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 msgid "Default blender:" msgstr "Štandardný miešač:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "Štandardný miešač pre nové projekty." -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Procesor" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Nástroj, ktorý prevedie lepenie" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Začať lepenie okamžite" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7193,19 +7418,19 @@ "spracovateľ bude spustený v suspendovanom stave a užívateľ musí spracovanie " "štartovať manuálne." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Prepísať existujúce súbory" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "VAROVANIE: existujúce súbory budú bez pýtania prepísané." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Podrobný Výstup" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7213,19 +7438,19 @@ "Umožniť na získanie podrobností, užitočné pri hlásení chyby alebo proste " "pozorovanie pokroku behu." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Lepenie" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "Kopírovať metadata do výsledných súborov nástrojom ExifTool" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "Voľby Exiftool" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7239,7 +7464,7 @@ "Keď chcete vytvoriť príkladný súbor, nechajte textové okienka prázdne, a " "stlčte \"Úpravy...\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." @@ -7247,19 +7472,19 @@ "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:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 msgid "Intermediate ExifTool argfile:" msgstr "Predbežný Exiftool súbor argumentov:" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "Nechajte prázdne pre štandard" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "Vybrať Exiftool súbor argumentov" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 msgid "" "The following argfile will be used to copy tags from the first image to the " "final panorama.\n" @@ -7269,27 +7494,27 @@ "obrázku do cieľovej panorámy.\n" "Aplikované je to dodatočne k súboru použitým pre pomocné obrázky." -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 msgid "Final ExifTool argfile:" msgstr "Finálny exiftool súbor argumentov:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "Vytvoriť Photo Sphere XMP dáty" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "Toto sa bude robiť len pre skoroobdĺžnokové východzie obrázky." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "Pokročilé voľby" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "Počet vlákien:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7301,81 +7526,81 @@ "Nastavte toto číslo na počet procesorov alebo jadier dostupných v vašom " "systéme" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 pre automatické vyhľadávanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 msgid "Stitching (2)" msgstr "Lepenie (2)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Východzí interpolátor (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Štandardne vytvárať orezané obrázky" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" -msgstr "Použiť grafický čip na premapovanie (EXPERIMENTÁLNE)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +msgid "Use GPU for remapping" +msgstr "Použiť grafický čip na premapovanie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Použiť čip grafickej karty pre urýchlenie premapovania" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Použiť alternatívu k programu Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Spustiteľný súbor Enblend:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Štandardné prepínače:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Toto sú štandardné argumenty pre nové projekty.\n" "Dajú sa zmeniť pre jednotlivé projekty v paneli Lepenie.\n" -"Nenastavujte prepínače -w, -o a --compression, tie zapína hugin" +"Nenastavujte prepínače -w, -o a --compression, tie zapína hugin." -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Použiť alternatívny program Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Spustiteľný súbor Enfuse:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Programy" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Parametre Celeste" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "Prah SVM:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7383,19 +7608,19 @@ "väčšie než 0.5: menej citlivé\n" "menšie než 0.5: citlivejšie" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Veľkosť Gabor filtra" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "malý" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "veľký" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7403,7 +7628,7 @@ "veľký je presnejší\n" "malý dokáže otestovať kontrolné body, ktoré sú blízko pri okraji obrázka" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7413,55 +7638,55 @@ "prekrývajúcich sa oblastiach.\n" "Pre zrýchlenie výpočtu sú použité iba náhodné množiny bodov." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "Počet bodov na obrázok: " -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "Fotometrický optimalizátor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 msgid "Warnings" msgstr "Varovania" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "Ukázať správu o uložení projektového súboru a prefixu výstupu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "Ukázať varovanie o veľkom rozdieli expozície pri pridávaní obrázkov" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "Po upravení nástroja kontrolných bodov" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "Spýtať sa užívateľa" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 msgid "Re-optimize panorama" msgstr "Re-Optimalizovať panorámu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 msgid "Don't optimize panorama" msgstr "Neoptimalizovať panorámu" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 msgid "Edit cp tool (on fast preview window)" msgstr "Upraviť nástroj kontrolných bodov (v okne s rýchlym náhľadom)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Ostatné" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Nastavenia - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." @@ -7469,11 +7694,11 @@ "Tento súbor je volaný z príkazového riadku\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "Upraviť Exiftool súbor argumentov" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." @@ -7481,7 +7706,7 @@ "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:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7517,11 +7742,11 @@ "\n" "Veľkosť písmen je v zástupných značkách významná." -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Vystrediť náhľad horizontálne" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Vystrediť" @@ -7529,13 +7754,15 @@ msgid "Show the whole panorama" msgstr "Ukázať celú panorámu" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Odhadnúť zorné pole" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Prispôsobiť" @@ -7543,7 +7770,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Automaticky vyrovnať zvlnený horizont" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Vyrovnať" @@ -7642,31 +7870,31 @@ "Nastaví hodnotu expozície panorámy na priemernú hodnotu expozície všetkých " "obrázkov." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Výber šedej" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Opravte globálne vyváženie bielej vybraním neutrálne šedej oblasti." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 msgid "Edit CP" msgstr "Editovať kontrolné body" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 msgid "Create or delete control points in selected rectangle." msgstr "Vytvoriť alebo vymazať kontrolné body vo vybranom obdĺžniku." -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "Pozadie:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Mierka:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7679,153 +7907,141 @@ "* Kliknite na čiaru pre úpravu zodpovedajúcich obrázkov v paneli Kontrolné " "body." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Rozloženie" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "Návody:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "Pravidlo tretín" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "Zlatý rez" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "Diagonál" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "Metóda diagonály" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "Zlatý trojuholník (nadol)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "Zlatý trojuholník (nahor)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Automaticky vyrovnať zvlnený horizont." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Režim uchopenia:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Použiť" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Presuňte panorámu alebo ťahajte obrázky na miesto" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Presunúť/Ťahať" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "Nastaviť oblasť na orezanie na najväčší obdĺžnik pokrytý obrázkami" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR Autoorez" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "Nastaviť oblasť na orezanie na najväčší obdĺžnik pokrytý štósmi" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "ľavá:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "vrchná:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "pravá:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "spodná:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Obnoví orez na maximálnu veľkosť" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Zmeniť oblasť pre orez panorámy" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "&Editor panorámy" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "Pre&hľad" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "Zobrazí náhľad panoramatickej guľovej plochy." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 msgid "&Grid" msgstr "Mriežka" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "Zobrazí mriežku." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 msgid "&All images" msgstr "Všetky obrázky" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 msgid "Image with &median exposure of each stack" msgstr "Obraz so strednou expozíciou každého štósu" -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 msgid "&Brightest image of each stack" msgstr "Najsvetlejší obrázok každého štósu" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 msgid "&Darkest image of each stack" msgstr "Najtmavší obrázok každého štósu" -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 msgid "&Keep currently selected images" msgstr "Držať momentálne zvolené obrázky" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 msgid "&Reset selection" msgstr "Zrušiť výber" @@ -8123,9 +8339,106 @@ "ak sa obrázky veľmi prekrývajú a použili ste tiež mnoho dobre rozprestrených " "kontrolných bodov." +#, fuzzy +#~ msgid "Please add at least one raw image to list before you can import it." +#~ msgstr "" +#~ "Musíte pridať aspoň jeden RAW obrázok do listiny aby sa dal importovať." + +#, fuzzy +#~ msgid "Import Raw Files" +#~ msgstr "Importovať RAW súbory" + +#~ msgid "(WB reference)" +#~ msgstr "(VB referencia)" + +#~ msgid "Images" +#~ msgstr "Obrázky" + +#~ msgid "Add image(s)..." +#~ msgstr "Pridať obrázky..." + +#~ msgid "Add other images to list" +#~ msgstr "Pridá ďalšie obrázky do listiny" + +#~ msgid "Remove image" +#~ msgstr "Odobrať obrázok" + +#~ msgid "Remove selected image from list" +#~ msgstr "Odstrániť vybrané obrázky z listiny" + +#~ msgid "Mark selected image as white balance reference image" +#~ msgstr "Označte vybraný obrázok ako refernčný na vyváženie bielej" + +#~ msgid "Converter settings" +#~ msgstr "Nastavenia konvertoru" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "Importovať &RAW súbory…" + +#, fuzzy +#~ msgid "Convert raw file to TIFF and add TIFF to current project" +#~ msgstr "Konvertovať RAW súbor na TIFF a pridať do aktuálneho projektu" + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Presuňte panorámu alebo ťahajte obrázky na miesto" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Zmeniť oblasť pre orez panorámy" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Použiť grafický čip na premapovanie (EXPERIMENTÁLNE)" + #~ msgid "Dedication" #~ msgstr "Venovanie" +#~ msgid "Select default RT history stack" +#~ msgstr "Vybrať štandardný zásobník pre RT históriu" + +#~ msgid "RT history stack|*.pp3" +#~ msgstr "Zásobník pre históriu RT|*.pp3" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (autor A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "Default history stack:" +#~ msgstr "Štandardný zásobník pre históriu:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgid "Executing: %s" +#~ msgstr "Spúšťam: %s" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Všetky súbory obrázkov|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;" +#~ "*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff,*.hdr;*.HDR;" +#~ "*.exr;*.EXR|JPEG súbory (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|Súbory " +#~ "TIFF (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|Súbory PNG (*.png)|(*.png)|" +#~ "*.png;*.PNG|Súbory HDR (*.hdr)|*.hdr;*.HDR|Súbory EXR (*.exr)|*.exr;*.EXR|" +#~ "Všetky súbory (*)|*" + #~ msgid "Interface" #~ msgstr "Rozhranie" @@ -10304,3 +10617,9 @@ #~ msgstr "" #~ "V paneli obrázku a šošovky môže byť vybraných viacero obrázkov naraz. " #~ "Príkazy sa budú spúšťať na zvolených obrázkoch." + +#~ msgid "Invalid filenames" +#~ msgstr "Neplatné mená súborov" + +#~ msgid "Select RawTherapee cli" +#~ msgstr "Vyberte RawTherapee-cli" diff -Nru hugin-2018.0.0+dfsg/src/translations/sv.po hugin-2019.0.0+dfsg/src/translations/sv.po --- hugin-2018.0.0+dfsg/src/translations/sv.po 2018-01-13 07:52:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/sv.po 2019-02-17 15:24:33.000000000 +0000 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: se\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2011-09-29 13:15+0100\n" "Last-Translator: Ulf Wilhelmson \n" "Language-Team: Svenska \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: SWEDEN\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" @@ -51,16 +51,16 @@ msgid "Searching for best crop..." msgstr "söker efter molnliknande kontrollpunkter..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "" "Externt program %s hittades ej i programpaketet, återställer till " "systemsökvägen" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -88,9 +88,9 @@ msgstr "" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "Filen %s finns redan. Skall den skrivas över?" @@ -127,7 +127,7 @@ msgstr "Beskärningsvärdet måste vara positivt." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -137,24 +137,28 @@ msgstr "" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -175,8 +179,8 @@ msgstr "Full frame fisheye" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "Ekvirektangulär" @@ -207,11 +211,13 @@ msgid "builtin" msgstr "inbyggd" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "custom (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "Linjär" @@ -235,16 +241,16 @@ msgid "Error loading lens parameters" msgstr "Fel uppstod när objektivparametrar lästes in" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "Spara objektivparameterfil" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "Objektivprojektfiler (*.ini)|*.ini|Alla filer (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "Spara projekt" @@ -276,22 +282,23 @@ msgid "Error pausing process %ld, code 2" msgstr "Ett fel uppstod när process %ld, code 2 pausades" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "Avbryt" @@ -329,12 +336,12 @@ msgid "Panorama Tools" msgstr "Panorama Tools" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "Kunde inte öppna projektfilen:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "Kunde inte öppna script : %s" @@ -344,8 +351,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "ett fel uppstod under tolkning av panotools-script: %s" @@ -359,17 +366,17 @@ msgid "Could not create temporary file" msgstr "Kunde inte skapa en temporärfil" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "Fel under sammanfogning" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -377,11 +384,11 @@ "Skriva över existerande bildfiler?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "Skriva över existerande bildfiler?" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -390,12 +397,12 @@ "Fel under sammanfogning av projekt\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "Ett fel uppstod när assistenten kördes" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -404,297 +411,307 @@ "Ett fel uppstod när assistenten körde\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "Sammanfogar panorama" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "Version: %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "" "\n" " nuvarande directory:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "Prefix på ut-fil" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Sammanfogare:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "Internt fel" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "Exponering:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Enfuse-alternativ" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Enfuse-alternativ" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "Antal punkter per bild" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "Sammanfogade exponeringslager" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "Panoramabildstorlek:" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "Projektion:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "Använd GPU för ommappning (EXPERIMENTEL)" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "Panorama Resultat:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "Exponeringskorrigerad, lågt dynamiskt omfång" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "Exponeringssammansmält från stackar" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "Exponeringssammansmält från valfritt arrangemang" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "Stort dynamiskt omfång (HDR)" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "Ommappade bilder:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "Ingen exponeringskorrigering, lågt dynamiskt omfång" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "Kombinerade stackar:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 #, fuzzy msgid "Exposure fused stacks" msgstr "Exponeringssammansmält från stackar" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "Lager:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "Sammansatta lager med likartad exponering, utan exponeringskorrigering" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "Denna bild" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "Antal CPUer:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "Filnamn:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "Panoramabildstorlek:" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "Objektivtyp:" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "Exponering (EeV)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "Ommappade bilder:" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "Lägesjusterar bilder" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "Sammansatta lager med likartad exponering, utan exponeringskorrigering" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "Sammanfogade exponeringslager" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "Ändra stacknummer" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "Ommappade bilder:" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "Ändra stacknummer" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "Sammanfogar %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 #, fuzzy msgid "first image" msgstr "Denna bild" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 #, fuzzy msgid "last image" msgstr "Lägg till bild" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 #, fuzzy msgid "directory" msgstr "Katalog:" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 #, fuzzy msgid "Camera maker" msgstr "Kamerafabrikat:" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 #, fuzzy msgid "Camera model" msgstr "KameraModell:" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -702,36 +719,70 @@ msgid "Lens" msgstr "Objektiv" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 #, fuzzy msgid "unknown projection" msgstr "Okänd version" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "Bildfil:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "Läser in fil %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "Fel" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -741,25 +792,11 @@ "Filnamnet(en) innerhåller ett av följande otillåtna tecken : %s\n" "Hugin kan inte arbeta med dessa filnamn. Döp om filerna och försök igen." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"Alla bildfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;" -"*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF filer (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG filer (*.png)|*.png;*.PNG|HDR filer (*." -"hdr)|*.hdr;*.HDR|EXR filer (*.exr)|*.exr;*.EXR|Alla filer (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -771,27 +808,27 @@ msgstr "Inmatning\"%s\" för %s är inteett giltigt tal\n" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "Varning" @@ -810,7 +847,7 @@ msgid "Could not save information into database." msgstr "Kunde inte läsa projektfilen %s." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -821,11 +858,11 @@ "%s\n" "Avbryt" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "Bildfilformatet stöds ej" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -834,7 +871,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -845,77 +882,77 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 msgid "Should the position of images in each stack be linked?" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -923,44 +960,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "Återställ projekt" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "Kommandoradsalternativ" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "Skriva över existerande bildfiler?" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "Bildfil kunde inte hittas" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "Välj bildredigeringsprogram" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -971,16 +1008,17 @@ "\n" "Tryck OK för att ta bort." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "Ett fel har detekterats" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "Lägg till bilder" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -989,32 +1027,32 @@ "Fel, mallen anger %d bilder,\n" "nuvarande projekt innehåller %d bilder\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "Kunde inte använda mall" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "Fel när projektfilen öppnades" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "Resultat" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc-katalogen kunde inte hittas i programpaketet" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "Fatalt fel" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1048,7 +1086,7 @@ "redan tillagda bilder.\n" "Kontollera att du valt rätt bilder att lägga till." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "Lägg till bild: avbryt" @@ -1061,9 +1099,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1080,7 +1118,7 @@ msgstr "Söker linjer..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "Klart" @@ -1093,11 +1131,11 @@ "Det finns inga detekterade linjer. \n" "Kör \"Hitta linjer\" innan. Ändra parametrarna om inga linjer hittas." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "Optimerar objektiv-distortions-parametrar..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1107,151 +1145,151 @@ "Kör \"Hitta linjer\" och \"Optimera\" innan objektiv-data sparas. Ändra " "parametrarna om inga linjer hittas." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 #, fuzzy msgid "Save lens parameters to ini file" msgstr "Spara objektivparametrar till en fil" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "Spara objektivparametrar till en fil" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #, fuzzy msgid "Saving lens data" msgstr "Läs in objektivinformation..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "Spara objektiv" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "Spara projektfil" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "Projekt filer (*.pto)|*.pto|Alla filer (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 #, fuzzy msgid "Removing temporary files..." msgstr "städar upp tillfälliga nyckelpunktsfiler" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "Assistent körs" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "Antal masker" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 #, fuzzy msgid "prefix used for stitching" msgstr "redigera skript innan sammanfogning" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "Kör kommando \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "Operativsystem: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "Arkitektur: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "Ledigt minne: %ld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "Aktiv Kodsida: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "Version: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "Sökväg till resurser: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "Sökväg till data: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "Kamera och objektiv-data" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "Kunde inte läsa projektfilen %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 #, fuzzy msgid "Libraries" msgstr "Kataloger" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "Autopano från http://autopano.kolor.com är inte tillgängligt för OSX" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "Använder Autopano-Sift istället" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1259,91 +1297,96 @@ "Minst ett inmatningsfält är tomt.\n" "Kontrollera dina inmatningar." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "Försök att binda samman alla överlappande bilder." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "Arbeta bara med bildpar utan kontrollpunkter" -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "Välj KontrollPunktsDetektorprogram" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "Exekverbara koder (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "vänster x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "vänster y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "höger x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "höger y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "Lägesjustering" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "Avstånd" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "ny kontrollpunkt tillagd" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "söker motsvarande punkter..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "Fel under finjustering" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "" -"Kontrollpunkt finjusterad, vinkel: %.0f av grader, korrelationskoefficient: " -"%0.3f, kurvatur: %0.3f %0.3f " +"Kontrollpunkt finjusterad, vinkel: %.0f av grader, korrelationskoefficient: %" +"0.3f, kurvatur: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "byt par, eller högerklicka för att lägga till paret" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "Beräknad punkt är utanför bilden" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "Ingen liknande punkt hittades." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1354,31 +1397,37 @@ "Korrelationskoefficienten (%.3f) är lägre än gränsvärdet som är satt i " "programinställningarna." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "lägg till en ny linje" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "Linje %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "Gränsvärde för korrelation:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "normal" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "vert. Linje" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "hor. Linje" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1388,93 +1437,94 @@ "Ange ett större tal,\n" "för att skapa färre punkter." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "Tröskelvärde för hörndetektering" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "Skapa kontrollpunkter" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "Hörndetekteringsskala" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "Fel under kontrollpunktsgenerering:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "Välj punkt i höger bild" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "" "Kan inte köra Celeste utan minst en gemensam kontrollpunkt mellan två bilder" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "Celeste körs" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "Läser in modellfil" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "%lu kontroll-punkter borttagna" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Resultat från Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "Städning" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "Skapa" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "Försöker att ta bort kontrollpunkter från moln" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "Nollställ batch" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "Ta bort felaktiga kontrollpunkter med en statistisk metod" @@ -1486,23 +1536,23 @@ msgid "Could not process event!" msgstr "Kunde inte processa event" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "vänster bild" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "höger bild" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1510,7 +1560,7 @@ "Ange minsta kontrollpunktsavvilkelse.\n" "Alla punkter med större avvikelse kommer att markeras" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "Välj kontrollpunkter" @@ -1588,60 +1638,60 @@ "Dra för att flytta bilder (lås riktning med shift om så önskas), eller rolla " "med högerklick-dra eller ctrl-dra" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "Snabb Panorama Förhandsvisning" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "&File" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "visade bilder" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "Alla" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "Ingen" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "Göm" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "VFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "dra för att ändra vertikalt synfält" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "HFOV" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "dra för att ändra horisontellt synfält" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "Förhandsvisning" @@ -1649,85 +1699,90 @@ msgid "Overview" msgstr "Översikt" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 #, fuzzy msgid "Resets the projection's parameters to their default values." msgstr "Återställ projektionsparametrarna till deras grundinställning." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 #, fuzzy msgid "No images loaded." msgstr "inga bilder inlästa" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu bilder inlästa." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "Bilder är förbundna med %lu kontrollpunkter.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "%d ej förbundna bildgrupper hittade:" -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "Bilder eller kontrollpunkter har förändrats, ny lägesjustering behövs." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "Medelfel efter optimering: %.1f pixel, max: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "Rektilinjär" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "Cylindrisk" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "Yaw-värdet måste vara numeriskt" -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "Pitch-värdet måste vara numeriskt" -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "Roll-värdet måste vara numeriskt" -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X-värdet måste vara numeriskt." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y-värdet måste vara numeriskt." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z-värdet måste vara numeriskt." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "Värdet måste vara numeriskt." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1735,55 +1790,55 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "skillnad" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "Automatbeskärning" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "Beräknar optimal beskärning" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "Topp måste vara ett heltal större än noll" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "vänster måste vara ett heltal större än noll" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "höger måste vara ett heltal större än noll" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "botten måste vara ett heltal större än noll" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "den vänstra gränsen måste vara mindre än den högra" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "den övre kanten måste vara mindre än den nedre" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "Ogiltigt HFOV-värde. Maximalt HFOV för denna projektion är %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "Ogiltigt VFOV-värde. Maximalt VFOV för denna projektion är %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" @@ -1791,7 +1846,7 @@ "Med mycket stor bildvinkel kommer panoraman med rektilinjär projektion att " "bli mycket utsträckta mot kanterna.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." @@ -1799,15 +1854,15 @@ "Bildvinkeln är endast mycket stor i horisontell led. Prova därför cylindrisk " "projektion istället." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "Prova equirectangulär projektion för mycket vida panoraman istället." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "Du kan också prova Panini-projektion." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1819,7 +1874,7 @@ "En ekvitangulär projektion skulle få plats med samma bildinnehåll på mindre " "vertikal yta." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1830,7 +1885,7 @@ "Cylindrisk projektion bevarar vertikala linjer raka, till skillbnad från den " "ekvitangulära projektionen." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1842,7 +1897,7 @@ "En konform projektion bevarar vinklar omkring en punkt, vilket oftare kan se " "behagligare ut." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1854,7 +1909,7 @@ "Fisheye-panoramaprojektionen komprimerar så att du kan visa en stor " "bildvinkel och fortfarande få rimligt utseende av cetrala delar av bilden." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." @@ -1862,7 +1917,7 @@ "Genom att välja rektilinjär panorama-projektion kommer raka linjer att " "förbli raka." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1871,27 +1926,27 @@ "Du har gömt info-panelen, som visar tips om projektionsval.\n" "Om du vill se panelen kan du aktivera den igen i programinställningar." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "normal, individuell" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "mosaik" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "mosaik, individuell" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "Panosfär" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "Mosaikplan" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1899,24 +1954,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1925,31 +1980,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "Städa kontrollpunkter" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "Processar:" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "söker motsvarande punkter..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "Kontrollerar parvis" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1957,7 +2012,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1965,7 +2020,7 @@ "Ett fel uppstod när GLEW initialiserades\n" "Det snabba förhansvisningsfönstret kan inte öppnas." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 #, fuzzy msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " @@ -2010,7 +2065,7 @@ msgstr "Antal masker" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "Beskärning" @@ -2046,7 +2101,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 #, fuzzy msgid "Stacks" @@ -2250,7 +2305,7 @@ msgid "Shutter speed" msgstr "Slutartid:" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 #, fuzzy msgid "ISO" msgstr "ISO" @@ -2426,101 +2481,101 @@ msgid "Camera response parameter" msgstr "Kamerarerspons" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "Objektiv" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr "Stackar:" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "Resultatfiler" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "Sammanfogade exponeringslager" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "Länka" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 #, fuzzy msgid "Select all" msgstr "Återställ allt" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 #, fuzzy msgid "Unselect all" msgstr "Icke vald" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 #, fuzzy msgid "Edit image variables..." msgstr "Bildvariabler:" -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "Spara mask" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "Spara mask" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "visade bilder" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "Antal punkter per bild" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 #, fuzzy msgid "Control points" msgstr "Kontrollpunkter" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2553,12 +2608,24 @@ msgid "Did you know..." msgstr "Visste du att..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "Version %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2566,75 +2633,75 @@ "Fatalt installationsfel\n" "Filinformationen/splash.png hittades inte vid:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "&Hjälp" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "&Actions" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "Resultatfiler" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 msgid "User defined output sequences" msgstr "" -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "&Redigera" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "Assistent körs" -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "Assistent körs" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "Startad" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "Optimerare" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "Exponering" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "Spara förändringar av panoramat innan stängning?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "Spara förändringar av panoramat innan stängning?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "Spara förändringar av panoramat innan stängning?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " @@ -2643,7 +2710,7 @@ "Om du stänger utan att spara kommer ändringar gjorda sedan senaste sparning " "att förloras" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " @@ -2652,7 +2719,7 @@ "Om du stänger utan att spara kommer ändringar gjorda sedan senaste sparning " "att förloras" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " @@ -2661,41 +2728,41 @@ "Om du stänger utan att spara kommer ändringar gjorda sedan senaste sparning " "att förloras" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "Spara inte" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "Stäng utan att spara" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "forcerad stängning" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "sparat projekt %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - Panoramaförenare" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 #, fuzzy msgid "Panorama editor" msgstr "Panorama Förhandsvisning" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2708,36 +2775,36 @@ "\n" "(Felkod: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "Spara PTmender script-fil" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender filer (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "Öppna projekt:" -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "Projekt öppnat" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "Läser in bilder" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "Fel när projekt öppnades:" -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "Öppna projektfil" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2745,11 +2812,11 @@ "Do you want to add this image file to the current project?" msgstr "" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "Öppna projekt: avbryt" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2757,7 +2824,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2765,34 +2832,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "Kunde inte läsa projektfilen %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "Öppna en projektfil" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "Mask filer (*.msk)|*.msk|Alla filer (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "Välj mallprojekt" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "Finjusterar alla punkter" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "Finjustering" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2820,23 +2887,23 @@ "\n" "Använd Kontrollpunktlistan (F3) för att se alla punkter i detta projekt\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "Finjustera resultat" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "Tar bort kontroll-punkter i masker" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "Välj python-skript" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python-skript (*.py)|*.py|All files (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2845,13 +2912,13 @@ "Filen \"%s\" hittades inte.\n" "Kanske har den blivit omdöpt, flyttad eller raderad." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "Fel!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." @@ -2859,54 +2926,54 @@ "Den förväntade Celeste-modell i %s hittades inte, Hugin måste vara korrekt " "installerad." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "Kunde inte läsa in Celeste-modellfilen %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" "These features are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" "These parameters are not supported in simple interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" "These parameters are not supported in advanced interface." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "Assistent körs" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "Varning %d ej förbundna bildgrupper har hittats:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2919,31 +2986,31 @@ "\n" "Klicka igen på knappen \"Anpassa \" när det är gjort." -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "" "Assistenten lyckades inte slutföra. Kontrollera projektfilen som skapades." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 #, fuzzy msgid "Project file not found" msgstr "Bildfil kunde inte hittas" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "Masktyp" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." @@ -2951,29 +3018,29 @@ "Skapa en polygonmask genom att klicka med vänster musknapp på bilden, använd " "höger musknapp för att sätta sista punkten." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "Spara mask" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "Mask filer (*.msk)|*.msk|Alla filer (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "Läser in mask" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "Läs in mask: avbryt" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "Kunde inte använda masken från file %s." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "Ange ett giltigt nummer" @@ -3110,7 +3177,7 @@ msgstr "Fotometrisk justering" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "Läser in bilder" @@ -3156,68 +3223,72 @@ msgid "Photometric optimization finished" msgstr "Fotometrisk optimering avslutad" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "Lägg till enstaka bilder" -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "Lägg till en tidsserie av bilder..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 #, fuzzy msgid "No matching images found." msgstr "Läser in bilder" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "Bildvariabler:" -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "Ta bort vald(a) bild(er)" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "Fixera denna bild för position" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "Fixera denna bild för exponering" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 #, fuzzy msgid "New lens" msgstr "Nytt objektiv" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "Byt objektiv..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "Ange nytt objektivnummer" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "Objektivnummer" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "Ändra objektivnummer" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "Läs in objektivinformation..." -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 #, fuzzy msgid "Load lens from ini file" msgstr "Läs in objektivparametrar från en fil" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3225,12 +3296,12 @@ "Du markerade bara en bild.\n" "Skulle inlästa parametrar gälla alla bilder tagna med samma objektiv?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "Fråga" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3241,109 +3312,109 @@ "resultat.\n" "Vil du ändå använda parametrarna?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 #, fuzzy msgid "Save lens to ini file" msgstr "Spara objektivparametrar till en fil" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 #, fuzzy msgid "Remove control points" msgstr "%d kontroll-punkter borttagna" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 #, fuzzy msgid "Selected images have no control points." msgstr "Minst en bild saknar kontrollpunkter helt." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, fuzzy, c-format msgid "Really delete %lu control points?" msgstr "Vill du verkligen radera %lu kontrollpunkter?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "Radera Kontrollpunkter" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "Städa kontrollpunkter" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "Städar kontrollpunkter" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "Kontrollerar parvis" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "Kontrollerar hela projektet" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "Rensning avslutad" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 #, fuzzy msgid "Remove control points on clouds" msgstr "Ta bort kontrollpunkter i masker" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "" -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 #, fuzzy msgid "Reset positions" msgstr "Återställ projekt" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "Knyt samman parametrar" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 #, fuzzy msgid "Reset lens parameters" msgstr "Återställ XYZ parametrar?" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 #, fuzzy msgid "Reset photometric parameters" msgstr "Återställ XYZ parametrar?" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "Ny stack" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "Byt stack..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "Ange nytt stacknummer" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "stacknummer" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "Ändra stacknummer" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 #, fuzzy msgid "Set stack size..." msgstr "Byt stack..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "Kvalitet:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3414,64 +3485,64 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Lambert Equal Area Azimuthal" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "bredd måste vara ett heltal större än noll" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "höjd måste vara ett heltal större än noll" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 #, fuzzy msgid "Left boundary must be smaller than right." msgstr "den vänstra gränsen måste vara mindre än den högra" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 #, fuzzy msgid "Top boundary must be smaller than bottom." msgstr "den övre kanten måste vara mindre än den nedre" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr " PTmender-alternativ är ännu inte implementerade" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "PTblender-alternativ är ännu inte implementerade" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "Alternativ för detta HDRMerge-program är ännu inte implementerade." -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "Kunde inte skapa en temporär projektfil" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "Specificera prefix på skapad fil" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 msgid "Select user defined output" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3481,7 +3552,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3494,7 +3565,7 @@ "minskas i sammafogningsfliken. Att generera ett så här stort panorama kan ta " "lång tid och kräva mycket minne." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3502,26 +3573,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "Är du säker på att du vill sammanfoga ett så stort panorama?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "Sammanfoga ändå" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "Låt mig fixa till det" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3552,185 +3623,204 @@ msgid "Miscellaneous" msgstr "Övrigt" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "Systemgrundinställning" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "Catalanska" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "Kinesiska (förenklad)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "Kinesiska (Traditionell)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "Czeckiska" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 #, fuzzy msgid "Danish" msgstr "Spansk" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "Holländska" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "Engelska" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "Franska" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "Tyska" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "Ungerska" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "Italienska" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "Japanska" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "Polska" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "Portugisiska (Brasiliansk)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "Ryska" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "Slovaksiska" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "Spansk" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "Svenska" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "Finska" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "Välj Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "Exekverbara koder (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "Välj Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "Återställ allt" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "Välj PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "Återställ allt" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "Logfiler (*.log)|*.log|Alla filer (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "Kunde inte läsa projektfilen %s." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "Vill du verkligen återställa visade inställningar till grundvärden?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "Läs in grundinställningar" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "Välj en inmatning först" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "Välj inmatning" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3738,29 +3828,29 @@ "Du kan inte radera senaste inställningen.\n" "Minst ett värde krävs." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "Vill du verkligen ta bort kontrollpnktdetektor-inställning \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "Radera KontrollPunktsDetektorinställning" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "Läs in KontrollPunktsDetektorinställning" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "KontrollPunktsDetektorInställningar (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "Spara KontrollPunktsDetektorinställning" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "" @@ -3787,50 +3877,55 @@ msgid "Remove %lu control points" msgstr "%lu kontroll-punkter borttagna" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "Panorama Förhandsvisning" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "Förhandsvisningsalternativ" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "projektion (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "Blend mode:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "Resultat:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "Komprimering:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "Projektionsparametrar" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "" "Vänsterklicka för att bestämma en ny centrumpunkt, högerklicka för att " "flytta punkt till horisonten." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "" "Centrera panoramat med vänster musknapp. Använd höger musknapp för att " @@ -3849,7 +3944,7 @@ msgid "Click a connection to edit control points." msgstr "Klicka på en förbindning för att redigera kontrollpunkter." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3857,33 +3952,115 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "\"%s\" hittades inte. Ange en giltig sökväg i programinställningarna." + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "\"%s\" hittades inte. Ange en giltig sökväg i programinställningarna." + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "Detekterar %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "Stäng" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, fuzzy, c-format msgid "Directory '%s' does not exists" msgstr "" "Katalog %s existerar inte.\n" "Ange en existerande katalog." -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "Batch Processor" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "Öppnar PTBatcher, batchprocessorn för Hugin's projekt filer" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Hugin ObjektivKalibrerings-GUI" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3898,11 +4075,11 @@ "Du har kanske inte installerat den korrekt eller angivit fel sökväg i " "inställningarna." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "städar upp tillfälliga nyckelpunktsfiler" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " @@ -3911,15 +4088,15 @@ "Använd %namefile, %i eller %s för att specificera in-filerna för " "kontrollpunktdeterktorn" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "Fel i kontrollpunktsdetekteringskommando" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3931,14 +4108,14 @@ "Välj färre bilder, eller placera bilderna i en mapp med\n" "ett kortare sökvägsnamn" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "För många bilder valda" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3950,38 +4127,38 @@ "\n" "Kunde inte utföra kommandot: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute-Fel" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "söker kontrollpunkter" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "Kunde inte utföra kommandot: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3990,9 +4167,9 @@ "Kommando %s\n" "misslyckades med felkod: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -4007,13 +4184,13 @@ "\n" "Utförde kommandot: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "KontrollPunktsDetektorfel" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" @@ -4021,7 +4198,7 @@ "Använd %i för att specificera in-filerna och %k för att specificera " "nyckelpunktsfilen för nyckelgenereringssteget" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" @@ -4029,11 +4206,11 @@ "Använd %k för att ange nyckelpunktfiler och %o för att ange " "resultatprojektfilen för matchningssteget" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "genererar nyckelfil" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -4046,11 +4223,11 @@ "\n" "Kunde inte utföra kommandot: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "Grundinställning" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -4058,263 +4235,263 @@ "Kan inte nollställa en pågående batch-körning.\n" "Vill du avsluta den?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "Batch nollställd." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "" "Ett fel uppstod: Kunde inte läsa status, projekt med index %d finns inte i " "listan." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "Fel: Kunde inte ladda in batch-fil." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "Batch successfullt genomförd." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "Batch " -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "Initsialiserar nerstängning" -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "Stänger ner..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "Initsialiserar nerstängning" -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "Initsialiserar nerstängning" -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "Spara projektfil" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "Inga resultatprefix har specificerats" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "Inga projektfiler har specificerats" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - Sammanfogar" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - Assistent" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "Fel, gick inte att ta bort, projekt med id %d finns inte med i listan." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "Fel: Kunde inte ta bort projektfil" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "Kör batch..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "Batch körs redan." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "Kör kommando \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "Sammanfogar nu %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "Detekterar %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "" "Ett fel uppstod: Kunde inte skriva status, projekt med index %d finns inte " "med i listan." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "Gör inte mycket..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "Ingenting" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "Stäng ner när det är klart" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "Ange det kommandoradsprogram som skall köras:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "Ange program" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "Ange en mapp att söka i efter project" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "Ange projekt-källfil(er)" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "Lade till projekt från dir" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "Lägg till projekt %s till sammanfogningskön." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "Lägg till projekt %s till assistentkö" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "Batch stoppad" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 #, fuzzy msgid "Hugin's Batch processor" msgstr "Hugins Batch Processor" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "Specificera prefix på skapad projektfil" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "Prefixet på ett assistentmål kan inte ändras." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "Välj ett projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "Välj ett projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "Ange batchfil som skall öppnas" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "Projekt filer (*.ptb)|*.ptb;|Alla filer (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "Kan inte öppna app i Hugin." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "Inget projekt valt. Skall Hugin startas utan projekt?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "Batch pausad" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "Fortsätter batch..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4322,7 +4499,7 @@ "Det finns projekt som misslyckats i listan.\n" "Skall dom tas bort också?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4330,16 +4507,16 @@ "Kan inte ta bort ett pågående projekt.\n" "Vill du avbryta det?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "Tog bort projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "Välj ett projekt att ta bort" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4347,16 +4524,16 @@ "Kan inte återställa ett pågående projekt.\n" "Vill du avbryta det?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "Återställ projekt" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "Välj ett projekt att återställa" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4364,31 +4541,31 @@ "Kan inte återställa pågående projekt.\n" "Vill du avbryta batchen?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "Ange batchfil som skall sparas" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "Projektfil (*.ptb)|*.ptb;|Alla filer (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "Nollställ batch" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "Startar batch" @@ -4426,7 +4603,7 @@ msgid "E&xit" msgstr "E&xit" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4436,11 +4613,11 @@ "Om du stänger dialogrutan kommer du att förlora dem.\n" "Vill du fortsätta ändå?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "Godkännt" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4450,11 +4627,11 @@ "Om du fortsätter kommer de inte bli behandlade.\n" "Vill du forfarande fortsätta?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "Stopp" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4463,7 +4640,7 @@ "Katalog %s existerar inte.\n" "Ange en existerande katalog." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4471,7 +4648,7 @@ "Du har inte markerat något möjligt panorama.\n" "Markera minst ett panorama och försök igen." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4481,142 +4658,144 @@ "Du har kanske inte skrivrättigheter för dessa kataloger, eller så är din " "hårddisk full." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "Ta bort valda bilder från detta projekt" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "Söker panoraman" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "Läser in fil %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "Starta" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "Hittade %d möjliga panorama." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "Inga möjliga panorama hittades" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d bilder: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "Syntaxfel detekterat bland parametrar, avbryter." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 #, fuzzy msgid "PTBatcherGUI started" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "Väntar" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "Pågår" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "Komplett" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "Misslyckades" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "Fil saknas" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "Pausad" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "ID" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "Projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "Prefix på ut-fil" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "Status" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "Senast ändrad" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "Ut-filformat" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "Projektion" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "Storlek" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "Fel, kan inte omvandla id" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "Assistent" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "Byt prefix" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "Återställ projekt" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "Redigera med Hugin" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "Ta bort" @@ -4653,16 +4832,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "Logfiler (*.log)|*.log|Alla filer (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "Kunde inte läsa projektfilen %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "Ange project source projektfil" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4672,7 +4851,7 @@ "Hugin kan inte arbeta med detta filnamn. Ange ett tillåtet filnamn." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "Om Hugin" @@ -4705,19 +4884,19 @@ msgstr "System" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "OK" @@ -4798,8 +4977,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "Välj..." @@ -4890,7 +5072,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "Alternativ" @@ -4925,10 +5107,6 @@ msgid "Send selected panoramas to queue" msgstr "Skicka valda panorama till kö" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "Stäng" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "Söker panoraman" @@ -5033,12 +5211,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "&Avsluta" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "Avsluta program" @@ -5143,47 +5321,153 @@ msgid "adddir" msgstr "adddir" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "föregående bildpar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "Beskrivning:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "nästa bildpar" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "Typ:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "typ:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "Alla bilder genast" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "vertikal linje" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "Panorama med stackar" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "horisontell linje" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "multippel-radspanorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "Zoom:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "Multi-radspanorama med stackar" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "passa till fönster" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "Förjusterat panorama" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "Finjustera" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "Detektor" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "Försöker optimera den nu aktiva punkten" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "Enstegsdetektor" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "Program:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "Argument:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "Städa argument:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "Tvåstegsdetektor" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "Känneteckens-deskriptor:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "Känneteckens-parare:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "Detektor för stackar" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "Lämna tom, när ingen kontrollpunktsdetektor skall köras på stackar." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "Avancerade alternativ" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "Denna inställning har inga avancerade alternativ." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"följande mönster kommer att bytas ut innan körningen:\n" +"%o -- utgångsprojekt (0.oto kommer att läggas till när Autpano används)\n" +"%p -- antal kontrollpunkter mellan varje bildpar\n" +"%v -- HFOV från första bilden\n" +"%f -- projektion från första bilden (0-4, som i panotools)\n" +"%i -- bildfiler\n" +"%namefile -- fil som innehåller bildfilernas namn\n" +"%s -- ange panotools script%k -- mellanliggande nyckelfil(er)" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "Parametrar för Kontrollpunktdetektorer" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "föregående bildpar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "nästa bildpar" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "typ:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "vertikal linje" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "horisontell linje" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "Zoom:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "passa till fönster" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "Finjustera" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "Försöker optimera den nu aktiva punkten" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" msgstr "&Automatisk finjustering" #: hugin1/hugin/xrc/cp_editor_panel.xrc:267 @@ -5239,7 +5523,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "Ta bort" @@ -5247,153 +5531,195 @@ msgid "Select by Distance" msgstr "Välj efter avstånd" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "Beskrivning:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "Grundvärde, Filformat:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "Typ:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (av A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "Alla bilder genast" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +#, fuzzy +msgid "No" +msgstr "Ingen" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "Panorama med stackar" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "Redigera Panorama Tools Script" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "multippel-radspanorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "" +"Detta är skriptet som kommer att skickas till Panorama Tools engine. Att " +"redigera dessa rader är en avancerad metod." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "Multi-radspanorama med stackar" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "Fortsätt med dessa ändringar" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "Förjusterat panorama" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "Överge förändringar och avbryt" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "Detektor" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "Enstegsdetektor" +#: hugin1/hugin/xrc/images_panel.xrc:42 +#, fuzzy +msgid "Minimum overlap:" +msgstr "Minimum linje-längd:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "Program:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "Argument:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +#, fuzzy +msgid "Maximum Ev difference:" +msgstr "skillnad" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "Städa argument:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "Tvåstegsdetektor" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "Känneteckens-deskriptor:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "Allmän" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "" + +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +#, fuzzy +msgid "Positions" +msgstr "Bildpossition" + +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "Objektivparametrar " + +#: hugin1/hugin/xrc/images_panel.xrc:96 +#, fuzzy +msgid "Photometric parameters" +msgstr "Fotometrisk justering" + +#: hugin1/hugin/xrc/images_panel.xrc:130 +#, fuzzy +msgid "Lens type" +msgstr "Objektivtyp:" + +#: hugin1/hugin/xrc/images_panel.xrc:145 +#, fuzzy +msgid "Add images..." +msgstr "Lägg till bilder" + +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "Objektivtyp:" + +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "Brännviddsmultiplikator:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +#, fuzzy +msgid "Feature Matching" msgstr "Känneteckens-parare:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "Detektor för stackar" +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "Inställningar:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "Lämna tom, när ingen kontrollpunktsdetektor skall köras på stackar." +#: hugin1/hugin/xrc/images_panel.xrc:254 +#, fuzzy +msgid "Run selected control point detector on the selected images" +msgstr "Ta bort kontrollpunkter mellan valda bilder" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "Avancerade alternativ" +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "Optimera" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "Denna inställning har inga avancerade alternativ." +#: hugin1/hugin/xrc/images_panel.xrc:293 +#, fuzzy +msgid "Geometric:" +msgstr "Geometrisk" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" msgstr "" -"följande mönster kommer att bytas ut innan körningen:\n" -"%o -- utgångsprojekt (0.oto kommer att läggas till när Autpano används)\n" -"%p -- antal kontrollpunkter mellan varje bildpar\n" -"%v -- HFOV från första bilden\n" -"%f -- projektion från första bilden (0-4, som i panotools)\n" -"%i -- bildfiler\n" -"%namefile -- fil som innehåller bildfilernas namn\n" -"%s -- ange panotools script%k -- mellanliggande nyckelfil(er)" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "Parametrar för Kontrollpunktdetektorer" - -#: hugin1/hugin/xrc/dlg_warning.xrc:35 +#: hugin1/hugin/xrc/images_panel.xrc:314 #, fuzzy -msgid "Invalid filenames" -msgstr "Grundvärde, Filformat:" +msgid "Photometric:" +msgstr "Fotometrisk" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "Redigera Panorama Tools Script" +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "Vald bild" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "Läs in objektivinformation..." + +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" msgstr "" -"Detta är skriptet som kommer att skickas till Panorama Tools engine. Att " -"redigera dessa rader är en avancerad metod." +"Ange det horisontella synfältet (HFOV) eller brännvidd och beskärningsfaktor:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "Fortsätt med dessa ändringar" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "HFOV (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "Överge förändringar och avbryt" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "grader" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "Kamera och objektiv-data" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "Yaw:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "Pitch:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "Roll:" @@ -5402,35 +5728,11 @@ msgid "Translation parameter" msgstr "Knyt samman parametrar" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -#, fuzzy -msgid "Positions" -msgstr "Bildpossition" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "synfältsvinkel (v):" @@ -5531,7 +5833,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "Hjälp" @@ -5576,8 +5878,8 @@ msgstr "Ladda" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "Spara" @@ -5590,129 +5892,47 @@ msgid "Manipulate image variables" msgstr "Bildvariabler:" -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:42 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Minimum overlap:" -msgstr "Minimum linje-längd:" +msgid "WB reference:" +msgstr "&Programinställningar" -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:67 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 #, fuzzy -msgid "Maximum Ev difference:" -msgstr "skillnad" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "Allmän" +msgid "Additional dcraw parameters:" +msgstr "Ytterligare argument:" -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "Objektivparametrar " - -#: hugin1/hugin/xrc/images_panel.xrc:96 -#, fuzzy -msgid "Photometric parameters" -msgstr "Fotometrisk justering" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -#, fuzzy -msgid "Lens type" -msgstr "Objektivtyp:" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -#, fuzzy -msgid "Add images..." -msgstr "Lägg till bilder" - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "Objektivtyp:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "Brännviddsmultiplikator:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -#, fuzzy -msgid "Feature Matching" -msgstr "Känneteckens-parare:" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "Inställningar:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 -#, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "Ta bort kontrollpunkter mellan valda bilder" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "Optimera" - -#: hugin1/hugin/xrc/images_panel.xrc:293 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 #, fuzzy -msgid "Geometric:" -msgstr "Geometrisk" +msgid "Processing profile:" +msgstr "Processar:" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -#, fuzzy -msgid "Photometric:" -msgstr "Fotometrisk" - -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "Vald bild" - -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "Läs in objektivinformation..." - -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" msgstr "" -"Ange det horisontella synfältet (HFOV) eller brännvidd och beskärningsfaktor:" - -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "HFOV (v):" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "grader" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "Kamera och objektiv-data" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "Import" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5868,15 +6088,6 @@ msgid "Don't ask again" msgstr "" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -#, fuzzy -msgid "No" -msgstr "Ingen" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5937,21 +6148,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "&Ångra" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "Ångra senaste åtgärd" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "&Gör om" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "Gör om senaste åtgärd" @@ -5999,12 +6210,12 @@ msgid "Use only normal control points in optimization." msgstr "Antal punkter per bild" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "&Optimera" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "Kör optimeraren igen med nuvarande inställningar" @@ -6036,16 +6247,16 @@ msgid "Run a python script" msgstr "Kör ett Python-skript" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "&Visa" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "Fullskärm" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 #, fuzzy msgid "Shows Hugin's main window on full-screen" msgstr "Visar Hugins huvudfönster på fullskärm" @@ -6130,20 +6341,20 @@ msgid "Show the Stitcher panel" msgstr "Batch Sammanfogningsfliken" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 msgid "&Simple" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "Avancerade alternativ" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 msgid "&Expert" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "Användargränssnitt" @@ -6165,86 +6376,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "Lite information om de olika knapparna osv." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "&Dagens tips" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "Visa ett av dagens tips." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "&Tangentbordsgenvägar" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "tangentbordsgenvägar" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "&FAQ" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "Ofta ställda frågor (FAQ)" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "&Om" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "&Programinställningar" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "&Nytt" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "Nytt projekt" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "&Öppna" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "Öppna projekt" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "&Spara" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "Spara nuvarande projekt fil" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "Spara som" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "Spara nuvarande projekt till en ny fil" @@ -6260,19 +6471,19 @@ "Spara nuvarande projekt till en PTStitcher-kompatibel script-fil, användbar " "för batch-körningar" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "Senast använda projekt" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "Lista på senast använda projektfiler" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "&Kör Batch Processor" @@ -6359,7 +6570,7 @@ msgid "Show the OpenGL preview image" msgstr "Visa OpenGL-förhandsvisningsbilden" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "Förhandsvisa panorama" @@ -6416,15 +6627,10 @@ msgstr "Exkludera region från alla bilder från detta objektiv" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "Export" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "Import" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "Kopiera" @@ -6469,8 +6675,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6578,7 +6784,8 @@ msgid "execute the PTOptimizer engine" msgstr "Aktivera PTOptimizer-motorn" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "Bildorientering" @@ -6624,39 +6831,39 @@ msgid "Interpolator (i):" msgstr "Interpolator (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubisk)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "Bilinjär" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "Närmsta granne" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "approximation av värden mellan källpixlar" @@ -6684,7 +6891,7 @@ msgid "Enfuse options" msgstr "Enfuse-alternativ" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "Bildfält:" @@ -6849,10 +7056,6 @@ msgid "Image fusion:" msgstr "Bildsammansmältning:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR förenare:" @@ -6954,16 +7157,16 @@ msgid "Output parameters" msgstr "Markerade parametrar nedan" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "Blend mode:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "enblend-fel" @@ -7035,29 +7238,45 @@ msgid "This affects the control points editor and mask editor." msgstr "Ta bort kontrollpunkter i masker" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Enblend exekverbar fil:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(lämna tomt för OS-grundinställning)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Enblend exekverbar fil:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Enblend exekverbar fil:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "Filalternativ" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "Tempdir:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(lämna tomt för OS-grundinställning)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 #, fuzzy msgid "Default project filename:" msgstr "Öppna en projektfil" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 #, fuzzy msgid "Default output prefix:" msgstr "Specificera prefix på skapad fil" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -7075,46 +7294,46 @@ "%projectname - project filename (only for output prefix)" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 #, fuzzy msgid "Default filenames" msgstr "Grundvärde, Filformat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 #, fuzzy msgid "Filenames" msgstr "Filnamn" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "Bild läses in" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "Placera automatiskt ut bilderna när de lästs in." -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 #, fuzzy msgid "Detect vertical lines" msgstr "vertikal linje" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "Ta bort molnliknande kontroll-punkter (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "Autojustering" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -7122,67 +7341,67 @@ "Antal kontrollpunkter\n" "per överlappning" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "Skala ner slutligt panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "procent av max bredd" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "KontrollPunktsRedigerare" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR och 16-Bits visninig" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "Kurva" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "linjär" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "logaritmisk" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "gamma 2,2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "använd för visning i GUI" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "Lappbredd:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "pixlar" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "Sökområdesbredd:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "procent av bildbredd" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "Lokal sökområdesbredd:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "Gränsvärde för korrelation:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -7190,11 +7409,11 @@ "0: ingen likhet\n" "1: maximal likhet" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "Gränsvärde för toppkurvatur:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -7202,118 +7421,114 @@ "0: ingen topp\n" "0.2: distinkt topp" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "Rotationssökning" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "Aktivera rotationssökning (långsammare, men mera noggrant)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "Startvinkel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "Stoppvinkel:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "Steg:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "KontrollPunktsDetektorer" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "KontrollPunktDetekteringsProgram" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "Ny..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "Redigera" -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "Flytta upp" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "Flytta ner" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "Ställ in grundinställning" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "Assistenten använder grundinställningsvärdet." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "Ut-filformat" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "Grundvärde, Filformat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "grundformat för slutligt panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF-komprimering:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "TIFF-komprimeringsgrundvärde" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG-kvalitet:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "Grundvärde, JPEG komprimering" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "Sammanfogare:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "Grundvärde, Filformat:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "Processor" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "Processen som kommer att köra sammanfogningen" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "Starta sammanfognings-jobb genast" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7323,19 +7538,19 @@ "direkt. Annars kommer den att vänta på att användaren startar bearbetningen " "manuellt." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "Skriv över existerande bildfiler" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "VARNING: existerande filer kommer att skrivas över." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "Verbose output" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." @@ -7343,20 +7558,20 @@ "Aktivera för att visa detaljer, användbart vid buggrapportering, eller för " "att se vad som händer under projektkörningen." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "Sammanfogar" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Enfuse-alternativ" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7365,58 +7580,58 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "(lämna tomt för OS-grundinställning)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 #, fuzzy msgid "Advanced options" msgstr "Avancerade alternativ" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 #, fuzzy msgid "Number of threads:" msgstr "Antal masker" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 #, fuzzy msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " @@ -7428,83 +7643,84 @@ "Sätt denna parameter till antalet processorer eller processorkärnor som " "finns tillgängliga i ditt system" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "Sammanfogar" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "Grundinställnings-Interpolator (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "Skapa beskurna bilder som grundvärde" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "Använd GPU för ommappning (EXPERIMENTEL)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "Använd bildskärmkortets GPU för att snabba upp ommappningen" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "Använd alternativt Enblend program" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend exekverbar fil:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "Grundvärden:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 #, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "Dessa är grundvärdena. De kan ändras för enskilda projekt under " "sammanfogningsfliken.\n" "Ange inte -w, -o och --compression värden, dom styrs av hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "Använd alternativt Enfuse program" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse exekverbar fil:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "Program" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste-parametrar" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM-gränsnivå: " -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7512,19 +7728,19 @@ "större än 0.5: mindre känslig\n" "mindre än 0.5: mera känslig" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor-filterstorlek" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "liten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "stor" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7532,7 +7748,7 @@ "stor är mera nogran \n" "liten kan undersöka kontrollpunkter nära bildkanten" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7543,78 +7759,78 @@ "För att snabba upp beräkningarna används bara en slupmässigt utvald delmängd " "av punkter." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 #, fuzzy msgid "Number of points per image: " msgstr "Antal punkter per bild" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 #, fuzzy msgid "Photometric optimizer" msgstr "Fotometrisk optimering" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "Varning" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "Optimerar Panorama" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "Optimera nu!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "Tipsen visas endast i snabbförhandsvisningsfönstret" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "Övrigt" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "Programinställningar - Hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "Välj punkt i vänster bild" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7634,11 +7850,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "Centrera förhandsvisningen horisontellt" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "Centrera" @@ -7646,13 +7862,15 @@ msgid "Show the whole panorama" msgstr "Visa hela panoramat" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "Beräkna synfältet" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "Anpassa" @@ -7660,7 +7878,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "Räta automatiskt ut en vågig horisont" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "Räta ut" @@ -7757,33 +7976,33 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "Sätt exponeringsvärdet till medelexponeringen av alla bilder." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "Gråprovtagare" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "Korrigera global vitbalans genom att välja ett neutral-grått område." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "&Redigera" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "Radera KontrollPunktsDetektorinställning" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "Skala:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 #, fuzzy msgid "" "* A gray line indicates there are no control points, but the image pair " @@ -7798,167 +8017,155 @@ "* Klicka på en linje för att redigera motsvarande bilder i Kontrollpunkts-" "fliken. " -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "Layout" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "x" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 #, fuzzy msgid "Golden ratio" msgstr "Mappnamn.pto" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "Räta automatiskt ut en vågig horisont." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "Dra för att flytta:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "Använd" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "Flytta panoramat eller drag bilder på plats" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "Flytta/Dra" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "" "Ställ in beskärningsområdet till den största rektangel som täcks av bilder" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 #, fuzzy msgid "HDR Autocrop" msgstr "Automatbeskärning" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 #, fuzzy msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "" "Ställ in beskärningsområdet till den största rektangel som täcks av bilder" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "vänster: " -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "top: " -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "höger: " -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "botten: " -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "Återställ beskärning till max möjligt område" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "Ändra panoramats beskärningsområde" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 #, fuzzy msgid "Panorama &editor" msgstr "Panorama Förhandsvisning" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 #, fuzzy msgid "&Overview" msgstr "Översikt" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 #, fuzzy msgid "Shows the overview of the panorama sphere." msgstr "Visa förhandsbilden och Panoramadruiden" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "Stödlinjer" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "Lägg till bilder" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "Länka positionerna över denna stack." -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "Ommappade sammansmälta stackar" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "Länka positionerna över denna stack." -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "byt objektiv för markerade bilder" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "Återställ projekt" @@ -8255,6 +8462,78 @@ "med kraftigt överlappande bilder och många väl distribuerade kontrollpunkter." #, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "&Programinställningar" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "Bilder" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "Lägg till bilder" + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "Lägg till ytterligare en bild till nuvarande projekt" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "Ta bort denna bild" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "Ta bort vald(a) bild(er)" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "Hörndetekteringsskala" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "&Importera projekt..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "Flytta panoramat eller drag bilder på plats" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "Ändra panoramats beskärningsområde" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "Använd GPU för ommappning (EXPERIMENTEL)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "Alla bildfiler|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG filer (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF filer (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG filer (*.png)|*.png;*.PNG|HDR filer " +#~ "(*.hdr)|*.hdr;*.HDR|EXR filer (*.exr)|*.exr;*.EXR|Alla filer (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (av A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "x" + +#, fuzzy #~ msgid "Interface" #~ msgstr "Användargränssnitt" @@ -9182,9 +9461,6 @@ #~ msgid "Flatfield" #~ msgstr "Flatfield" -#~ msgid "Image file:" -#~ msgstr "Bildfil:" - #~ msgid "Polynomial" #~ msgstr "Polynom" @@ -9408,9 +9684,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#~ msgid "&Import Project..." -#~ msgstr "&Importera projekt..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9511,10 +9784,6 @@ #~ "Autopano-SIFT hittades inte. Ange en giltig sökväg i " #~ "programinställningarna." -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "" -#~ "\"%s\" hittades inte. Ange en giltig sökväg i programinställningarna." - #~ msgid "Error in Autopano command" #~ msgstr "Fel i Autopano kommando" @@ -9603,9 +9872,6 @@ #~ msgid "PTStitcher note" #~ msgstr "PTStitcher notis" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "Välj PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "Ingen PTStitcher.exe vald" @@ -9811,9 +10077,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "Fel under bildinläsning: %s" -#~ msgid "Remove this image" -#~ msgstr "Ta bort denna bild" - #~ msgid "Stitching Options" #~ msgstr "Sammanfogningsalternativ" @@ -10001,9 +10264,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend:" -#~ msgid "Additional Arguments:" -#~ msgstr "Ytterligare argument:" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "Sätt inte argumenten -w och -o, dom sätts av Hugin" diff -Nru hugin-2018.0.0+dfsg/src/translations/unix_linebreaks.pl hugin-2019.0.0+dfsg/src/translations/unix_linebreaks.pl --- hugin-2018.0.0+dfsg/src/translations/unix_linebreaks.pl 1970-01-01 00:00:00.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/unix_linebreaks.pl 2018-02-03 14:34:29.000000000 +0000 @@ -0,0 +1,24 @@ +#!/usr/bin/env perl +use warnings; +use strict; + +die 'No file given' unless scalar @ARGV>0; +my @allFiles; +while(my $f=shift @ARGV) +{ + push @allFiles, glob $f; +}; +die 'No matching file found' unless scalar @allFiles>0; + +foreach my $file (@allFiles) +{ + print "Processing $file\n"; + open(my $inputFile, '<', $file) or next; + binmode $inputFile; + open(my $outputFile, '>', "$file.new") or next; + binmode $outputFile; + while(<$inputFile>){ s/\cM//g; print $outputFile $_;}; + close $inputFile; + close $outputFile; + rename("$file.new", "$file"); +}; diff -Nru hugin-2018.0.0+dfsg/src/translations/xrc_pot.py hugin-2019.0.0+dfsg/src/translations/xrc_pot.py --- hugin-2018.0.0+dfsg/src/translations/xrc_pot.py 2013-04-20 14:44:38.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/xrc_pot.py 2018-02-03 14:34:29.000000000 +0000 @@ -46,10 +46,12 @@ (relativePath(infile, basefile), lineno, string)) def convertString(string): + string = string.replace('__', r'F;') + string = string.replace('_', r'&') + string = string.replace('\\n', r' ') string = string.replace('&', '&').replace('"', '"') - string = string.replace('_', '&') + string = string.replace('F;', '_') string = string.replace('<', '<').replace('>', '>') - string = string.replace('\\n', r' ') string = string.replace('\\', '\\\\').replace('"', r'\"') string = string.replace(' ', r'\n') #string = string.decode('iso-8859-1') # this is for python2 OK diff -Nru hugin-2018.0.0+dfsg/src/translations/zh_CN.po hugin-2019.0.0+dfsg/src/translations/zh_CN.po --- hugin-2018.0.0+dfsg/src/translations/zh_CN.po 2018-01-13 07:52:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/zh_CN.po 2019-02-17 15:24:33.000000000 +0000 @@ -2,14 +2,14 @@ msgstr "" "Project-Id-Version: for Hugin\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: 2014-05-25 12:55+0800\n" "Last-Translator: Lu Fang \n" "Language-Team: Simplified Chinese \n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "X-Generator: Poedit 1.6.5\n" #: hugin1/base_wx/AssistantExecutor.cpp:68 @@ -44,14 +44,14 @@ msgid "Searching for best crop..." msgstr "正在搜索似云控制点..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "没有在程序包中发现外部程序 %s, 恢复成系统目录" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -74,9 +74,9 @@ msgstr "Bitmap (*.bmp)|*.bmp|PNG 文件 (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "文件 %s 已存在. 是否覆盖?" @@ -112,7 +112,7 @@ msgstr "裁切系数必须是正数." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -125,24 +125,28 @@ "您仍然希望使用那个高值?" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -163,8 +167,8 @@ msgstr "全帧鱼眼" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "等矩形的" @@ -195,11 +199,13 @@ msgid "builtin" msgstr "内建" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "自定义 (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "线性的" @@ -223,16 +229,16 @@ msgid "Error loading lens parameters" msgstr "加载镜头参数出错" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "保存镜头参数文件" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "镜头项目文件 (*.ini)|*.ini|所有文件 (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "保存项目" @@ -264,22 +270,23 @@ msgid "Error pausing process %ld, code 2" msgstr "停止进程 %ld 错误, 代码 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "取消" @@ -317,12 +324,12 @@ msgid "Panorama Tools" msgstr "全景图像工具" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "不能打开项目文件:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "不能打开脚本: %s" @@ -332,8 +339,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "分析 panotools 脚本时出错: %s" @@ -347,17 +354,17 @@ msgid "Could not create temporary file" msgstr "不能创建临时文件" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "缝合时出错" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -365,11 +372,11 @@ "覆盖已经存在的图像?\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "覆盖已经存在的图像" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -378,12 +385,12 @@ "缝合项目时出错\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "运行助理时出错" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" @@ -392,291 +399,301 @@ "运行助理时出错\n" "%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "全景图像缝合中" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "版本: %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "" "\n" " 当前目录:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "输出前缀" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "Blender:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "内部错误" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "曝光:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "ExifTool 选项" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "ExifTool 选项" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "每张图像的点的编号:" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "输出曝光层 %ld" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "画布尺寸:" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "投影:" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "重定位时使用 GPU (实验性质)" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "全景图像输出:" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "曝光校正, 低动态范围" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "从堆栈中融合曝光" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "按排列融合曝光" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "高动态范围" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "重定位图像:" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "没有曝光校正, 低动态范围" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "组合堆栈:" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "堆栈融合曝光" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "层:" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "混合相似曝光层, 不使用曝光校正" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "第一张图像" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "CPU 编号:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "文件名:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "画布尺寸:" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "响应类型" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "曝光值 (Eev)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "重定位图像:" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "排列图像" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "混合相似曝光层, 不使用曝光校正" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "输出曝光层 %ld" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "分配堆栈编号" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "重定位图像:" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "分配堆栈编号" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "缝合中 %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "第一张图像" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "最后一张图像" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "目录" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "照相机制造商" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "照相机型号" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -684,35 +701,69 @@ msgid "Lens" msgstr "镜头" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "未知项目" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "图像文件:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "正在读取文件 %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "错误" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -722,25 +773,11 @@ "文件名包含一个以下的无效字符: %s\n" "Hugin 不能使用这些文件名. 请重命名您的文件然后重试." -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"所有图像文件|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*." -"bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG " -"文件 (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF 文件 (*.tif,*.tiff)|*.tif;" -"*.TIF;*.tiff;*.TIFF|PNG 文件 (*.png)|*.png;*.PNG|HDR 文件 (*.hdr)|*.hdr;*." -"HDR|EXR 文件 (*.exr)|*.exr;*.EXR|所有文件 (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -752,27 +789,27 @@ msgstr "输入的 \"%s\" 不是一个有效数字." #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "警告" @@ -788,7 +825,7 @@ msgid "Could not save information into database." msgstr "不能保存信息到数据库文件." -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -799,11 +836,11 @@ "%s\n" "中断" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "不支持的图像文件格式" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -812,7 +849,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -823,78 +860,78 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 #, fuzzy msgid "Should the position of images in each stack be linked?" msgstr "应该跳过匹量队列的加载?" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -902,44 +939,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "重置位置" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "命令行选项" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "覆盖已经存在的图像" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "没有发现图像文件" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "选择图像编辑器" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -950,16 +987,17 @@ "\n" "按确定继续." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "检测到错误" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "增加图像" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -968,32 +1006,32 @@ "错误, 模板需要 %d 张图像,\n" "当前项目包含 %d 张图像\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "不能应用模板" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "加载项目文件出错" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "结果" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc 目录不存在于程序包中" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "致命错误" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1025,7 +1063,7 @@ "增加的图像 (%s) 的 EXIF 信息不匹配已经增加的图像.\n" "如果你已经选择了正确的图像，请再次检查图像." -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "增加图像: 取消" @@ -1038,9 +1076,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1057,7 +1095,7 @@ msgstr "查找行..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "完成" @@ -1070,11 +1108,11 @@ "不存在检测行.\n" "请先运行 \"查找行\". 如果不能查找到行, 请修改参数." -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "优化镜头畸变参数..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1084,148 +1122,148 @@ "请在保存镜头数据前先运行 \"查找行\" 和 \"优化\". 如果不能查找到行, 请修改参" "数." -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "保存镜头参数到 ini 文件" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "保存镜头参数到镜头数据库" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "保存镜头数据" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "保存镜头" -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "保存项目文件" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "项目文件 (*.pto)|*.pto|所有文件 (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 #, fuzzy msgid "Removing temporary files..." msgstr "清理临时关键点文件" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "运行助理 (&s)" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "线程编号:" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 #, fuzzy msgid "prefix used for stitching" msgstr "在缝合前编辑脚本" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "正在运行命令 \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "操作系统: %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 bit" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 bit" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, c-format msgid "Architecture: %s" msgstr "建筑: %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "空闲内存: %ld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "有效代码页: %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "版本: %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "资源路径: %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "数据路径: %s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "照相机和镜头数据" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "不能读取项目文件 %s." -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "收藏库" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "来自于 http://autopano.kolor.com 的 Autopano 对 OSX 来说是无效的" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "使用 Autopano-Sift 代替" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1233,89 +1271,94 @@ "至少一个输入栏是空白的.\n" "请检查您的输入." -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "尝试连接所有重叠图像." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "只能处理没有控制点的成对图像." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "控制点检测器" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "可执行文件 (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "左 x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "左 y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "右 x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "右 y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "队列" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "距离" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "增加了新控制点" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "正在搜索相似点..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "调整时出错" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "调整后的点, 角度: %.0f 度, 相关系数: %0.3f, 曲率: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "修改点, 或者点击鼠标右键增加一对点" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "估算画外点" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "没有发现相似点." -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1325,31 +1368,37 @@ "检查相似外观.\n" "相关系数 (%.3f) 低于首选项中设置的阀值." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "增加新行" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "行 %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "相关阀值:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "标准的" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "垂直线" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "水平线" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1359,92 +1408,93 @@ "如果想创建较少点,\n" "请输入更高数字." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "隅角检测阀值" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "创建控制点" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "尖角检测比例" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "控制点创建错误:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "从右边图像中选择点" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "从左边图像中选择点" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "由于缺少至少一个关联两张图像的控制点不能运行 celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "正在运行 Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "装载图像 %s" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "移除了 %lu 个控制点" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste 结果" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "正在清理" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "创建" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "尝试从云朵中移除控制点" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "清理批处理" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "通过统计方法移除边远控制点" @@ -1456,23 +1506,23 @@ msgid "Could not process event!" msgstr "不能处理事件!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "左边图像" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "右边图像" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1480,7 +1530,7 @@ "输入最小控制点错误.\n" "所有具有更高误差值的点将被选择" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "选择控制点" @@ -1549,60 +1599,60 @@ msgstr "" "拖动图像 (任意使用 shift 键来约束), 可以使用右键-拖动或者 ctrl 键-拖动来旋转." -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "快速全景图像预览" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "文件 (&F)" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "显示的图像" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "所有" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "无" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "隐藏" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "垂直视野" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "拖动以修改垂直视野" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "水平视角" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "拖动以修改水平视野" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "预览" @@ -1610,83 +1660,88 @@ msgid "Overview" msgstr "预览" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "重置项目参数到它们的默认值." -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "param:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "没有加载图像." -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "%lu 图像被加载." -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "图像通过 %lu 个控制点来连接.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "发现 %d 未连接图像组: " -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "图像或者控制点已经被改变, 需要新的队列." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr "优化后的平均错误: %.1f 像素, 最大: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "直线的" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "圆柱的" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "偏航值必须是数字." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "俯仰值必须是数字." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "滚转值必须是数字." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "X 值必须是数字." -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "Y 值必须是数字." -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "Z 值必须是数字." -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "数值必须是数字" -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1697,75 +1752,75 @@ "但是您的项目具有非零 Tpy 和 Tpp 参数.\n" "应该将 Tpy 和 Tpp 参数重置到零?" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "差异" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "自动裁切" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "正在计算优化裁切" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "上部值需要是一个大于 0 的整数" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "左部值需要是一个大于 0 的整数" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "右部值需要是一个大于 0 的整数" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "下部值需要是一个大于 0 的整数" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "左侧边界必须小于右侧边界" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "顶部边界必须小于底部边界" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "无效的水平视角值. 这个项目的最大水平视角值是 %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "无效的垂直视野值. 这个项目的最大垂直视野值是 %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" msgstr "带有一个宽视野, 使用直线投影的全景图像在边缘处会被拉伸得非常平整.\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "由于视野只有水平方向非常宽, 尝试使用一个圆柱投影来代替." -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "对于一个非常宽的全景图像, 尝试使用等矩形投影来代替." -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr " 您也可以尝试 Panini 投影." -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1775,7 +1830,7 @@ "带有一个宽垂直视野, 使用圆柱投影的全景图像在顶部和底部会被拉伸得非常平整.\n" "一个等矩形投影可以在较少垂直空间内得到相同内容." -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1784,7 +1839,7 @@ "由于垂直视野不太宽, 您可以尝试设置全景投影为圆柱投影.\n" "圆柱投影保持垂直线, 不像等矩形投影." -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1794,7 +1849,7 @@ "球面投影是正形的, 不像鱼眼全景投影.\n" "一个正形投影保持了围绕一个点的各个角度, 经常使图像更容易令人欣赏." -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1804,13 +1859,13 @@ "使用球面投影并带有一个非常宽视野的全景图像将图像沿大量边缘进行拉伸.\n" "鱼眼投影压缩了它, 所以您能用于一个宽视野并且仍然拥有一个合适的中央包裹." -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "设置全景图像到直线投影能够保持直线的直线度." -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1819,27 +1874,27 @@ "您已经隐藏了信息栏, 它可以显示关于选择投影方面的提示.\n" "假如您希望再次看见这一栏, 请再次在首选项中激活这一栏." -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "普通, 独立" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "马赛克" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "马塞克, 独立" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "全景球" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 msgid "Mosaic plane" msgstr "马塞克平面" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1847,24 +1902,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1873,31 +1928,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "清理控制点" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "处理中:" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "正在搜索相似点..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "正在成对检查" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1905,7 +1960,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1913,7 +1968,7 @@ "GLEW 初始化出错\n" "不能开启快速预览窗口." -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -1960,7 +2015,7 @@ msgstr "蒙板编号" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "裁切" @@ -1993,7 +2048,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "最大 Ev 差值必须大于 0." -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "堆栈" @@ -2170,7 +2225,7 @@ msgid "Shutter speed" msgstr "快门速度" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO" @@ -2317,97 +2372,97 @@ msgid "Camera response parameter" msgstr "照相机响应参数" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "未激活" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "激活" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, c-format msgid "Lens %ld" msgstr "镜头 %ld" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, c-format msgid "Stack %ld" msgstr "堆栈 %ld" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, c-format msgid "Output stack %ld" msgstr "输出栈 %ld" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, c-format msgid "Output exposure layer %ld" msgstr "输出曝光层 %ld" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "链接" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "未连接" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "为当前镜头选择全部" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "为当前镜头都不选择" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "为当前堆栈选择全部" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "为当前堆栈都不选择" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "选择全部" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "都不选择" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "编辑图像变量..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "保存图像" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "保存图像" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "显示的图像" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "每张图像的点的编号:" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "控制点" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2440,12 +2495,24 @@ msgid "Did you know..." msgstr "您知道吗..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "版本 %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2453,130 +2520,130 @@ "致命安装错误\n" "文件 data/splash.png 不存在于:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "帮助 (&H)" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "动作 (&A)" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "输出" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "重置用户定义..." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "编辑 (&E)" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "重置用户定义..." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "运行助理 (&s)" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "开始了" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "优化器" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "曝光" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "在关闭前保存对全影图像的修改吗?" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "在关闭前保存对全影图像的修改吗?" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "在关闭前保存对全影图像的修改吗?" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "假如您不保存就关闭, 自从您上次保存以来的修改将会被丢弃" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "假如您不保存就关闭, 自从您上次保存以来的修改将会被丢弃" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "假如您不保存就关闭, 自从您上次保存以来的修改将会被丢弃" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "不要保存" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "不保存就关闭" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "强迫关闭" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "保存项目 %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - 全景图像缝合器" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "全景图像编辑" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2589,36 +2656,36 @@ "\n" "(错误代码: %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "保存 PTmender 脚本文件" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender 文件 (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "打开项目: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "被打开的项目" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "加载图像" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "打开项目出错: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "打开项目文件" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2629,11 +2696,11 @@ "这个文件不能通过 \"文件, 打开\" 的方式来打开.\n" "您想用增加这个文件到当前项目的方式来代替吗?" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "打开项目: 取消" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2641,7 +2708,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2649,34 +2716,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "不能读取项目文件 %s." -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "打开一个项目文件" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "蒙板文件 (*.msk)|*.msk|所有文件 (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "选择项目模板" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "调整所有点" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "调整中" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2701,23 +2768,23 @@ "\n" "使用控制点列表 (F3) 来查看当前项目的所有点\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "调整结果" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "正在移除蒙板内的控制点" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "选择 python 脚本" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python 脚本 (*.py)|*.py|所有文件 (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2726,24 +2793,24 @@ "不能找到文件 \"%s\".\n" "可能文件已经被重命名, 移动或者删除." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "错误!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." msgstr "在 %s 中没有发现预期的 Celeste 模型, Hugin 需要被正确安装." -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "不能加载 Celeste 模型文件 %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2752,7 +2819,7 @@ "不能切换到简单界面. 这个项目正在使用堆栈和/或虚光偏心.\n" "这些功能不支持简单界面." -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2761,7 +2828,7 @@ "不能切换到简单界面. 这个项目正在使用位移或剪切参数.\n" "这些参数不支持简单界面." -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2770,28 +2837,28 @@ "不能切换到高级界面. 这个项目正在使用位移或者剪切参数.\n" "这些参数不支持高级界面." -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "正在运行助理" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "警告: 发现 %d 未连接图像组:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2803,57 +2870,57 @@ "\n" "在增加控制点后, 再按 \"排列\" 按钮" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "助理没有成功处理. 请检查项目文件的结果." -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "没有发现项目文件" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "不能载入 PTBatcherGui" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "加载错误程序" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "蒙板类型" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." msgstr "在图像中点击鼠标左键来创建一个多边形蒙板, 使用鼠标右键设置终点." -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "保存蒙板" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "蒙板文件 (*.msk)|*.msk|所有文件 (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "加载蒙板" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "增加蒙板: 取消" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "不能粘贴来自文件 %s 的蒙板." -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "请输入一个有效数字" @@ -2992,7 +3059,7 @@ msgstr "测光对齐" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "加载图像" @@ -3035,65 +3102,69 @@ msgid "Photometric optimization finished" msgstr "测光优化已经结束" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "增加单独图像..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "增加时间序列图像..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "没有发现匹配图像." -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "编辑图像变量..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "移除选择的图像" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "锚定这张图像以便定位" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "锚定这张图像以便曝光" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "新镜头" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "修改镜头..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "输入新的镜头编号" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "镜头编号" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "修改镜头编号" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "从镜头数据库加载镜头" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "从 ini 文件加载镜头" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3101,12 +3172,12 @@ "您只选择了一张图像.\n" "应该将载入的参数应用于所有具有相同镜头的图像吗?" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "问题" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3116,100 +3187,100 @@ "应用镜头参数文件可能会导致非预期结果.\n" "仍然要应用设置吗?" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "保存镜头到 ini 文件" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "移除控制点" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "选择的图像没有控制点." -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "真的要删除 %lu 个控制点吗?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "删除控制点" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "清理控制点" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "正在清理控制点" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "正在成对检查" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "正在检查整个项目" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "已经完成清理" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "移除动云上控制点" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "重置用户定义..." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "重置位置" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 msgid "Reset translation parameters" msgstr "重置位移参数" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "重置镜头参数" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "重置全景图像参数" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "新堆栈" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "修改堆栈..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "输入新的堆栈编号" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "堆栈编号" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "修改堆栈编号" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "设置堆栈尺寸..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "质量:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3279,63 +3350,63 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Hammer-Aitoff 等面积" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "宽度值需要是一个大于 0 的整数" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "高度值需要是一个大于 0 的整数" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "左侧边界必须小于右侧边界." -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "顶部边界必须小于底部边界." -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "还没有执行 PTmender 选项" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "还没有执行 PTblender 选项" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr " HDRMerge 程序的选项还没有被实现" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "不能创建临时项目文件" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "指定输出前缀" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "重置用户定义..." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3345,7 +3416,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3357,7 +3428,7 @@ "假如它太大了, 从缝合器面板中减少全景图像画布尺寸和裁剪区域大小. 缝合一张这种" "尺寸的全景图像会使用很长时间和大量内存." -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3365,19 +3436,19 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "您确定想要缝合一张这样巨大的全景图像吗?" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "仍然缝合" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "让我修复它" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " @@ -3386,7 +3457,7 @@ "在输入区域中不存在任何激活图像.\n" "请检查您的设置, 以便输入区域中存在至少一张图像." -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3417,121 +3488,139 @@ msgid "Miscellaneous" msgstr "其它" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "系统默认" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "巴克斯" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "加泰罗尼亚语" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "中文 (简体)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "中文 (繁体)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "捷克语" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "丹麦" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "荷兰语" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "英语" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "法语" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "德语" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "匈牙利语" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "意大利语" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "日语" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "波兰语" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "葡萄牙语 (巴西)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "俄语" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "斯洛伐克" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "西班牙" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "瑞典语" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "芬兰语" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "选择 Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "可执行文件 (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "选择 Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "选择全部" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "选择 PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "选择全部" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 msgid "Select ExifTool argfile" msgstr "选择 ExifTool 参数文件" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "ExifTool 参数文件 (*.arg)|*.arg|所有文件(*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" @@ -3540,14 +3629,14 @@ "文件 %s 不存在.\n" "应该使用默认标签来创建这个参数文件?" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "Exiftool 参数文件" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" @@ -3555,18 +3644,18 @@ "没有选择文件.\n" "应该使用默认标签来创建一个参数文件?" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 msgid "Select new ExifTool argfile" msgstr "选择新的 ExifTool 参数文件" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, c-format msgid "Could not save file \"%s\"." msgstr "不能保存文件 \"%s\"." -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, fuzzy, c-format msgid "" "File %s does not exist.\n" @@ -3575,7 +3664,7 @@ "文件 %s 不存在.\n" "应该使用默认标签来创建这个参数文件?" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 #, fuzzy msgid "" "No file selected.\n" @@ -3584,23 +3673,24 @@ "没有选择文件.\n" "应该使用默认标签来创建一个参数文件?" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "真的要将显示的首选项重置成默认值吗?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "加载默认值" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "请选择一个条目再试一次" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "选择条目" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3608,29 +3698,29 @@ "您不能删除最后一个设置.\n" "至少需要一个设置." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "您确实想移除控制点检测器设置 \"%s\"?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "删除控制点检测器设置" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "加载控制点检测器设置" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "控制点检测器设置 (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "保存控制点检测器设置" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "在最终全景图像中点击一块应该是中性灰/白的区域." @@ -3655,48 +3745,53 @@ msgid "Remove %lu control points" msgstr "移除了 %lu 个控制点" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "全景图像预览" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "预览选项" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "项目 (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "混和模式:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "输出:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "压缩:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "项目参数" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "左键点击以便定义新的中心点, 右键点击以便移动点到水平线." -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "使用鼠标左键使全景图像居中, 使用右键设置水平" @@ -3713,7 +3808,7 @@ msgid "Click a connection to edit control points." msgstr "点击一条连接来编辑控制点." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3721,31 +3816,113 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "没有发现 \"%s\". 请在首选项中指定一个有效目录" + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "没有发现 \"%s\". 请在首选项中指定一个有效目录" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "正在检测: %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "关闭" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, c-format msgid "Directory '%s' does not exists" msgstr "目录 '%s' 不存在" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "不能设置 PYTHONHOME 的环境变量" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "批处理" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "打开 PTBatcher, Hugin 项目文件的批处理器" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Hugin 镜头校准图形用户界面" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3759,26 +3936,26 @@ "不能找到目录内的 \"%s\".\n" "可能您没有正确安装或者在设置中指定了一个错误的目录." -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "清理临时关键点文件" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " "point detector" msgstr "请使用 %namefile, %i 或者 %s 来为控制点检测器指定输入文件" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "控制点检测器命令中有错误" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3790,14 +3967,14 @@ "请选择较少的图像, 或者将图像放置在\n" "一个拥有较短目录名的文件夹中" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "选择了太多的图像" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3808,38 +3985,38 @@ "\n" " 不能执行命令: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute 错误" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "正在查找控制点" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "不能执行命令: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3848,9 +4025,9 @@ "命令: %s\n" "错误代码: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3865,29 +4042,29 @@ "\n" "已执行的命令: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "控制点检测器故障" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" msgstr "请使用 %i 指定输入文件, 使用 %k 指定用于创建关键步骤的关键点文件" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" msgstr "请为相关步骤使用 %k 指定关键点文件并且使用 %o 指定输出项目文件" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "创建关键文件" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3899,11 +4076,11 @@ "\n" " 不能执行命令: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "默认" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -3911,258 +4088,258 @@ "不能清理进行中的批处理.\n" "您想取消它吗?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "已清理批处理." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "错误: 不能获得状态, 编号 %d 的项目不在列表中." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "错误: 不能加载批处理文件." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "成功完成批处理." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "完成批处理但存在错误." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "准备关机..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "正在关机..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "准备关机..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "准备关机..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "保存项目文件" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "没有指定输出前缀" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "没有指定项目文件" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - 缝合中" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - 助理" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "移除过程错误, 编号 %d 的项目不在列表中." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "错误: 不能删除项目文件 " -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "正在运行批处理..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "PTBatcherGUI 已经开启" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "已进行批处理." -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "正在运行命令 \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "正在缝合: %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "正在检测: %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "错误: 不能设置状态, 编号 %d 的项目不在列表中." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "不再做..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "您已经按下了 Command 键." -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "您已经按下了 Control 键." -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "应该跳过匹量队列的加载?" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "无" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "PTBatcherGUI" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "完成后关机" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "请输入命令行程序来执行:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "进入程序" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "为项目指定一个搜索目录" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "指定项目源文件" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "已经从目录中增加项目" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "增加项目 %s 到缝合队列." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "增加项目 %s 到助理队列." -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "已经停止批处理" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugins 的批处理器" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "为项目指定输出前缀" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "不能修改一个助理目标的前缀." -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "请选择一个项目" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "请选择一个项目" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "指定要打开的批处理文件" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "批处理文件 (*.ptb)|*.ptb;|所有文件 (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "不能在 Hugin 中打开程序." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "没有选择项目. 不选择项目来打开 Hugin?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "已停止批处理" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "继续批处理..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4170,7 +4347,7 @@ "列表中有失败项目.\n" "也移除它们?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4178,16 +4355,16 @@ "不能移除进行中的项目.\n" "您想取消它吗?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "移除项目" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "请选择一个项目来移除" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4195,16 +4372,16 @@ "不能重置正在处理的项目.\n" "您想取消它吗?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "重置项目" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "请选择一个项目去重置" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4212,31 +4389,31 @@ "不能重置进行中的项目.\n" "您想取消这个批处理吗?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "指定批处理文件来保存" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "批处理文件 (*.ptb)|*.ptb;|所有文件 (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "清理批处理" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "正在开始批处理" @@ -4272,7 +4449,7 @@ msgid "E&xit" msgstr "退出 (&x)" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4282,11 +4459,11 @@ "假如您关闭这个对话框, 您将丢失它们.\n" "仍然要继续吗?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "接受" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4296,11 +4473,11 @@ "假如您继续, 它们将被忽视.\n" "您仍然想要继续?" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "停止" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4309,7 +4486,7 @@ "目录 %s 不存在.\n" "请给出一个存在的目录." -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4317,7 +4494,7 @@ "您选择的不可能是全景图像.\n" "请至少选择一张全景图像然后重试." -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4326,141 +4503,143 @@ "没有成功写入所有项目文件.\n" "也许您没有这些目录的写入权限或者您的硬盘已经满了." -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "从这个项目中移除当前图像" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "搜索全景图像" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "正在读取文件 %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "开始" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "发现 %d 张图像有可能是全景图像." -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "没有发现有可能是全景图像的图像." -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d 图像: %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "检测到参数语法错误, 中断." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "PTBatcherGUI 已经开启" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "等待" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "进行中" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "完成" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "已失败" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "找不到文件" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "已停止" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "编号" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "项目" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "输出前缀" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "状态" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "最后修改" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "输出格式" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "预测" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "尺寸" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "错误, 不能转换编号" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "助理" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "修改前缀" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "重置项目" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "使用 Hugin 编辑" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "移除" @@ -4496,16 +4675,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "记录文件 (*.log)|*.log|所有文件 (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "不能读取项目文件 %s." -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "指定项目源文件" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4515,7 +4694,7 @@ "Hugin 不能使用这个文件名. 请输入一个有效文件名." #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "关于 Hugin" @@ -4548,19 +4727,19 @@ msgstr "系统" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "确定" @@ -4638,8 +4817,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "选择..." @@ -4727,7 +4909,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "选项" @@ -4761,10 +4943,6 @@ msgid "Send selected panoramas to queue" msgstr "发送已选择的全景图像到队列中" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "关闭" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "搜索全景图像" @@ -4867,12 +5045,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "退出 (&Q)" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "退出程序" @@ -4977,47 +5155,153 @@ msgid "adddir" msgstr "增加目录" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "以前图像对" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "描述:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "以后图像对" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "类型:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "模式:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "所有图像一起" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "垂直线" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "带堆栈的全景图像" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "水平线" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "多行全景图像" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "缩放:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "带堆栈的多行全景图像" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "适合窗口" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "预对齐全景图像" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "调整" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "检测器" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "尝试优化当前激活点" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "单步检测器" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "程序:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "参数:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "清理参数:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "双步检测器" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "特征描述:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "特征匹配:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "堆栈检测器" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "当堆栈中不应该运行控制点检测器时, 保留空白." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "高级选项" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "该设置没有高级选项." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"以下模式将在运行前被代替:\n" +"%o -- 输出项目 (当使用 Autopano 时 0.oto 将被附加)\n" +"%p -- 每对控制点的编号\n" +"%v -- 第一张图像的水平视角\n" +"%f -- 第一张图像的项目 (0-4, 当使用 panotools 时)\n" +"%i -- 图像文件\n" +"%namefile -- 包含图像文件名的文件\n" +"%s -- 输入 panotools 脚本%k -- 关键中间文件" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "控制点检测器参数" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "以前图像对" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "以后图像对" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "模式:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "垂直线" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "水平线" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "缩放:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "适合窗口" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "调整" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "尝试优化当前激活点" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" msgstr "自动优化 (&t)" #: hugin1/hugin/xrc/cp_editor_panel.xrc:267 @@ -5071,7 +5355,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "删除" @@ -5079,150 +5363,183 @@ msgid "Select by Distance" msgstr "通过距离进行选择" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "描述:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "无效文件名" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "类型:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (由 A. Jenny 制作)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "是" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "所有图像一起" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "不" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "带堆栈的全景图像" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "编辑全景图像工具脚本" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "多行全景图像" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "这是将要被传递给全景图像工具引擎的脚本. 编辑这些行是一项高级技术." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "带堆栈的多行全景图像" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "继续这些修改" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "预对齐全景图像" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "放弃修改并且取消" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "检测器" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "分组于:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "单步检测器" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "最小重叠:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "程序:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "输出堆栈检测的最小重叠" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "参数:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "最大 Ev 差:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "清理参数:" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "输出堆栈检测的最大 EV 差值" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "双步检测器" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "输出" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "特征描述:" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "一般" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "特征匹配:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF 数据" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "堆栈检测器" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "位置" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "当堆栈中不应该运行控制点检测器时, 保留空白." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "镜头参数" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "高级选项" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "测光参数" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "该设置没有高级选项." +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "镜头类型" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"以下模式将在运行前被代替:\n" -"%o -- 输出项目 (当使用 Autopano 时 0.oto 将被附加)\n" -"%p -- 每对控制点的编号\n" -"%v -- 第一张图像的水平视角\n" -"%f -- 第一张图像的项目 (0-4, 当使用 panotools 时)\n" -"%i -- 图像文件\n" -"%namefile -- 包含图像文件名的文件\n" -"%s -- 输入 panotools 脚本%k -- 关键中间文件" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "增加图像..." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "控制点检测器参数" +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "镜头类型:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "无效文件名" +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "焦距乘法器:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "编辑全景图像工具脚本" +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "特征匹配" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "设置:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +#, fuzzy +msgid "Run selected control point detector on the selected images" +msgstr "移除关联到选择图像上的控制点" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "优化" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "几何的:" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "计算" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "测光:" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "选择图像" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "加载镜头数据..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." -msgstr "这是将要被传递给全景图像工具引擎的脚本. 编辑这些行是一项高级技术." +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "输入水平视角 (HFOV) 或者焦距和裁切系数." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "继续这些修改" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "水平视角 (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "放弃修改并且取消" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "度" + +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "照相机和镜头数据" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "偏航:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "俯仰:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "滚转:" @@ -5230,34 +5547,11 @@ msgid "Translation parameter" msgstr "位移参数" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "Tpy:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "Tpp:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "位置" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "视图角度 (v):" @@ -5357,7 +5651,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "帮助" @@ -5400,8 +5694,8 @@ msgstr "载入" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "保存" @@ -5414,120 +5708,47 @@ msgid "Manipulate image variables" msgstr "编辑图像变量..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "分组于:" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "最小重叠:" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "输出堆栈检测的最小重叠" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "最大 Ev 差:" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "输出堆栈检测的最大 EV 差值" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "输出" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "一般" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF 数据" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "镜头参数" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "测光参数" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "镜头类型" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "增加图像..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "镜头类型:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "焦距乘法器:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "特征匹配" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "设置:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "移除关联到选择图像上的控制点" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "优化" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "几何的:" +msgid "WB reference:" +msgstr "首选项 (&P)" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "计算" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "测光:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "附加参数:" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "选择图像" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "加载镜头数据..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "处理中:" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "输入水平视角 (HFOV) 或者焦距和裁切系数." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "水平视角 (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "度" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "照相机和镜头数据" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "输入" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5672,14 +5893,6 @@ msgid "Don't ask again" msgstr "不要再次询问" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "是" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "不" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5739,21 +5952,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "撤消 (&U)" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "撤消最后行为" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "重做 (&R)" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "重做最后行为" @@ -5797,12 +6010,12 @@ msgid "Use only normal control points in optimization." msgstr "这张图像的控制点编号" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "优化 (&O)" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "按照当前设置重新运行优化器" @@ -5832,16 +6045,16 @@ msgid "Run a python script" msgstr "运行一个 python 脚本" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "查看 (&V)" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "全屏" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "全屏显示 Hugin 的主窗口" @@ -5923,22 +6136,22 @@ msgid "Show the Stitcher panel" msgstr "显示缝合器面板" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "简单" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "高级" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "专家" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "界面" @@ -5961,86 +6174,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "不同按钮之类的一些信息" -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "今日提示 (&T)" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "显示一条今天的提示." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "键盘快捷键 (&K)" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "键盘快捷键" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "常见问题解答 (&F)" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "经常的询问的问题" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "关于 (&A)" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "首选项 (&P)" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "新建 (&N)" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "新项目" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "打开 (&O)" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "打开项目" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "保存 (&S)" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "保存当前项目文件" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "另存为 (&a)" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "保存当前项目成为一个新文件" @@ -6054,19 +6267,19 @@ "batch processing" msgstr "编写当前项目成为一个与 PTStitcher 兼容的脚本文件, 有利于批处理" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "最近使用的项目" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "列出最近使用过的项目文件" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "运行批处理 (&R)" @@ -6151,7 +6364,7 @@ msgid "Show the OpenGL preview image" msgstr "显示 OpenGL 预览图像" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "预览全景图像" @@ -6208,15 +6421,10 @@ msgstr "从带有这个镜头的所有图像中排除区域" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "输出" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "输入" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "复制" @@ -6261,8 +6469,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6367,7 +6575,8 @@ msgid "execute the PTOptimizer engine" msgstr "执行 PTOptimizer 引擎" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "图像方位" @@ -6412,39 +6621,39 @@ msgid "Interpolator (i):" msgstr "插补器 (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "多边形3 (双三次的)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "样条 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "样条 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "样条 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "双线性" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "最近相邻" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "源像素之间的逼近值" @@ -6472,7 +6681,7 @@ msgid "Enfuse options" msgstr "Enfuse 选项" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "视野:" @@ -6616,10 +6825,6 @@ msgid "Image fusion:" msgstr "图像熔合:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR 合并器:" @@ -6723,16 +6928,16 @@ msgid "Output parameters" msgstr "输出参数" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "混和模式:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "Enblend 错误" @@ -6802,27 +7007,43 @@ msgid "This affects the control points editor and mask editor." msgstr "移除蒙板区域内的所有控制点." -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Enblend 可执行:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(操作系统默认为空)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Enblend 可执行:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Enblend 可执行:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "文件选项" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "临时目录:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(操作系统默认为空)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "默认项目文件名:" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "默认输出前缀:" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6853,43 +7074,43 @@ "%lens - 镜头 (第一张图像的)\n" "%projectname - 项目名称 (只用于输出前缀)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "默认文件名:" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "文件名" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "图像加载中" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "加载后自动排列图像" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "检测垂直线" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "检测垂直线以便使全景图像水平" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "移除似云控制点 (Celeste)" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "可选的助理步骤" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "自动排列" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -6897,67 +7118,67 @@ "控制点号码\n" "每重叠区域" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "缩减最终全景图像" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "百分之最大宽度" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "控制点编辑器" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR 和 16 位显示模式" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "曲线" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "直线的" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "对数的" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "灰度 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "用于图形用户界面输出" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "面片宽度:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "像素" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "搜索区域宽度:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "百分之图像宽度" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "局部搜索区域宽度:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "相关阀值:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -6965,11 +7186,11 @@ "0: 不相似\n" "1: 最大相似" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "顶点曲率阀值:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -6977,118 +7198,114 @@ "0: 无顶点\n" "0.2: 特殊顶点" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "旋转搜索" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "允许旋转搜索 (较慢, 但更加准确)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "起始角:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "终止角" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "步骤:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "控制点检测器" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "控制点检测器程序" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "新..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "编辑..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "向上移动" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "向下移动" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "默认设置" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "使用默认设置的助理." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "输出格式" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "默认文件格式:" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "默认最终全景图像的输出格式" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF 压缩:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "默认 TIFF 压缩:" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG 质量:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "默认 JPEG 压缩设置" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "Blender:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "默认文件名:" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "处理器" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "Hugin&stitch&project" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "将运行缝合工作的引擎" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "立即开始缝合工作" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7097,37 +7314,37 @@ "如果选择了, 处理器将立即继续队列中的工作. 否则处理器将处于暂停状态并且用户必" "须手动开启处理过程." -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "覆盖已经存在的文件" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "警告: 已存在的文件将会被无提示地覆盖." -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "详细的输出" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "允许显示细节, 适用于报告一个 bug 或者只是查看项目的进程." -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "缝合中" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "使用 ExifTool 复制元数据到最终图像" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 msgid "ExifTool options" msgstr "ExifTool 选项" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7136,54 +7353,54 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "编辑 ExifTool 参数文件" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 msgid "Leave empty for default" msgstr "默认留空" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 msgid "Edit selected ExifTool argfile" msgstr "编辑选择的 ExifTool 参数文件" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "ExifTool 参数文件:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "创建照片球形 XMP 数据" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "只用于等矩形输出图像." -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "高级选项" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "线程编号:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7193,82 +7410,84 @@ "Nona 和 OpenMP 能够使用或者不使用多线程进行处理.\n" "将这个参数设置成为您的系统中的处理器或者处理器内核的数量" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "0 个自动检测" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "缝合中" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "默认插补器 (i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "默认创建裁切后的图像" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "重定位时使用 GPU (实验性质)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "使用显卡 GPU 加速重定位" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "使用可选 Enblend 程序" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend 可执行:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "默认参数:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "这些是新项目的默认参数.\n" "可以为了单独项目在缝合器面板中改变它们.\n" "不要设置 -w, -o 和 --compression 参数, 它们由 hugin 指定" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "使用可供选择的 Enfuse 程序" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse 可执行:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 msgid "Programs" msgstr "程序" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste 参数" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM 阀值:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7276,19 +7495,19 @@ "大于 0.5: 较小灵敏度\n" "小于 0.5: 较大灵敏度" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor 过滤尺寸" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "小" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "大" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7296,7 +7515,7 @@ "大的更精确\n" "小的能够检查靠近图像边界的控制点" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7305,75 +7524,75 @@ "通过在重叠区域中分析颜色值来确定渐晕和曝光校正.\n" "为了提高运算速度, 只使用了一个随机点集." -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "每张图像的点的编号:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "测光优化器" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "警告" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "正在优化全景图像" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "现在优化!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "这些提示只在快速预览窗口中显示" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "其他" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "首选项 - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 msgid "Edit ExifTool argfile" msgstr "编辑 ExifTool 参数文件" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7393,11 +7612,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "预览图像水平居中" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "中心" @@ -7405,13 +7624,15 @@ msgid "Show the whole panorama" msgstr "显示整幅全景图" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "估算视野" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "适合" @@ -7419,7 +7640,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "自动拉直一条波状水平线" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "拉直" @@ -7512,33 +7734,33 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "设置全景图像的曝光值意味着曝光所有图像." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "灰度拾取器" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "通过选择一块中性灰区域来校正全局白平衡." -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "编辑 (&E)" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "删除控制点检测器设置" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "背景:" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "缩放:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7549,159 +7771,147 @@ "* 绿色, 黄色和红色线条指明良好, 中等和较差的对齐状况.\n" "* 点击一条线条来编辑控制点面板内的相关图像." -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "布局" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "引导线:" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "三等分法" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "黄金比例" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "对角线" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "对角线方法" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "黄金三角 (下)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "黄金三角 (上)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "自动拉直一条波状水平线." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "拖动模式:" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "应用" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "移动全景图像或者拖动图像到位置上" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "移动/拖" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "设置由图像覆盖的最大矩形区域" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "HDR 自动裁切" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "设置裁剪区域到图像堆栈覆盖的最大矩形" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "左:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "上:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "右:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "下:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "重置裁剪到最大可能的区域" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "改变全景图像裁切区域" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "全景图像编辑器 (&e)" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "概述 (&O)" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "显示全景球的概述." -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "网格" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "显示一个网格." -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "增加图像" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "通过堆叠连接位置." -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "输入每个堆栈的图像数量" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "通过堆叠连接位置." -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "修改选择的图像的镜头" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "重置位置" @@ -7966,6 +8176,84 @@ "只有当图像重叠程度很高并且有很多分布良好的控制点时, 对所有畸变参数进行优化的" "选项 \"everything\" 才会有效果." +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "首选项 (&P)" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "图像" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "增加图像..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "增加另外的图像到当前项目中" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "移除这张图像" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "移除选择的图像" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "尖角检测比例" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "增加项目..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "移动全景图像或者拖动图像到位置上" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "改变全景图像裁切区域" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "重定位时使用 GPU (实验性质)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "所有图像文件|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG 文件 (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF 文件 (*.tif,*." +#~ "tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG 文件 (*.png)|*.png;*.PNG|HDR 文件 (*." +#~ "hdr)|*.hdr;*.HDR|EXR 文件 (*.exr)|*.exr;*.EXR|所有文件 (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (由 A. Jenny 制作)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "Tpy:" +#~ msgstr "Tpy:" + +#~ msgid "Tpp:" +#~ msgstr "Tpp:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "Hugin&stitch&project" +#~ msgstr "Hugin&stitch&project" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "界面" @@ -8922,9 +9210,6 @@ #~ msgid "Flatfield" #~ msgstr "平面" -#~ msgid "Image file:" -#~ msgstr "图像文件:" - #~ msgid "Polynomial" #~ msgstr "多项式" @@ -9146,10 +9431,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#, fuzzy -#~ msgid "&Import Project..." -#~ msgstr "增加项目..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9245,9 +9526,6 @@ #~ "Autopano-SIFT not found. Please specify a valid path in the preferences" #~ msgstr "没有发现 Autopano-SIFT. 请在首选项中指定一个有效目录" -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "没有发现 \"%s\". 请在首选项中指定一个有效目录" - #~ msgid "Error in Autopano command" #~ msgstr "Autopano 命令行错误" @@ -9335,9 +9613,6 @@ #~ msgid "PTStitcher note" #~ msgstr "PTStitcher 注释" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "选择 PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "没有选择 PTStitcher.exe" @@ -9537,9 +9812,6 @@ #~ msgid "Error during image reading: %s" #~ msgstr "读取图像时出错: %s" -#~ msgid "Remove this image" -#~ msgstr "移除这张图像" - #~ msgid "Stitching Options" #~ msgstr "缝合选项" @@ -9647,9 +9919,6 @@ #~ msgid "Enblend:" #~ msgstr "Enblend:" -#~ msgid "Additional Arguments:" -#~ msgstr "附加参数:" - #~ msgid "Do not set -w and -o arguments, they are set by hugin" #~ msgstr "不要设置 -w 和 -o 参数, 它们由 Hugin 设置" diff -Nru hugin-2018.0.0+dfsg/src/translations/zh_TW.po hugin-2019.0.0+dfsg/src/translations/zh_TW.po --- hugin-2018.0.0+dfsg/src/translations/zh_TW.po 2018-01-13 07:52:08.000000000 +0000 +++ hugin-2019.0.0+dfsg/src/translations/zh_TW.po 2019-02-17 15:24:34.000000000 +0000 @@ -2,14 +2,14 @@ msgstr "" "Project-Id-Version: for hugin 2013.0 beta1\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/hugin/\n" -"POT-Creation-Date: 2017-12-29 11:20+0100\n" +"POT-Creation-Date: 2019-02-02 11:11+0100\n" "PO-Revision-Date: \n" "Last-Translator: Ewing Kang \n" "Language-Team: Chinese Traditional \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: TAIWAN\n" "X-Poedit-Bookmarks: 1137,407,-1,-1,-1,-1,-1,-1,-1,-1\n" @@ -47,14 +47,14 @@ msgid "Searching for best crop..." msgstr "正在尋找建立在雲上的控制點..." -#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:125 -#: hugin1/hugin/MainFrame.cpp:1726 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/PanoPanel.cpp:1315 +#: hugin1/base_wx/Executor.cpp:137 hugin1/base_wx/platform.cpp:217 +#: hugin1/hugin/MainFrame.cpp:1774 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/PanoPanel.cpp:1316 #, c-format msgid "External program %s not found in the bundle, reverting to system path" msgstr "預設軟體集中未發現您所指定的外部應用程式 %s, 回到系統路徑" -#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:210 +#: hugin1/base_wx/Executor.cpp:160 hugin1/base_wx/Executor.cpp:212 #, fuzzy, c-format msgid "" "WARNING: External program %s not found as specified in preferences, " @@ -77,9 +77,9 @@ msgstr "點陣圖 (*.bmp)|*.bmp|行動式網路圖形 (*.png)|*.png" #: hugin1/base_wx/GraphTools.cpp:84 hugin1/base_wx/LensTools.cpp:403 -#: hugin1/calibrate_lens/LensCalFrame.cpp:735 -#: hugin1/calibrate_lens/LensCalFrame.cpp:800 hugin1/hugin/MainFrame.cpp:978 -#: hugin1/hugin/MaskEditorPanel.cpp:475 +#: hugin1/calibrate_lens/LensCalFrame.cpp:732 +#: hugin1/calibrate_lens/LensCalFrame.cpp:797 hugin1/hugin/MainFrame.cpp:1038 +#: hugin1/hugin/MaskEditorPanel.cpp:472 #, c-format msgid "File %s exists. Overwrite?" msgstr "檔案 %s 已存在. 是否覆蓋?" @@ -115,7 +115,7 @@ msgstr "鏡頭焦距位移率必須是正數." #: hugin1/base_wx/HFOVDialog.cpp:374 hugin1/hugin/ImageVariableDialog.cpp:202 -#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2080 +#: hugin1/hugin/ImagesPanel.cpp:567 hugin1/hugin/ImagesTree.cpp:2019 #, c-format msgid "" "You have given a field of view of %.2f degrees.\n" @@ -127,24 +127,28 @@ "但正投影只能被限制在180度仍然要用這麼高的視角嗎？" #: hugin1/base_wx/HFOVDialog.cpp:376 hugin1/base_wx/LensTools.cpp:460 -#: hugin1/base_wx/wxPanoCommand.cpp:533 hugin1/hugin/CPEditorPanel.cpp:1141 -#: hugin1/hugin/CPEditorPanel.cpp:1156 hugin1/hugin/GLPreviewFrame.cpp:1784 -#: hugin1/hugin/GLPreviewFrame.cpp:1873 hugin1/hugin/GLPreviewFrame.cpp:2890 -#: hugin1/hugin/GLPreviewFrame.cpp:3252 hugin1/hugin/GLPreviewFrame.cpp:3263 -#: hugin1/hugin/GLPreviewFrame.cpp:3274 +#: hugin1/base_wx/wxPanoCommand.cpp:452 hugin1/hugin/CPEditorPanel.cpp:1347 +#: hugin1/hugin/CPEditorPanel.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1854 +#: hugin1/hugin/GLPreviewFrame.cpp:1943 hugin1/hugin/GLPreviewFrame.cpp:2960 +#: hugin1/hugin/GLPreviewFrame.cpp:3321 hugin1/hugin/GLPreviewFrame.cpp:3332 +#: hugin1/hugin/GLPreviewFrame.cpp:3343 #: hugin1/hugin/ImageVariableDialog.cpp:204 hugin1/hugin/ImagesPanel.cpp:569 #: hugin1/hugin/ImagesPanel.cpp:632 hugin1/hugin/ImagesPanel.cpp:666 -#: hugin1/hugin/ImagesTree.cpp:2082 hugin1/hugin/MainFrame.cpp:833 -#: hugin1/hugin/MainFrame.cpp:1136 hugin1/hugin/MainFrame.cpp:1306 -#: hugin1/hugin/MainFrame.cpp:1317 hugin1/hugin/OptimizePanel.cpp:163 -#: hugin1/hugin/OptimizePanel.cpp:195 hugin1/hugin/OptimizePanel.cpp:267 +#: hugin1/hugin/ImagesTree.cpp:2021 hugin1/hugin/MainFrame.cpp:207 +#: hugin1/hugin/MainFrame.cpp:882 hugin1/hugin/MainFrame.cpp:1196 +#: hugin1/hugin/MainFrame.cpp:1360 hugin1/hugin/MainFrame.cpp:1371 +#: hugin1/hugin/OptimizePanel.cpp:163 hugin1/hugin/OptimizePanel.cpp:195 +#: hugin1/hugin/OptimizePanel.cpp:267 #: hugin1/hugin/OptimizePhotometricPanel.cpp:149 -#: hugin1/hugin/PanoOperation.cpp:374 hugin1/hugin/PanoPanel.cpp:1675 -#: hugin1/hugin/PanoPanel.cpp:1704 hugin1/hugin/PanoPanel.cpp:1740 -#: hugin1/hugin/PanoPanel.cpp:1760 hugin1/hugin/PapywizardImport.cpp:343 -#: hugin1/hugin/PapywizardImport.cpp:355 hugin1/hugin/xrc/main_frame.xrc:123 -#: hugin1/hugin/xrc/main_frame.xrc:183 hugin1/hugin/xrc/main_frame.xrc:255 -#: hugin1/hugin/xrc/pano_panel.xrc:1099 +#: hugin1/hugin/PanoOperation.cpp:232 hugin1/hugin/PanoOperation.cpp:455 +#: hugin1/hugin/PanoPanel.cpp:1676 hugin1/hugin/PanoPanel.cpp:1705 +#: hugin1/hugin/PanoPanel.cpp:1741 hugin1/hugin/PanoPanel.cpp:1761 +#: hugin1/hugin/PapywizardImport.cpp:343 hugin1/hugin/PapywizardImport.cpp:355 +#: hugin1/hugin/RawImport.cpp:77 hugin1/hugin/RawImport.cpp:95 +#: hugin1/hugin/RawImport.cpp:221 hugin1/hugin/RawImport.cpp:508 +#: hugin1/hugin/RawImport.cpp:840 hugin1/hugin/huginApp.cpp:577 +#: hugin1/hugin/xrc/main_frame.xrc:123 hugin1/hugin/xrc/main_frame.xrc:183 +#: hugin1/hugin/xrc/main_frame.xrc:255 hugin1/hugin/xrc/pano_panel.xrc:1099 msgid "Hugin" msgstr "Hugin" @@ -165,8 +169,8 @@ msgstr "全幀魚眼(Full frame)" #: hugin1/base_wx/LensTools.cpp:42 hugin1/base_wx/LensTools.cpp:85 -#: hugin1/base_wx/huginConfig.cpp:41 hugin1/hugin/GLPreviewFrame.cpp:1462 -#: hugin1/hugin/PreviewFrame.cpp:604 +#: hugin1/base_wx/huginConfig.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1482 +#: hugin1/hugin/PreviewFrame.cpp:618 msgid "Equirectangular" msgstr "等距長方圓柱" @@ -197,11 +201,13 @@ msgid "builtin" msgstr "內建" -#: hugin1/base_wx/LensTools.cpp:100 hugin1/hugin/xrc/image_variable_dlg.xrc:559 +#: hugin1/base_wx/LensTools.cpp:100 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:559 msgid "custom (EMoR)" msgstr "自定 (EMoR)" -#: hugin1/base_wx/LensTools.cpp:103 hugin1/hugin/xrc/image_variable_dlg.xrc:560 +#: hugin1/base_wx/LensTools.cpp:103 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:560 msgid "Linear" msgstr "線性的" @@ -225,16 +231,16 @@ msgid "Error loading lens parameters" msgstr "載入鏡頭參數發生錯誤" -#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:722 +#: hugin1/base_wx/LensTools.cpp:390 hugin1/calibrate_lens/LensCalFrame.cpp:719 msgid "Save lens parameters file" msgstr "儲存鏡頭參數資訊檔案" -#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:724 +#: hugin1/base_wx/LensTools.cpp:392 hugin1/calibrate_lens/LensCalFrame.cpp:721 msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*" msgstr "鏡頭專案資訊檔案 (*.ini)|*.ini|全部檔案 (*)|*" -#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:736 -#: hugin1/calibrate_lens/LensCalFrame.cpp:801 hugin1/hugin/MainFrame.cpp:979 +#: hugin1/base_wx/LensTools.cpp:404 hugin1/calibrate_lens/LensCalFrame.cpp:733 +#: hugin1/calibrate_lens/LensCalFrame.cpp:798 hugin1/hugin/MainFrame.cpp:1039 #: hugin1/hugin/xrc/main_tool.xrc:19 msgid "Save project" msgstr "儲存專案" @@ -266,22 +272,23 @@ msgid "Error pausing process %ld, code 2" msgstr "%ld 執行應用程式錯誤, 代碼 2" -#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:545 -#: hugin1/ptbatcher/RunStitchFrame.cpp:43 +#: hugin1/base_wx/MyExternalCmdExecDialog.cpp:555 +#: hugin1/hugin/RawImport.cpp:481 hugin1/ptbatcher/RunStitchFrame.cpp:43 #: hugin1/stitch_project/hugin_stitch_project.cpp:111 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:334 +#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/image_variable_dlg.xrc:640 #: hugin1/hugin/xrc/image_variable_dlg.xrc:711 #: hugin1/hugin/xrc/image_variable_dlg.xrc:800 -#: hugin1/hugin/xrc/images_panel.xrc:555 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:146 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:342 hugin1/hugin/xrc/main_frame.xrc:408 #: hugin1/hugin/xrc/mask_editor_panel.xrc:505 #: hugin1/hugin/xrc/pano_panel.xrc:55 hugin1/hugin/xrc/pano_panel.xrc:97 #: hugin1/hugin/xrc/pano_panel.xrc:144 hugin1/hugin/xrc/pano_panel.xrc:1034 #: hugin1/hugin/xrc/pano_panel.xrc:1360 hugin1/hugin/xrc/pano_panel.xrc:1409 -#: hugin1/hugin/xrc/pref_dialog.xrc:1550 hugin1/hugin/xrc/pref_dialog.xrc:1599 -#: hugin1/hugin/xrc/pref_dialog.xrc:1666 hugin1/hugin/xrc/preview_frame.xrc:114 +#: hugin1/hugin/xrc/pref_dialog.xrc:1633 hugin1/hugin/xrc/pref_dialog.xrc:1682 +#: hugin1/hugin/xrc/pref_dialog.xrc:1749 +#: hugin1/hugin/xrc/preview_frame.xrc:114 #: hugin1/hugin/xrc/reset_dialog.xrc:122 msgid "Cancel" msgstr "取消" @@ -319,12 +326,12 @@ msgid "Panorama Tools" msgstr "全景圖片工具" -#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:260 +#: hugin1/base_wx/RunStitchPanel.cpp:100 hugin1/base_wx/RunStitchPanel.cpp:261 msgid "Could not open project file:" msgstr "無法開啟專案檔:" -#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:272 -#: hugin1/ptbatcher/ProjectArray.cpp:89 +#: hugin1/base_wx/RunStitchPanel.cpp:110 hugin1/base_wx/RunStitchPanel.cpp:273 +#: hugin1/ptbatcher/ProjectArray.cpp:92 #, c-format msgid "could not open script: %s" msgstr "無法開啟程式碼: %s" @@ -334,8 +341,8 @@ msgid "Project %s does not contain any active images." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:280 -#: hugin1/ptbatcher/ProjectArray.cpp:126 +#: hugin1/base_wx/RunStitchPanel.cpp:136 hugin1/base_wx/RunStitchPanel.cpp:281 +#: hugin1/ptbatcher/ProjectArray.cpp:129 #, c-format msgid "error while parsing panotools script: %s" msgstr "分析 panotools 程式碼時發生錯誤: %s" @@ -349,17 +356,17 @@ msgid "Could not create temporary file" msgstr "無法產生暫存檔" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:302 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:303 msgid "Queue is empty. This should never happen." msgstr "" -#: hugin1/base_wx/RunStitchPanel.cpp:210 hugin1/base_wx/RunStitchPanel.cpp:244 -#: hugin1/base_wx/RunStitchPanel.cpp:250 +#: hugin1/base_wx/RunStitchPanel.cpp:211 hugin1/base_wx/RunStitchPanel.cpp:245 +#: hugin1/base_wx/RunStitchPanel.cpp:251 #: hugin1/stitch_project/hugin_stitch_project.cpp:163 msgid "Error during stitching" msgstr "接合時發生錯誤" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 msgid "" "Overwrite existing images?\n" "\n" @@ -367,11 +374,11 @@ "覆蓋已經存在的圖片？\n" "\n" -#: hugin1/base_wx/RunStitchPanel.cpp:228 +#: hugin1/base_wx/RunStitchPanel.cpp:229 hugin1/hugin/xrc/dlg_warning.xrc:117 msgid "Overwrite existing images" msgstr "覆蓋已經存在的圖片" -#: hugin1/base_wx/RunStitchPanel.cpp:243 +#: hugin1/base_wx/RunStitchPanel.cpp:244 #, c-format msgid "" "Error while stitching project\n" @@ -380,303 +387,313 @@ "接合專案中發生錯誤\n" "%s" -#: hugin1/base_wx/RunStitchPanel.cpp:302 hugin1/base_wx/RunStitchPanel.cpp:308 -#: hugin1/base_wx/RunStitchPanel.cpp:315 +#: hugin1/base_wx/RunStitchPanel.cpp:303 hugin1/base_wx/RunStitchPanel.cpp:309 +#: hugin1/base_wx/RunStitchPanel.cpp:316 msgid "Error during running assistant" msgstr "接圖分析時發生錯誤" -#: hugin1/base_wx/RunStitchPanel.cpp:307 +#: hugin1/base_wx/RunStitchPanel.cpp:308 #, c-format msgid "" "Error while running assistant\n" "%s" msgstr "執行接圖分析時發生錯誤：%s" -#: hugin1/base_wx/StitchingExecutor.cpp:205 +#: hugin1/base_wx/StitchingExecutor.cpp:204 #, fuzzy msgid "Stitching panorama..." msgstr "全景圖片接合中" -#: hugin1/base_wx/StitchingExecutor.cpp:208 +#: hugin1/base_wx/StitchingExecutor.cpp:207 msgid "Platform:" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:209 +#: hugin1/base_wx/StitchingExecutor.cpp:208 #, fuzzy msgid "Version:" msgstr "版本： %s" -#: hugin1/base_wx/StitchingExecutor.cpp:210 +#: hugin1/base_wx/StitchingExecutor.cpp:209 #, fuzzy msgid "Working directory:" msgstr "" "\n" "目前目錄位置:" -#: hugin1/base_wx/StitchingExecutor.cpp:211 +#: hugin1/base_wx/StitchingExecutor.cpp:210 #, fuzzy msgid "Output prefix:" msgstr "輸出檔名" -#: hugin1/base_wx/StitchingExecutor.cpp:223 -#: hugin1/base_wx/StitchingExecutor.cpp:227 -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:222 +#: hugin1/base_wx/StitchingExecutor.cpp:226 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #: hugin1/hugin/xrc/batch_frame.xrc:330 hugin1/hugin/xrc/pano_panel.xrc:830 msgid "Blender:" msgstr "融合軟體:" -#: hugin1/base_wx/StitchingExecutor.cpp:227 +#: hugin1/base_wx/StitchingExecutor.cpp:226 msgid "Unknown blender (enblend --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:233 +#: hugin1/base_wx/StitchingExecutor.cpp:232 #, fuzzy msgid "internal" msgstr "內部錯誤" -#: hugin1/base_wx/StitchingExecutor.cpp:242 -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:241 +#: hugin1/base_wx/StitchingExecutor.cpp:245 #, fuzzy msgid "Exposure fusion:" msgstr "光圈:" -#: hugin1/base_wx/StitchingExecutor.cpp:246 +#: hugin1/base_wx/StitchingExecutor.cpp:245 msgid "Unknown exposure fusion (enfuse --version failed)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:254 +#: hugin1/base_wx/StitchingExecutor.cpp:253 #, fuzzy msgid "ExifTool version:" msgstr "Enfuse 選項" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 #, fuzzy msgid "ExifTool:" msgstr "Enfuse 選項" -#: hugin1/base_wx/StitchingExecutor.cpp:259 +#: hugin1/base_wx/StitchingExecutor.cpp:258 msgid "FAILED" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:265 +#: hugin1/base_wx/StitchingExecutor.cpp:264 #, fuzzy msgid "Number of active images:" msgstr "每張圖片的控制點數量：" -#: hugin1/base_wx/StitchingExecutor.cpp:266 +#: hugin1/base_wx/StitchingExecutor.cpp:265 #, fuzzy, c-format msgid "Output exposure value: %.1f" msgstr "輸出光圈%d 的圖層" -#: hugin1/base_wx/StitchingExecutor.cpp:267 +#: hugin1/base_wx/StitchingExecutor.cpp:266 #, fuzzy, c-format msgid "Canvas size: %dx%d" msgstr "底圖尺寸" -#: hugin1/base_wx/StitchingExecutor.cpp:268 +#: hugin1/base_wx/StitchingExecutor.cpp:267 #, c-format msgid "ROI: (%d, %d) - (%d, %d)" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:269 +#: hugin1/base_wx/StitchingExecutor.cpp:268 #, c-format msgid "FOV: %.0fx%.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:275 -#: hugin1/base_wx/StitchingExecutor.cpp:281 -#: hugin1/base_wx/StitchingExecutor.cpp:348 hugin1/hugin/xrc/pano_panel.xrc:176 +#: hugin1/base_wx/StitchingExecutor.cpp:274 +#: hugin1/base_wx/StitchingExecutor.cpp:280 +#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/hugin/xrc/pano_panel.xrc:176 msgid "Projection:" msgstr "投影法：" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 #, fuzzy msgid "Using GPU for remapping:" msgstr "以圖形處理器執行重定位(實驗性的)" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "true" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:284 +#: hugin1/base_wx/StitchingExecutor.cpp:283 msgid "false" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:288 hugin1/hugin/xrc/pano_panel.xrc:465 +#: hugin1/base_wx/StitchingExecutor.cpp:287 +#: hugin1/hugin/xrc/pano_panel.xrc:465 msgid "Panorama Outputs:" msgstr "環景輸出：" -#: hugin1/base_wx/StitchingExecutor.cpp:291 -#: hugin1/base_wx/StitchingExecutor.cpp:312 hugin1/hugin/xrc/pano_panel.xrc:480 -#: hugin1/hugin/xrc/pano_panel.xrc:643 hugin1/hugin/xrc/pano_panel.xrc:1266 +#: hugin1/base_wx/StitchingExecutor.cpp:290 +#: hugin1/base_wx/StitchingExecutor.cpp:311 +#: hugin1/hugin/xrc/pano_panel.xrc:480 hugin1/hugin/xrc/pano_panel.xrc:643 +#: hugin1/hugin/xrc/pano_panel.xrc:1266 msgid "Exposure corrected, low dynamic range" msgstr "曝光修正，低動態範圍" -#: hugin1/base_wx/StitchingExecutor.cpp:295 hugin1/hugin/xrc/pano_panel.xrc:492 -#: hugin1/hugin/xrc/pano_panel.xrc:1281 +#: hugin1/base_wx/StitchingExecutor.cpp:294 +#: hugin1/hugin/xrc/pano_panel.xrc:492 hugin1/hugin/xrc/pano_panel.xrc:1281 msgid "Exposure fused from stacks" msgstr "堆棧曝光融合" -#: hugin1/base_wx/StitchingExecutor.cpp:299 hugin1/hugin/xrc/pano_panel.xrc:501 -#: hugin1/hugin/xrc/pano_panel.xrc:1295 +#: hugin1/base_wx/StitchingExecutor.cpp:298 +#: hugin1/hugin/xrc/pano_panel.xrc:501 hugin1/hugin/xrc/pano_panel.xrc:1295 msgid "Exposure fused from any arrangement" msgstr "使用所有策略進行曝光融合" -#: hugin1/base_wx/StitchingExecutor.cpp:303 -#: hugin1/base_wx/StitchingExecutor.cpp:320 -#: hugin1/base_wx/StitchingExecutor.cpp:333 hugin1/hugin/xrc/pano_panel.xrc:570 -#: hugin1/hugin/xrc/pano_panel.xrc:663 hugin1/hugin/xrc/pano_panel.xrc:1309 +#: hugin1/base_wx/StitchingExecutor.cpp:302 +#: hugin1/base_wx/StitchingExecutor.cpp:319 +#: hugin1/base_wx/StitchingExecutor.cpp:332 +#: hugin1/hugin/xrc/pano_panel.xrc:570 hugin1/hugin/xrc/pano_panel.xrc:663 +#: hugin1/hugin/xrc/pano_panel.xrc:1309 msgid "High dynamic range" msgstr "高動態範圍" -#: hugin1/base_wx/StitchingExecutor.cpp:309 hugin1/hugin/xrc/pano_panel.xrc:628 +#: hugin1/base_wx/StitchingExecutor.cpp:308 +#: hugin1/hugin/xrc/pano_panel.xrc:628 msgid "Remapped Images:" msgstr "圖片重新定位：" -#: hugin1/base_wx/StitchingExecutor.cpp:316 hugin1/hugin/xrc/pano_panel.xrc:654 +#: hugin1/base_wx/StitchingExecutor.cpp:315 +#: hugin1/hugin/xrc/pano_panel.xrc:654 msgid "No exposure correction, low dynamic range" msgstr "不做曝光校正，低動態範圍" -#: hugin1/base_wx/StitchingExecutor.cpp:326 hugin1/hugin/xrc/pano_panel.xrc:673 +#: hugin1/base_wx/StitchingExecutor.cpp:325 +#: hugin1/hugin/xrc/pano_panel.xrc:673 msgid "Combined stacks:" msgstr "合併堆棧圖" -#: hugin1/base_wx/StitchingExecutor.cpp:329 hugin1/hugin/xrc/pano_panel.xrc:688 +#: hugin1/base_wx/StitchingExecutor.cpp:328 +#: hugin1/hugin/xrc/pano_panel.xrc:688 msgid "Exposure fused stacks" msgstr "堆棧曝光融合" -#: hugin1/base_wx/StitchingExecutor.cpp:339 hugin1/hugin/xrc/pano_panel.xrc:708 +#: hugin1/base_wx/StitchingExecutor.cpp:338 +#: hugin1/hugin/xrc/pano_panel.xrc:708 msgid "Layers:" msgstr "圖層：" -#: hugin1/base_wx/StitchingExecutor.cpp:340 hugin1/hugin/xrc/pano_panel.xrc:723 +#: hugin1/base_wx/StitchingExecutor.cpp:339 +#: hugin1/hugin/xrc/pano_panel.xrc:723 msgid "Blended layers of similar exposure, without exposure correction" msgstr "融合曝光接近的圖層，不進行曝光校正" -#: hugin1/base_wx/StitchingExecutor.cpp:344 +#: hugin1/base_wx/StitchingExecutor.cpp:343 #, fuzzy msgid "First input image" msgstr "第一張影像" -#: hugin1/base_wx/StitchingExecutor.cpp:345 +#: hugin1/base_wx/StitchingExecutor.cpp:344 #, fuzzy msgid "Number:" msgstr "CPU 編號:" -#: hugin1/base_wx/StitchingExecutor.cpp:346 +#: hugin1/base_wx/StitchingExecutor.cpp:345 msgid "Filename:" msgstr "檔案名稱:" -#: hugin1/base_wx/StitchingExecutor.cpp:347 +#: hugin1/base_wx/StitchingExecutor.cpp:346 #, fuzzy, c-format msgid "Size: %dx%d" msgstr "底圖尺寸" -#: hugin1/base_wx/StitchingExecutor.cpp:349 +#: hugin1/base_wx/StitchingExecutor.cpp:348 #, fuzzy msgid "Response type:" msgstr "響應形式" -#: hugin1/base_wx/StitchingExecutor.cpp:350 +#: hugin1/base_wx/StitchingExecutor.cpp:349 #, c-format msgid "HFOV: %.0f" msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:351 +#: hugin1/base_wx/StitchingExecutor.cpp:350 #, fuzzy, c-format msgid "Exposure value: %.1f" msgstr "曝光值 (Eev)" -#: hugin1/base_wx/StitchingExecutor.cpp:587 +#: hugin1/base_wx/StitchingExecutor.cpp:586 msgid "Remapping and blending LDR images..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:598 +#: hugin1/base_wx/StitchingExecutor.cpp:597 #, fuzzy msgid "Remapping LDR images..." msgstr "圖片重新定位：" -#: hugin1/base_wx/StitchingExecutor.cpp:609 +#: hugin1/base_wx/StitchingExecutor.cpp:608 #, fuzzy msgid "Blending images..." msgstr "正在對準圖片" -#: hugin1/base_wx/StitchingExecutor.cpp:658 +#: hugin1/base_wx/StitchingExecutor.cpp:657 msgid "Remapping LDR images and blending exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:676 +#: hugin1/base_wx/StitchingExecutor.cpp:675 #, fuzzy msgid "Remapping LDR images without exposure correction..." msgstr "融合曝光接近的圖層，不進行曝光校正" -#: hugin1/base_wx/StitchingExecutor.cpp:696 +#: hugin1/base_wx/StitchingExecutor.cpp:695 #, fuzzy, c-format msgid "Blending exposure layer %u..." msgstr "輸出光圈%d 的圖層" -#: hugin1/base_wx/StitchingExecutor.cpp:717 +#: hugin1/base_wx/StitchingExecutor.cpp:716 msgid "Fusing all exposure layers..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:740 +#: hugin1/base_wx/StitchingExecutor.cpp:739 #, fuzzy, c-format msgid "Fusing stack number %u..." msgstr "堆棧圖編號" -#: hugin1/base_wx/StitchingExecutor.cpp:763 -#: hugin1/base_wx/StitchingExecutor.cpp:774 +#: hugin1/base_wx/StitchingExecutor.cpp:762 +#: hugin1/base_wx/StitchingExecutor.cpp:773 msgid "Blending all stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:791 +#: hugin1/base_wx/StitchingExecutor.cpp:790 #, fuzzy msgid "Remapping HDR images..." msgstr "圖片重新定位：" -#: hugin1/base_wx/StitchingExecutor.cpp:813 +#: hugin1/base_wx/StitchingExecutor.cpp:812 #, fuzzy, c-format msgid "Merging HDR stack number %u..." msgstr "堆棧圖編號" -#: hugin1/base_wx/StitchingExecutor.cpp:829 -#: hugin1/base_wx/StitchingExecutor.cpp:836 +#: hugin1/base_wx/StitchingExecutor.cpp:828 +#: hugin1/base_wx/StitchingExecutor.cpp:835 msgid "Blending HDR stacks..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:853 -#: hugin1/base_wx/StitchingExecutor.cpp:859 +#: hugin1/base_wx/StitchingExecutor.cpp:856 +#: hugin1/base_wx/StitchingExecutor.cpp:862 msgid "Updating metadata..." msgstr "" -#: hugin1/base_wx/StitchingExecutor.cpp:1004 -#: hugin1/base_wx/StitchingExecutor.cpp:1008 +#: hugin1/base_wx/StitchingExecutor.cpp:1007 +#: hugin1/base_wx/StitchingExecutor.cpp:1011 #, fuzzy, c-format msgid "Stitching using \"%s\"" msgstr "接合中 %s" -#: hugin1/base_wx/huginConfig.cpp:37 +#: hugin1/base_wx/huginConfig.cpp:36 msgid "first image" msgstr "第一張影像" -#: hugin1/base_wx/huginConfig.cpp:38 +#: hugin1/base_wx/huginConfig.cpp:37 msgid "last image" msgstr "最後一張影像" -#: hugin1/base_wx/huginConfig.cpp:40 +#: hugin1/base_wx/huginConfig.cpp:39 msgid "directory" msgstr "目錄" -#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:155 +#: hugin1/base_wx/huginConfig.cpp:45 hugin1/hugin/ImagesTree.cpp:155 msgid "Camera maker" msgstr "相機製造商:" -#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesTree.cpp:156 +#: hugin1/base_wx/huginConfig.cpp:46 hugin1/hugin/ImagesTree.cpp:156 msgid "Camera model" msgstr "相機型號:" -#: hugin1/base_wx/huginConfig.cpp:48 hugin1/hugin/ImagesPanel.cpp:691 -#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1258 +#: hugin1/base_wx/huginConfig.cpp:47 hugin1/hugin/ImagesPanel.cpp:691 +#: hugin1/hugin/ImagesTree.cpp:157 hugin1/hugin/ImagesTree.cpp:1197 #: hugin1/hugin/xrc/image_variable_dlg.xrc:152 #: hugin1/hugin/xrc/image_variable_dlg.xrc:347 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:8 @@ -684,35 +701,69 @@ msgid "Lens" msgstr "鏡頭" -#: hugin1/base_wx/huginConfig.cpp:84 +#: hugin1/base_wx/huginConfig.cpp:83 msgid "unknown projection" msgstr "未知的專案" -#: hugin1/base_wx/platform.cpp:125 hugin1/base_wx/wxLensDB.cpp:631 +#: hugin1/base_wx/platform.cpp:65 +#, fuzzy +msgid "All Image files" +msgstr "圖片檔案:" + +#: hugin1/base_wx/platform.cpp:79 hugin1/base_wx/platform.cpp:102 +msgid "JPEG files (*.jpg,*.jpeg)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:80 hugin1/base_wx/platform.cpp:103 +msgid "TIFF files (*.tif,*.tiff)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:81 hugin1/base_wx/platform.cpp:104 +msgid "PNG files (*.png)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:82 hugin1/base_wx/platform.cpp:105 +msgid "HDR files (*.hdr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:83 hugin1/base_wx/platform.cpp:106 +msgid "EXR files (*.exr)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:84 +msgid "All files (*)" +msgstr "" + +#: hugin1/base_wx/platform.cpp:93 +#, fuzzy +msgid "Raw files" +msgstr "讀取檔案 %s" + +#: hugin1/base_wx/platform.cpp:217 hugin1/base_wx/wxLensDB.cpp:631 #: hugin1/base_wx/wxLensDB.cpp:636 hugin1/base_wx/wxLensDB.cpp:644 #: hugin1/calibrate_lens/LensCalFrame.cpp:353 -#: hugin1/hugin/CPEditorPanel.cpp:1987 hugin1/hugin/GLViewer.cpp:139 -#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/MainFrame.cpp:949 -#: hugin1/hugin/MainFrame.cpp:1664 hugin1/hugin/MainFrame.cpp:1726 -#: hugin1/hugin/MainFrame.cpp:2136 hugin1/hugin/MainFrame.cpp:2356 -#: hugin1/hugin/MainFrame.cpp:2396 hugin1/hugin/MainFrame.cpp:2454 -#: hugin1/hugin/MainFrame.cpp:2466 hugin1/hugin/MainFrame.cpp:2481 -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/CPEditorPanel.cpp:2235 hugin1/hugin/GLViewer.cpp:136 +#: hugin1/hugin/GLViewer.cpp:148 hugin1/hugin/MainFrame.cpp:1009 +#: hugin1/hugin/MainFrame.cpp:1712 hugin1/hugin/MainFrame.cpp:1774 +#: hugin1/hugin/MainFrame.cpp:2190 hugin1/hugin/MainFrame.cpp:2411 +#: hugin1/hugin/MainFrame.cpp:2451 hugin1/hugin/MainFrame.cpp:2509 +#: hugin1/hugin/MainFrame.cpp:2521 hugin1/hugin/MainFrame.cpp:2536 +#: hugin1/hugin/MainFrame.cpp:2544 #: hugin1/hugin/OptimizePhotometricPanel.cpp:274 #: hugin1/hugin/OptimizePhotometricPanel.cpp:333 -#: hugin1/hugin/PanoOperation.cpp:552 hugin1/hugin/PanoPanel.cpp:1100 -#: hugin1/hugin/PanoPanel.cpp:1315 hugin1/hugin/PanoPanel.cpp:1387 -#: hugin1/hugin/PreferencesDialog.cpp:420 -#: hugin1/hugin/PreferencesDialog.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:633 hugin1/hugin/PanoPanel.cpp:1101 +#: hugin1/hugin/PanoPanel.cpp:1316 hugin1/hugin/PanoPanel.cpp:1388 +#: hugin1/hugin/PreferencesDialog.cpp:477 +#: hugin1/hugin/PreferencesDialog.cpp:547 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:223 -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 -#: hugin1/ptbatcher/ProjectListBox.cpp:180 -#: hugin1/stitch_project/hugin_stitch_project.cpp:348 -#: hugin1/stitch_project/hugin_stitch_project.cpp:391 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 +#: hugin1/stitch_project/hugin_stitch_project.cpp:360 +#: hugin1/stitch_project/hugin_stitch_project.cpp:403 msgid "Error" msgstr "錯誤" -#: hugin1/base_wx/platform.cpp:434 +#: hugin1/base_wx/platform.cpp:526 #, c-format msgid "" "The filename(s) contains one of the following invalid characters: %s\n" @@ -722,25 +773,11 @@ "檔案名稱包含非正確格式的字元 %s\n" "Hugin 不能辨識這些字元，請重新命名您的檔案，並再試一次" -#: hugin1/base_wx/platform.cpp:451 +#: hugin1/base_wx/platform.cpp:543 #, c-format msgid "Debug report generated in \"%s\"." msgstr "" -#: hugin1/base_wx/platform.h:43 -msgid "" -"All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." -"PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|" -"JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*." -"tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*." -"hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" -msgstr "" -"全部圖片檔案|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*." -"bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG " -"檔案 (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF 檔案 (*.tif,*.tiff)|*.tif;" -"*.TIF;*.tiff;*.TIFF|PNG 檔案 (*.png)|*.png;*.PNG|HDR 檔案 (*.hdr)|*.hdr;*." -"HDR|EXR 檔案 (*.exr)|*.exr;*.EXR|全部檔案 (*)|*" - #: hugin1/base_wx/wxLensDB.cpp:132 #, fuzzy, c-format msgid "Camera %s (%s)" @@ -752,27 +789,27 @@ msgstr "[%s] 是無效的輸入數字" #: hugin1/base_wx/wxLensDB.cpp:207 hugin1/base_wx/wxLensDB.cpp:535 -#: hugin1/base_wx/wxPanoCommand.cpp:269 hugin1/base_wx/wxPanoCommand.cpp:279 -#: hugin1/base_wx/wxPanoCommand.cpp:300 hugin1/base_wx/wxPanoCommand.cpp:331 +#: hugin1/base_wx/wxPanoCommand.cpp:246 hugin1/base_wx/wxPanoCommand.cpp:256 +#: hugin1/base_wx/wxPanoCommand.cpp:277 hugin1/base_wx/wxPanoCommand.cpp:308 #: hugin1/calibrate_lens/LensCalFrame.cpp:289 #: hugin1/calibrate_lens/LensCalFrame.cpp:366 #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:586 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 -#: hugin1/hugin/CPDetectorDialog.cpp:126 hugin1/hugin/GLPreviewFrame.cpp:1582 -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/GLPreviewFrame.cpp:1596 -#: hugin1/hugin/GLPreviewFrame.cpp:1610 hugin1/hugin/GLPreviewFrame.cpp:1617 -#: hugin1/hugin/GLPreviewFrame.cpp:1624 hugin1/hugin/MainFrame.cpp:1895 -#: hugin1/hugin/MainFrame.cpp:2381 hugin1/hugin/MainFrame.cpp:2400 -#: hugin1/hugin/MainFrame.cpp:2406 hugin1/hugin/MaskEditorPanel.cpp:512 -#: hugin1/hugin/PanoPanel.cpp:1368 hugin1/hugin/PreferencesDialog.cpp:1089 -#: hugin1/ptbatcher/FindPanoDialog.cpp:294 -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 hugin1/hugin/xrc/dlg_warning.xrc:56 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 +#: hugin1/hugin/CPDetectorDialog.cpp:131 hugin1/hugin/GLPreviewFrame.cpp:1602 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/GLPreviewFrame.cpp:1616 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 hugin1/hugin/GLPreviewFrame.cpp:1637 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 hugin1/hugin/MainFrame.cpp:1944 +#: hugin1/hugin/MainFrame.cpp:2436 hugin1/hugin/MainFrame.cpp:2455 +#: hugin1/hugin/MainFrame.cpp:2461 hugin1/hugin/MaskEditorPanel.cpp:509 +#: hugin1/hugin/PanoPanel.cpp:1369 hugin1/hugin/PreferencesDialog.cpp:1159 +#: hugin1/ptbatcher/FindPanoDialog.cpp:296 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "Warning" msgstr "注意" @@ -788,7 +825,7 @@ msgid "Could not save information into database." msgstr "無法把資訊存進資料庫檔案" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 #, c-format msgid "" "Could not decode image:\n" @@ -799,11 +836,11 @@ "%s\n" "中斷" -#: hugin1/base_wx/wxPanoCommand.cpp:260 hugin1/base_wx/wxPanoCommand.cpp:352 +#: hugin1/base_wx/wxPanoCommand.cpp:237 hugin1/base_wx/wxPanoCommand.cpp:329 msgid "Unsupported image file format" msgstr "不支援此圖片檔案格式" -#: hugin1/base_wx/wxPanoCommand.cpp:268 +#: hugin1/base_wx/wxPanoCommand.cpp:245 #: hugin1/calibrate_lens/LensCalFrame.cpp:288 #, c-format msgid "" @@ -812,7 +849,7 @@ "Convert image to grayscale image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:278 +#: hugin1/base_wx/wxPanoCommand.cpp:255 #, c-format msgid "" "Hugin supports only grayscale and RGB images (without and with alpha " @@ -823,78 +860,78 @@ "Convert this image to grayscale or RGB image and try loading again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:288 +#: hugin1/base_wx/wxPanoCommand.cpp:265 msgid "" "Hugin supports only grayscale or RGB images (without and with alpha channel)." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:292 +#: hugin1/base_wx/wxPanoCommand.cpp:269 #, c-format msgid "" "File \"%s\" is a grayscale image, but other images in project are color " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:296 +#: hugin1/base_wx/wxPanoCommand.cpp:273 #, c-format msgid "" "File \"%s\" is a color image, but other images in project are grayscale " "images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:299 +#: hugin1/base_wx/wxPanoCommand.cpp:276 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 "" -#: hugin1/base_wx/wxPanoCommand.cpp:316 +#: hugin1/base_wx/wxPanoCommand.cpp:293 #, c-format msgid "" "File \"%s\" has no embedded icc profile, but other images in project have " "profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:322 +#: hugin1/base_wx/wxPanoCommand.cpp:299 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have no embedded color profile." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:326 +#: hugin1/base_wx/wxPanoCommand.cpp:303 #, c-format msgid "" "File \"%s\" has icc profile \"%s\" embedded, but other images in project " "have color profile \"%s\" embedded." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:330 +#: hugin1/base_wx/wxPanoCommand.cpp:307 msgid "" "Hugin expects all images in the same color profile.\n" "Please convert all images to same color profile and try again." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:523 +#: hugin1/base_wx/wxPanoCommand.cpp:442 msgid "" "Hugin has image stacks detected in the added images and will assign " "corresponding stack numbers to the images." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:527 +#: hugin1/base_wx/wxPanoCommand.cpp:446 msgid "" "Hugin has image stacks detected in the whole project. Stack numbers will be " "re-assigned on base of this detection. Existing stack assignments will be " "overwritten." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:530 +#: hugin1/base_wx/wxPanoCommand.cpp:449 #, fuzzy msgid "Should the position of images in each stack be linked?" msgstr "載入批次處理序列的程序要跳過嗎？" -#: hugin1/base_wx/wxPanoCommand.cpp:538 hugin1/hugin/xrc/main_frame.xrc:215 +#: hugin1/base_wx/wxPanoCommand.cpp:457 hugin1/hugin/xrc/main_frame.xrc:215 msgid "" "When shooting bracketed image stacks from a sturdy tripod the position of " "the images in each stack can be linked to help Hugin to process the " @@ -902,44 +939,44 @@ "position (e. g. when shooting hand held), then don't link the position." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:236 #, fuzzy msgid "Link position" msgstr "重設照片位置" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/base_wx/wxPanoCommand.cpp:464 #: hugin1/hugin/xrc/main_frame.xrc:242 #, fuzzy msgid "Don't link position" msgstr "指令串參數" -#: hugin1/base_wx/wxPanoCommand.cpp:541 hugin1/hugin/xrc/main_frame.xrc:247 +#: hugin1/base_wx/wxPanoCommand.cpp:460 hugin1/hugin/xrc/main_frame.xrc:247 msgid "Don't assign stacks" msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:545 +#: hugin1/base_wx/wxPanoCommand.cpp:464 #, fuzzy msgid "Keep existing stacks" msgstr "覆蓋已經存在的圖片" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 #, c-format msgid "" "The project file \"%s\" refers to image \"%s\" which was not found.\n" "Please manually select the correct image." msgstr "" -#: hugin1/base_wx/wxPanoCommand.cpp:645 +#: hugin1/base_wx/wxPanoCommand.cpp:564 msgid "Image file not found" msgstr "沒有發現圖片檔案" -#: hugin1/base_wx/wxPanoCommand.cpp:652 +#: hugin1/base_wx/wxPanoCommand.cpp:571 #, fuzzy, c-format msgid "Select image %s" msgstr "選取圖片編輯器" -#: hugin1/base_wx/wxPanoCommand.cpp:759 +#: hugin1/base_wx/wxPanoCommand.cpp:678 #, c-format msgid "" "%d invalid control point(s) found.\n" @@ -950,16 +987,17 @@ "\n" "請按OK移除." -#: hugin1/base_wx/wxPanoCommand.cpp:760 +#: hugin1/base_wx/wxPanoCommand.cpp:679 msgid "Error Detected" msgstr "偵測到錯誤" -#: hugin1/base_wx/wxPanoCommand.cpp:845 -#: hugin1/calibrate_lens/LensCalFrame.cpp:374 hugin1/hugin/PanoOperation.cpp:92 +#: hugin1/base_wx/wxPanoCommand.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:374 +#: hugin1/hugin/PanoOperation.cpp:97 msgid "Add images" msgstr "增加影像" -#: hugin1/base_wx/wxPanoCommand.cpp:925 +#: hugin1/base_wx/wxPanoCommand.cpp:844 #, c-format msgid "" "Error, template expects %d images,\n" @@ -968,32 +1006,32 @@ "錯誤, 版面需要 %d 張圖片,\n" "目前專案包含 %d 張圖片\n" -#: hugin1/base_wx/wxPanoCommand.cpp:926 hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:845 hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Could not apply template" msgstr "無法執行此版面" -#: hugin1/base_wx/wxPanoCommand.cpp:951 +#: hugin1/base_wx/wxPanoCommand.cpp:870 msgid "Error loading project file" msgstr "載入專案檔案發生錯誤" -#: hugin1/base_wx/wxPanoCommand.cpp:965 +#: hugin1/base_wx/wxPanoCommand.cpp:884 msgid "Result" msgstr "結果" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 hugin1/hugin/huginApp.cpp:223 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 hugin1/hugin/huginApp.cpp:230 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 msgid "xrc directory not found in bundle" msgstr "xrc 目錄不存在於軟體集中" -#: hugin1/calibrate_lens/LensCalApp.cpp:65 -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/MainFrame.cpp:2131 -#: hugin1/hugin/huginApp.cpp:223 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:97 hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:71 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/MainFrame.cpp:2185 +#: hugin1/hugin/huginApp.cpp:230 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:100 hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "Fatal Error" msgstr "嚴重錯誤" -#: hugin1/calibrate_lens/LensCalApp.cpp:77 hugin1/hugin/huginApp.cpp:256 -#: hugin1/ptbatcher/PTBatcherGUI.cpp:119 +#: hugin1/calibrate_lens/LensCalApp.cpp:93 hugin1/hugin/huginApp.cpp:276 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:134 msgid "" "xrc directory not found, hugin needs to be properly installed\n" "Tried Path:" @@ -1025,7 +1063,7 @@ "這些新增影像(%s)的EXIF資訊與已新增的影像不符\n" "請再次檢查，確定您選取的是正確的影像" -#: hugin1/calibrate_lens/LensCalFrame.cpp:448 hugin1/hugin/MainFrame.cpp:1202 +#: hugin1/calibrate_lens/LensCalFrame.cpp:448 msgid "Add Image: cancel" msgstr "增加影像: 取消" @@ -1038,9 +1076,9 @@ #: hugin1/calibrate_lens/LensCalFrame.cpp:555 #: hugin1/calibrate_lens/LensCalFrame.cpp:578 #: hugin1/calibrate_lens/LensCalFrame.cpp:600 -#: hugin1/calibrate_lens/LensCalFrame.cpp:751 -#: hugin1/calibrate_lens/LensCalFrame.cpp:785 -#: hugin1/calibrate_lens/LensCalFrame.cpp:857 +#: hugin1/calibrate_lens/LensCalFrame.cpp:748 +#: hugin1/calibrate_lens/LensCalFrame.cpp:782 +#: hugin1/calibrate_lens/LensCalFrame.cpp:854 msgid "" "There are invalid values in the input boxes.\n" "Please check your inputs." @@ -1055,7 +1093,7 @@ msgstr "偵測直線..." #: hugin1/calibrate_lens/LensCalFrame.cpp:570 -#: hugin1/calibrate_lens/LensCalFrame.cpp:716 +#: hugin1/calibrate_lens/LensCalFrame.cpp:713 msgid "Finished" msgstr "完成" @@ -1068,11 +1106,11 @@ "已知的直線不存在\n" "請先執行\"尋找直線\"。如果找不到直線，請試著改變參數。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:700 +#: hugin1/calibrate_lens/LensCalFrame.cpp:697 msgid "Optimizing lens distortion parameters..." msgstr "最佳化鏡頭變形參數..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:759 +#: hugin1/calibrate_lens/LensCalFrame.cpp:756 msgid "" "There are no detected lines.\n" "Please run \"Find lines\" and \"Optimize\" before saving the lens data. If " @@ -1082,147 +1120,147 @@ "請在儲存鏡頭資訊前先執行\"尋找直線\"和\"最佳化\"。如果找不到直線，請試著改變" "參數。" -#: hugin1/calibrate_lens/LensCalFrame.cpp:764 +#: hugin1/calibrate_lens/LensCalFrame.cpp:761 msgid "Save lens parameters to ini file" msgstr "儲存鏡頭參數到 .ini 檔" -#: hugin1/calibrate_lens/LensCalFrame.cpp:765 -#: hugin1/hugin/PanoOperation.cpp:586 +#: hugin1/calibrate_lens/LensCalFrame.cpp:762 +#: hugin1/hugin/PanoOperation.cpp:667 #, fuzzy msgid "Save lens parameters to lens database" msgstr "儲存鏡頭參數到 lensfun 資料庫" -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 msgid "Saving lens data" msgstr "儲存鏡頭參數..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:766 +#: hugin1/calibrate_lens/LensCalFrame.cpp:763 #: hugin1/hugin/xrc/lenscal_frame.xrc:379 msgid "Save lens" msgstr "儲存鏡頭..." -#: hugin1/calibrate_lens/LensCalFrame.cpp:789 hugin1/hugin/MainFrame.cpp:967 +#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:1027 msgid "Save project file" msgstr "儲存專案檔案" -#: hugin1/calibrate_lens/LensCalFrame.cpp:790 hugin1/hugin/MainFrame.cpp:969 -#: hugin1/hugin/MainFrame.cpp:1126 hugin1/hugin/MainFrame.cpp:1633 -#: hugin1/hugin/MainFrame.cpp:1692 hugin1/ptbatcher/Batch.cpp:672 -#: hugin1/ptbatcher/BatchFrame.cpp:396 hugin1/ptbatcher/BatchFrame.cpp:424 -#: hugin1/stitch_project/hugin_stitch_project.cpp:358 +#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:1029 +#: hugin1/hugin/MainFrame.cpp:1186 hugin1/hugin/MainFrame.cpp:1681 +#: hugin1/hugin/MainFrame.cpp:1740 hugin1/ptbatcher/Batch.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:431 +#: hugin1/stitch_project/hugin_stitch_project.cpp:370 msgid "Project files (*.pto)|*.pto|All files (*)|*" msgstr "專案檔案 (*.pto)|*.pto|全部檔案 (*)|*" -#: hugin1/executor/hugin_executor.cpp:187 +#: hugin1/executor/hugin_executor.cpp:199 #, fuzzy msgid "Removing temporary files..." msgstr "正在清理暫時的識別點檔案" -#: hugin1/executor/hugin_executor.cpp:205 +#: hugin1/executor/hugin_executor.cpp:217 msgid "shows this help message" msgstr "" -#: hugin1/executor/hugin_executor.cpp:206 +#: hugin1/executor/hugin_executor.cpp:218 #, fuzzy msgid "execute assistant" msgstr "執行接圖分析" -#: hugin1/executor/hugin_executor.cpp:207 +#: hugin1/executor/hugin_executor.cpp:219 msgid "execute stitching with given project" msgstr "" -#: hugin1/executor/hugin_executor.cpp:208 +#: hugin1/executor/hugin_executor.cpp:220 #, fuzzy msgid "number of used threads" msgstr "執行緒的數量：" -#: hugin1/executor/hugin_executor.cpp:209 +#: hugin1/executor/hugin_executor.cpp:221 msgid "prefix used for stitching" msgstr "" -#: hugin1/executor/hugin_executor.cpp:210 +#: hugin1/executor/hugin_executor.cpp:222 msgid "use user defined commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:211 +#: hugin1/executor/hugin_executor.cpp:223 msgid "use user defined assistant commands in given file" msgstr "" -#: hugin1/executor/hugin_executor.cpp:212 +#: hugin1/executor/hugin_executor.cpp:224 #, fuzzy msgid "only print commands" msgstr "正在執行指令 \"" -#: hugin1/hugin/AboutDialog.cpp:138 +#: hugin1/hugin/AboutDialog.cpp:142 #, c-format msgid "Operating System: %s" msgstr "作業系統： %s" -#: hugin1/hugin/AboutDialog.cpp:141 +#: hugin1/hugin/AboutDialog.cpp:145 msgid "64 bit" msgstr "64 位元" -#: hugin1/hugin/AboutDialog.cpp:143 +#: hugin1/hugin/AboutDialog.cpp:147 msgid "32 bit" msgstr "32 位元" -#: hugin1/hugin/AboutDialog.cpp:144 +#: hugin1/hugin/AboutDialog.cpp:148 #, fuzzy, c-format msgid "Architecture: %s" msgstr "建築： %s" -#: hugin1/hugin/AboutDialog.cpp:147 +#: hugin1/hugin/AboutDialog.cpp:151 #, fuzzy, c-format msgid "Free memory: %lld kiB" msgstr "剩餘記憶體： %ld kiB" -#: hugin1/hugin/AboutDialog.cpp:150 +#: hugin1/hugin/AboutDialog.cpp:154 #, c-format msgid "Active Codepage: %u" msgstr "使用中的字碼頁： %u" -#: hugin1/hugin/AboutDialog.cpp:182 +#: hugin1/hugin/AboutDialog.cpp:186 #, c-format msgid "Version: %s" msgstr "版本： %s" -#: hugin1/hugin/AboutDialog.cpp:183 +#: hugin1/hugin/AboutDialog.cpp:187 #, c-format msgid "Path to resources: %s" msgstr "來源路徑： %s" -#: hugin1/hugin/AboutDialog.cpp:184 +#: hugin1/hugin/AboutDialog.cpp:188 #, c-format msgid "Path to data: %s" msgstr "資料路徑：%s" -#: hugin1/hugin/AboutDialog.cpp:186 +#: hugin1/hugin/AboutDialog.cpp:190 #, fuzzy, c-format msgid "Hugins camera and lens database: %s" msgstr "照相機和鏡頭數據" -#: hugin1/hugin/AboutDialog.cpp:187 +#: hugin1/hugin/AboutDialog.cpp:191 msgid "Multi-threading using C++11 std::thread and OpenMP" msgstr "" -#: hugin1/hugin/AboutDialog.cpp:190 +#: hugin1/hugin/AboutDialog.cpp:194 #, fuzzy, c-format msgid "Monitor profile: %s" msgstr "無法開啟專案檔：%s" -#: hugin1/hugin/AboutDialog.cpp:192 +#: hugin1/hugin/AboutDialog.cpp:196 msgid "Libraries" msgstr "函式庫" -#: hugin1/hugin/CPDetectorDialog.cpp:98 +#: hugin1/hugin/CPDetectorDialog.cpp:103 msgid "Autopano from http://autopano.kolor.com is not available for OS X" msgstr "來自於 http://autopano.kolor.com 的 Autopano 對 OSX 來說是沒有用的" -#: hugin1/hugin/CPDetectorDialog.cpp:99 +#: hugin1/hugin/CPDetectorDialog.cpp:104 msgid "Using Autopano-Sift instead" msgstr "正在以 Autopano-SIFT 來取代" -#: hugin1/hugin/CPDetectorDialog.cpp:125 +#: hugin1/hugin/CPDetectorDialog.cpp:130 msgid "" "At least one input field is empty.\n" "Please check your inputs." @@ -1230,89 +1268,94 @@ "至少有一個欄位空白.\n" "請檢查你的輸入。" -#: hugin1/hugin/CPDetectorDialog.cpp:220 +#: hugin1/hugin/CPDetectorDialog.cpp:225 msgid "Try to connect all overlapping images." msgstr "試著連接所有重疊的圖片." -#: hugin1/hugin/CPDetectorDialog.cpp:226 +#: hugin1/hugin/CPDetectorDialog.cpp:231 msgid "Only work on image pairs without control points." msgstr "只用沒有控制點的圖片對." -#: hugin1/hugin/CPDetectorDialog.cpp:254 +#: hugin1/hugin/CPDetectorDialog.cpp:259 msgid "Select control point detector program" msgstr "選取控制點偵測器程式" -#: hugin1/hugin/CPDetectorDialog.cpp:262 +#: hugin1/hugin/CPDetectorDialog.cpp:267 msgid "Executables (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat" msgstr "可執行檔案 (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd; *.bat" -#: hugin1/hugin/CPEditorPanel.cpp:142 +#: hugin1/hugin/CPEditorPanel.cpp:150 msgid "#" msgstr "#" -#: hugin1/hugin/CPEditorPanel.cpp:143 +#: hugin1/hugin/CPEditorPanel.cpp:151 msgid "left x" msgstr "左圖 x" -#: hugin1/hugin/CPEditorPanel.cpp:144 +#: hugin1/hugin/CPEditorPanel.cpp:152 msgid "left y" msgstr "左圖 y" -#: hugin1/hugin/CPEditorPanel.cpp:145 +#: hugin1/hugin/CPEditorPanel.cpp:153 msgid "right x" msgstr "右圖 x" -#: hugin1/hugin/CPEditorPanel.cpp:146 +#: hugin1/hugin/CPEditorPanel.cpp:154 msgid "right y" msgstr "右圖 y" -#: hugin1/hugin/CPEditorPanel.cpp:147 hugin1/hugin/CPListFrame.cpp:96 +#: hugin1/hugin/CPEditorPanel.cpp:155 hugin1/hugin/CPListFrame.cpp:100 msgid "Alignment" msgstr "對準" -#: hugin1/hugin/CPEditorPanel.cpp:148 hugin1/hugin/CPListFrame.cpp:97 +#: hugin1/hugin/CPEditorPanel.cpp:156 hugin1/hugin/CPEditorPanel.cpp:1421 +#: hugin1/hugin/CPListFrame.cpp:101 hugin1/hugin/CPListFrame.cpp:222 msgid "Distance" msgstr "距離" -#: hugin1/hugin/CPEditorPanel.cpp:409 hugin1/hugin/CPEditorPanel.cpp:555 +#: hugin1/hugin/CPEditorPanel.cpp:594 hugin1/hugin/CPEditorPanel.cpp:740 msgid "new control point added" msgstr "新增一個控制點" -#: hugin1/hugin/CPEditorPanel.cpp:676 hugin1/hugin/CPEditorPanel.cpp:1110 +#: hugin1/hugin/CPEditorPanel.cpp:866 hugin1/hugin/CPEditorPanel.cpp:1316 msgid "searching similar points..." msgstr "正在尋找相似點..." -#: hugin1/hugin/CPEditorPanel.cpp:695 hugin1/hugin/CPEditorPanel.cpp:835 +#: hugin1/hugin/CPEditorPanel.cpp:885 hugin1/hugin/CPEditorPanel.cpp:1025 msgid "Error during Fine-tune" msgstr "最佳調整時發生錯誤" -#: hugin1/hugin/CPEditorPanel.cpp:714 hugin1/hugin/CPEditorPanel.cpp:859 -#: hugin1/hugin/CPEditorPanel.cpp:1133 +#: hugin1/hugin/CPEditorPanel.cpp:904 hugin1/hugin/CPEditorPanel.cpp:1049 +#: hugin1/hugin/CPEditorPanel.cpp:1339 #, c-format msgid "" "Point fine-tuned, angle: %.0f deg, correlation coefficient: %0.3f, " "curvature: %0.3f %0.3f " msgstr "最佳調整後的點, 角度: %.0f 度, 相關係數: %0.3f, 曲率: %0.3f %0.3f " -#: hugin1/hugin/CPEditorPanel.cpp:717 hugin1/hugin/CPEditorPanel.cpp:862 +#: hugin1/hugin/CPEditorPanel.cpp:907 hugin1/hugin/CPEditorPanel.cpp:1052 msgid "change points, or press right mouse button to add the pair" msgstr "修改控制點, 或者點擊右鍵增加一對控制點" -#: hugin1/hugin/CPEditorPanel.cpp:738 +#: hugin1/hugin/CPEditorPanel.cpp:928 msgid "Estimated point outside image" msgstr "測量影像外的點" -#: hugin1/hugin/CPEditorPanel.cpp:1139 hugin1/hugin/CPEditorPanel.cpp:1154 +#: hugin1/hugin/CPEditorPanel.cpp:1311 +msgid "Distance between line control points too short, skipping fine-tune." +msgstr "" + +#: hugin1/hugin/CPEditorPanel.cpp:1345 hugin1/hugin/CPEditorPanel.cpp:1360 msgid "No similar point found." msgstr "沒有發現相似點" -#: hugin1/hugin/CPEditorPanel.cpp:1146 +#: hugin1/hugin/CPEditorPanel.cpp:1352 msgid "" "An internal transformation went wrong.\n" "Check that the point is inside the image." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1161 +#: hugin1/hugin/CPEditorPanel.cpp:1367 #, c-format msgid "" "Check the similarity visually.\n" @@ -1322,31 +1365,37 @@ "請目視檢查相似度 \n" "相關係數 (%.3f) 低於偏好設定中設定的閥值." -#: hugin1/hugin/CPEditorPanel.cpp:1184 hugin1/hugin/CPEditorPanel.cpp:1195 +#: hugin1/hugin/CPEditorPanel.cpp:1390 hugin1/hugin/CPEditorPanel.cpp:1401 msgid "Add new Line" msgstr "增加一條線" -#: hugin1/hugin/CPEditorPanel.cpp:1190 hugin1/hugin/CPEditorPanel.cpp:1193 -#: hugin1/hugin/CPEditorPanel.cpp:1454 hugin1/hugin/CPListFrame.cpp:154 +#: hugin1/hugin/CPEditorPanel.cpp:1396 hugin1/hugin/CPEditorPanel.cpp:1399 +#: hugin1/hugin/CPEditorPanel.cpp:1683 hugin1/hugin/CPListFrame.cpp:192 #, c-format msgid "Line %d" msgstr "線 %d" -#: hugin1/hugin/CPEditorPanel.cpp:1445 hugin1/hugin/CPListFrame.cpp:145 -#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:2957 -#: hugin1/hugin/PreviewFrame.cpp:215 hugin1/hugin/xrc/cp_editor_panel.xrc:185 +#: hugin1/hugin/CPEditorPanel.cpp:1417 hugin1/hugin/CPListFrame.cpp:101 +#: hugin1/hugin/CPListFrame.cpp:218 +#, fuzzy +msgid "Correlation" +msgstr "相關閥值:" + +#: hugin1/hugin/CPEditorPanel.cpp:1674 hugin1/hugin/CPListFrame.cpp:183 +#: hugin1/hugin/GLPreviewFrame.cpp:610 hugin1/hugin/GLPreviewFrame.cpp:3027 +#: hugin1/hugin/PreviewFrame.cpp:219 hugin1/hugin/xrc/cp_editor_panel.xrc:185 msgid "normal" msgstr "標準的" -#: hugin1/hugin/CPEditorPanel.cpp:1448 hugin1/hugin/CPListFrame.cpp:148 +#: hugin1/hugin/CPEditorPanel.cpp:1677 hugin1/hugin/CPListFrame.cpp:186 msgid "vert. Line" msgstr "垂直線" -#: hugin1/hugin/CPEditorPanel.cpp:1451 hugin1/hugin/CPListFrame.cpp:151 +#: hugin1/hugin/CPEditorPanel.cpp:1680 hugin1/hugin/CPListFrame.cpp:189 msgid "horiz. Line" msgstr "水平線" -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "" "Create control points.\n" "To create less points,\n" @@ -1356,92 +1405,93 @@ "如果想建立較少控制點,\n" "請輸入更高數字." -#: hugin1/hugin/CPEditorPanel.cpp:1734 +#: hugin1/hugin/CPEditorPanel.cpp:1982 msgid "Corner Detection threshold" msgstr "隅角偵測閥值" -#: hugin1/hugin/CPEditorPanel.cpp:1734 hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1982 hugin1/hugin/CPEditorPanel.cpp:1986 #: hugin1/hugin/xrc/cp_editor_panel.xrc:323 #: hugin1/hugin/xrc/images_panel.xrc:253 msgid "Create control points" msgstr "建立新的控制點" -#: hugin1/hugin/CPEditorPanel.cpp:1738 +#: hugin1/hugin/CPEditorPanel.cpp:1986 msgid "Corner Detection scale" msgstr "尖角偵測比例" -#: hugin1/hugin/CPEditorPanel.cpp:1750 +#: hugin1/hugin/CPEditorPanel.cpp:1998 msgid "Error during control point creation:\n" msgstr "建立控制點時發生錯誤:\n" -#: hugin1/hugin/CPEditorPanel.cpp:1847 +#: hugin1/hugin/CPEditorPanel.cpp:2095 msgid "Select point in right image" msgstr "在右圖選取點" -#: hugin1/hugin/CPEditorPanel.cpp:1859 +#: hugin1/hugin/CPEditorPanel.cpp:2107 msgid "Select point in left image" msgstr "在左圖選取點" -#: hugin1/hugin/CPEditorPanel.cpp:1936 +#: hugin1/hugin/CPEditorPanel.cpp:2184 #, c-format msgid "Create cp (Current setting: %s)" msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:1987 +#: hugin1/hugin/CPEditorPanel.cpp:2235 msgid "" "Cannot run celeste without at least one control point connecting the two " "images" msgstr "由於缺少至少一個連接兩張圖片的控制點無法執行 Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1992 hugin1/hugin/CPEditorPanel.cpp:2012 -#: hugin1/hugin/PanoOperation.cpp:736 hugin1/hugin/PanoOperation.cpp:786 +#: hugin1/hugin/CPEditorPanel.cpp:2240 hugin1/hugin/CPEditorPanel.cpp:2260 +#: hugin1/hugin/PanoOperation.cpp:817 hugin1/hugin/PanoOperation.cpp:867 msgid "Running Celeste" msgstr "執行 Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:1993 hugin1/hugin/PanoOperation.cpp:737 +#: hugin1/hugin/CPEditorPanel.cpp:2241 hugin1/hugin/PanoOperation.cpp:818 msgid "Loading model file" msgstr "載入模組檔案" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/CPEditorPanel.cpp:2090 -#: hugin1/hugin/MainFrame.cpp:1856 hugin1/hugin/PanoOperation.cpp:723 -#: hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/CPEditorPanel.cpp:2338 +#: hugin1/hugin/MainFrame.cpp:1905 hugin1/hugin/PanoOperation.cpp:804 +#: hugin1/hugin/PanoOperation.cpp:896 #, c-format msgid "Removed %lu control points" msgstr "移除了 %lu 個控制點" -#: hugin1/hugin/CPEditorPanel.cpp:2054 hugin1/hugin/PanoOperation.cpp:815 +#: hugin1/hugin/CPEditorPanel.cpp:2302 hugin1/hugin/PanoOperation.cpp:896 msgid "Celeste result" msgstr "Celeste 執行結果" -#: hugin1/hugin/CPEditorPanel.cpp:2090 hugin1/hugin/PanoOperation.cpp:723 +#: hugin1/hugin/CPEditorPanel.cpp:2338 hugin1/hugin/PanoOperation.cpp:804 msgid "Cleaning" msgstr "清理" -#: hugin1/hugin/CPEditorPanel.cpp:2102 +#: hugin1/hugin/CPEditorPanel.cpp:2350 #, fuzzy msgid "Create cp" msgstr "創建" -#: hugin1/hugin/CPEditorPanel.cpp:2105 +#: hugin1/hugin/CPEditorPanel.cpp:2353 msgid "" "Create control points for image pair with currently selected control point " "detector on photos tab." msgstr "" -#: hugin1/hugin/CPEditorPanel.cpp:2113 hugin1/hugin/xrc/cp_editor_panel.xrc:328 +#: hugin1/hugin/CPEditorPanel.cpp:2361 +#: hugin1/hugin/xrc/cp_editor_panel.xrc:328 msgid "Celeste" msgstr "Celeste" -#: hugin1/hugin/CPEditorPanel.cpp:2116 +#: hugin1/hugin/CPEditorPanel.cpp:2364 msgid "Tries to remove control points from clouds" msgstr "嘗試從雲朵上移除控制點" -#: hugin1/hugin/CPEditorPanel.cpp:2124 +#: hugin1/hugin/CPEditorPanel.cpp:2372 #, fuzzy msgid "Clean cp" msgstr "清除批次處理" -#: hugin1/hugin/CPEditorPanel.cpp:2127 hugin1/hugin/xrc/pref_dialog.xrc:317 +#: hugin1/hugin/CPEditorPanel.cpp:2375 hugin1/hugin/xrc/pref_dialog.xrc:400 msgid "Remove outlying control points by statistical method" msgstr "以統計方法移除符合離群值的控制點" @@ -1453,23 +1503,23 @@ msgid "Could not process event!" msgstr "無法執行此事件!" -#: hugin1/hugin/CPListFrame.cpp:92 +#: hugin1/hugin/CPListFrame.cpp:96 msgid "G CP#" msgstr "G CP#" -#: hugin1/hugin/CPListFrame.cpp:93 +#: hugin1/hugin/CPListFrame.cpp:97 msgid "Left Img." msgstr "左圖" -#: hugin1/hugin/CPListFrame.cpp:94 +#: hugin1/hugin/CPListFrame.cpp:98 msgid "Right Img." msgstr "右圖" -#: hugin1/hugin/CPListFrame.cpp:95 +#: hugin1/hugin/CPListFrame.cpp:99 msgid "P CP#" msgstr "P CP#" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "" "Enter minimum control point error.\n" "All points with a higher error will be selected" @@ -1477,7 +1527,7 @@ "輸入最小控制點時發生錯誤.\n" "所有具有更高誤差值的控制點將被選取" -#: hugin1/hugin/CPListFrame.cpp:547 +#: hugin1/hugin/CPListFrame.cpp:606 msgid "Select Control Points" msgstr "選取控制點" @@ -1548,60 +1598,60 @@ "拖曳圖片 (可以使用 shift 鍵來限制移動), 或使用右鍵-拖曳及 ctrl 鍵-拖曳來旋" "轉。" -#: hugin1/hugin/GLPreviewFrame.cpp:261 hugin1/hugin/GLPreviewFrame.cpp:3021 +#: hugin1/hugin/GLPreviewFrame.cpp:264 hugin1/hugin/GLPreviewFrame.cpp:3090 msgid "Fast Panorama preview" msgstr "快速全景圖片預覽" -#: hugin1/hugin/GLPreviewFrame.cpp:332 hugin1/hugin/GLPreviewFrame.cpp:3007 -#: hugin1/hugin/GLPreviewFrame.cpp:3019 hugin1/hugin/MainFrame.cpp:372 -#: hugin1/hugin/MainFrame.cpp:2224 hugin1/hugin/MainFrame.cpp:2242 +#: hugin1/hugin/GLPreviewFrame.cpp:335 hugin1/hugin/GLPreviewFrame.cpp:3076 +#: hugin1/hugin/GLPreviewFrame.cpp:3088 hugin1/hugin/MainFrame.cpp:408 +#: hugin1/hugin/MainFrame.cpp:2278 hugin1/hugin/MainFrame.cpp:2296 #: hugin1/hugin/xrc/batch_menu.xrc:5 hugin1/hugin/xrc/lenscal_frame.xrc:466 #: hugin1/hugin/xrc/main_menu.xrc:227 hugin1/hugin/xrc/main_menu.xrc:252 -#: hugin1/hugin/xrc/preview_frame.xrc:1094 -#: hugin1/hugin/xrc/preview_frame.xrc:1125 +#: hugin1/hugin/xrc/preview_frame.xrc:1117 +#: hugin1/hugin/xrc/preview_frame.xrc:1148 msgid "&File" msgstr "檔案 (&F)" -#: hugin1/hugin/GLPreviewFrame.cpp:351 hugin1/hugin/PreviewFrame.cpp:116 +#: hugin1/hugin/GLPreviewFrame.cpp:354 hugin1/hugin/PreviewFrame.cpp:120 msgid "displayed images" msgstr "顯示圖片" -#: hugin1/hugin/GLPreviewFrame.cpp:364 hugin1/hugin/xrc/preview_frame.xrc:42 +#: hugin1/hugin/GLPreviewFrame.cpp:367 hugin1/hugin/xrc/preview_frame.xrc:42 msgid "All" msgstr "所有" -#: hugin1/hugin/GLPreviewFrame.cpp:400 hugin1/hugin/ImagesPanel.cpp:688 +#: hugin1/hugin/GLPreviewFrame.cpp:403 hugin1/hugin/ImagesPanel.cpp:688 #: hugin1/hugin/xrc/pano_panel.xrc:554 hugin1/hugin/xrc/pano_panel.xrc:611 #: hugin1/hugin/xrc/pano_panel.xrc:1196 hugin1/hugin/xrc/pano_panel.xrc:1243 -#: hugin1/hugin/xrc/pref_dialog.xrc:785 hugin1/hugin/xrc/preview_frame.xrc:47 -#: hugin1/hugin/xrc/preview_frame.xrc:587 -#: hugin1/hugin/xrc/preview_frame.xrc:677 -#: hugin1/hugin/xrc/preview_frame.xrc:859 +#: hugin1/hugin/xrc/pref_dialog.xrc:868 hugin1/hugin/xrc/preview_frame.xrc:47 +#: hugin1/hugin/xrc/preview_frame.xrc:612 +#: hugin1/hugin/xrc/preview_frame.xrc:702 +#: hugin1/hugin/xrc/preview_frame.xrc:883 msgid "None" msgstr "無" -#: hugin1/hugin/GLPreviewFrame.cpp:415 +#: hugin1/hugin/GLPreviewFrame.cpp:418 msgid "Hide" msgstr "隱藏" -#: hugin1/hugin/GLPreviewFrame.cpp:463 hugin1/hugin/PreviewFrame.cpp:153 +#: hugin1/hugin/GLPreviewFrame.cpp:466 hugin1/hugin/PreviewFrame.cpp:157 msgid "VFOV" msgstr "垂直視角" -#: hugin1/hugin/GLPreviewFrame.cpp:467 hugin1/hugin/PreviewFrame.cpp:157 +#: hugin1/hugin/GLPreviewFrame.cpp:470 hugin1/hugin/PreviewFrame.cpp:161 msgid "drag to change the vertical field of view" msgstr "拖曳以修改垂直視角" -#: hugin1/hugin/GLPreviewFrame.cpp:476 hugin1/hugin/PreviewFrame.cpp:166 +#: hugin1/hugin/GLPreviewFrame.cpp:479 hugin1/hugin/PreviewFrame.cpp:170 msgid "HFOV" msgstr "水平視角" -#: hugin1/hugin/GLPreviewFrame.cpp:481 hugin1/hugin/PreviewFrame.cpp:171 +#: hugin1/hugin/GLPreviewFrame.cpp:484 hugin1/hugin/PreviewFrame.cpp:175 msgid "drag to change the horizontal field of view" msgstr "拖曳以修改水平視角" #: hugin1/hugin/GLPreviewFrame.cpp:539 hugin1/hugin/xrc/lenscal_frame.xrc:440 -#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:454 +#: hugin1/hugin/xrc/main_tool.xrc:67 hugin1/hugin/xrc/preview_frame.xrc:479 msgid "Preview" msgstr "預覽" @@ -1609,83 +1659,88 @@ msgid "Overview" msgstr "總覽" -#: hugin1/hugin/GLPreviewFrame.cpp:663 hugin1/hugin/PreviewFrame.cpp:285 +#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:298 msgid "Resets the projection's parameters to their default values." msgstr "將專案參數值重設為預設值" -#: hugin1/hugin/GLPreviewFrame.cpp:673 hugin1/hugin/PreviewFrame.cpp:294 +#: hugin1/hugin/GLPreviewFrame.cpp:683 hugin1/hugin/PreviewFrame.cpp:307 msgid "param:" msgstr "參數:" -#: hugin1/hugin/GLPreviewFrame.cpp:971 +#: hugin1/hugin/GLPreviewFrame.cpp:987 msgid "No images loaded." msgstr "沒有載入圖片" -#: hugin1/hugin/GLPreviewFrame.cpp:1009 +#: hugin1/hugin/GLPreviewFrame.cpp:1025 #, c-format msgid "%lu images loaded." msgstr "已載入 %lu 圖片" -#: hugin1/hugin/GLPreviewFrame.cpp:1026 +#: hugin1/hugin/GLPreviewFrame.cpp:1042 #, c-format msgid "Images are connected by %lu control points.\n" msgstr "圖片由 %lu 個控制點互相連接\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1035 +#: hugin1/hugin/GLPreviewFrame.cpp:1051 #, fuzzy, c-format msgid "%lu unconnected image groups found: %s\n" msgstr "發現以下 %d 組未連接圖片: " -#: hugin1/hugin/GLPreviewFrame.cpp:1041 +#: hugin1/hugin/GLPreviewFrame.cpp:1057 msgid "Images or control points have changed, new alignment is needed." msgstr "圖片或者控制點已經被改變, 需要重新對準." -#: hugin1/hugin/GLPreviewFrame.cpp:1052 +#: hugin1/hugin/GLPreviewFrame.cpp:1068 #, fuzzy, c-format msgid "Mean error after optimization: %.1f pixel, max: %.1f" msgstr " 最佳化後的平均錯誤: %.1f 像素, 最大值: %.1f\n" -#: hugin1/hugin/GLPreviewFrame.cpp:1460 hugin1/hugin/PreviewFrame.cpp:602 +#: hugin1/hugin/GLPreviewFrame.cpp:1480 hugin1/hugin/PreviewFrame.cpp:616 msgid "Rectilinear" msgstr "直線" -#: hugin1/hugin/GLPreviewFrame.cpp:1461 hugin1/hugin/PreviewFrame.cpp:603 +#: hugin1/hugin/GLPreviewFrame.cpp:1481 hugin1/hugin/PreviewFrame.cpp:617 msgid "Cylindrical" msgstr "圓柱" -#: hugin1/hugin/GLPreviewFrame.cpp:1582 hugin1/hugin/PreviewFrame.cpp:706 +#: hugin1/hugin/GLPreviewFrame.cpp:1602 hugin1/hugin/PreviewFrame.cpp:720 msgid "Yaw value must be numeric." msgstr "轉向角度值必須是數字." -#: hugin1/hugin/GLPreviewFrame.cpp:1589 hugin1/hugin/PreviewFrame.cpp:712 +#: hugin1/hugin/GLPreviewFrame.cpp:1609 hugin1/hugin/PreviewFrame.cpp:726 msgid "Pitch value must be numeric." msgstr "俯仰角度值必須是數字." -#: hugin1/hugin/GLPreviewFrame.cpp:1596 hugin1/hugin/PreviewFrame.cpp:718 +#: hugin1/hugin/GLPreviewFrame.cpp:1616 hugin1/hugin/PreviewFrame.cpp:732 msgid "Roll value must be numeric." msgstr "滾轉角度值必須是數字." -#: hugin1/hugin/GLPreviewFrame.cpp:1610 +#: hugin1/hugin/GLPreviewFrame.cpp:1630 msgid "X value must be numeric." msgstr "橫向偏移X值必須是數字" -#: hugin1/hugin/GLPreviewFrame.cpp:1617 +#: hugin1/hugin/GLPreviewFrame.cpp:1637 msgid "Y value must be numeric." msgstr "橫向偏移Y值必須是數字" -#: hugin1/hugin/GLPreviewFrame.cpp:1624 +#: hugin1/hugin/GLPreviewFrame.cpp:1644 msgid "Z value must be numeric." msgstr "橫向偏移Z值必須是數字" -#: hugin1/hugin/GLPreviewFrame.cpp:1643 hugin1/hugin/GLPreviewFrame.cpp:1665 -#: hugin1/hugin/GLPreviewFrame.cpp:2757 hugin1/hugin/GLPreviewFrame.cpp:2788 -#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:671 -#: hugin1/hugin/PanoPanel.cpp:702 hugin1/hugin/PreviewFrame.cpp:741 -#: hugin1/hugin/PreviewFrame.cpp:756 +#: hugin1/hugin/GLPreviewFrame.cpp:1663 hugin1/hugin/GLPreviewFrame.cpp:1701 +#: hugin1/hugin/GLPreviewFrame.cpp:1732 hugin1/hugin/GLPreviewFrame.cpp:2827 +#: hugin1/hugin/GLPreviewFrame.cpp:2858 +#: hugin1/hugin/ImageVariableDialog.cpp:222 hugin1/hugin/PanoPanel.cpp:672 +#: hugin1/hugin/PanoPanel.cpp:703 hugin1/hugin/PreviewFrame.cpp:755 +#: hugin1/hugin/PreviewFrame.cpp:774 hugin1/hugin/PreviewFrame.cpp:803 msgid "Value must be numeric." msgstr "數值必須是數字." -#: hugin1/hugin/GLPreviewFrame.cpp:1782 hugin1/hugin/GLPreviewFrame.cpp:1871 +#: hugin1/hugin/GLPreviewFrame.cpp:1706 hugin1/hugin/PreviewFrame.cpp:779 +msgid "Value for range compression is outside of valid range." +msgstr "" + +#: hugin1/hugin/GLPreviewFrame.cpp:1852 hugin1/hugin/GLPreviewFrame.cpp:1941 msgid "" "The mosaic/plane mode works only correct for a remapping plane of yaw=0 and " "pitch=0.\n" @@ -1693,75 +1748,75 @@ "Should the Tpy and Tpp parameters reset to zero?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2477 hugin1/hugin/PreviewFrame.cpp:216 +#: hugin1/hugin/GLPreviewFrame.cpp:2547 hugin1/hugin/PreviewFrame.cpp:220 msgid "difference" msgstr "差異" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 hugin1/hugin/xrc/preview_frame.xrc:819 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 hugin1/hugin/xrc/preview_frame.xrc:843 msgid "Autocrop" msgstr "自動裁剪" -#: hugin1/hugin/GLPreviewFrame.cpp:2503 hugin1/hugin/GLPreviewFrame.cpp:2533 -#: hugin1/hugin/PanoPanel.cpp:1056 +#: hugin1/hugin/GLPreviewFrame.cpp:2573 hugin1/hugin/GLPreviewFrame.cpp:2603 +#: hugin1/hugin/PanoPanel.cpp:1057 msgid "Calculating optimal crop" msgstr "計算最佳裁剪尺寸" -#: hugin1/hugin/GLPreviewFrame.cpp:2703 hugin1/hugin/PanoPanel.cpp:781 +#: hugin1/hugin/GLPreviewFrame.cpp:2773 hugin1/hugin/PanoPanel.cpp:782 msgid "Top needs to be an integer bigger than 0" msgstr "上部值需要是一個大於 0 的整數" -#: hugin1/hugin/GLPreviewFrame.cpp:2707 hugin1/hugin/PanoPanel.cpp:785 +#: hugin1/hugin/GLPreviewFrame.cpp:2777 hugin1/hugin/PanoPanel.cpp:786 msgid "left needs to be an integer bigger than 0" msgstr "左部值需要是一個大於 0 的整數" -#: hugin1/hugin/GLPreviewFrame.cpp:2711 hugin1/hugin/PanoPanel.cpp:789 +#: hugin1/hugin/GLPreviewFrame.cpp:2781 hugin1/hugin/PanoPanel.cpp:790 msgid "right needs to be an integer bigger than 0" msgstr "右部值需要是一個大於 0 的整數" -#: hugin1/hugin/GLPreviewFrame.cpp:2715 hugin1/hugin/PanoPanel.cpp:793 +#: hugin1/hugin/GLPreviewFrame.cpp:2785 hugin1/hugin/PanoPanel.cpp:794 msgid "bottom needs to be an integer bigger than 0" msgstr "下部值需要是一個大於 0 的整數" -#: hugin1/hugin/GLPreviewFrame.cpp:2721 +#: hugin1/hugin/GLPreviewFrame.cpp:2791 msgid "left boundary must be smaller than right" msgstr "左邊界應小於右邊界" -#: hugin1/hugin/GLPreviewFrame.cpp:2727 +#: hugin1/hugin/GLPreviewFrame.cpp:2797 msgid "top boundary must be smaller than bottom" msgstr "上邊界應小於下邊界" -#: hugin1/hugin/GLPreviewFrame.cpp:2763 hugin1/hugin/PanoPanel.cpp:677 +#: hugin1/hugin/GLPreviewFrame.cpp:2833 hugin1/hugin/PanoPanel.cpp:678 #, c-format msgid "Invalid HFOV value. Maximum HFOV for this projection is %lf." msgstr "無效的水平視角值. 這個投影的最大水平視角值是 %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2794 hugin1/hugin/PanoPanel.cpp:708 +#: hugin1/hugin/GLPreviewFrame.cpp:2864 hugin1/hugin/PanoPanel.cpp:709 #, c-format msgid "Invalid VFOV value. Maximum VFOV for this projection is %lf." msgstr "無效的可見視角值. 這個投影的最大可見視角值是 %lf." -#: hugin1/hugin/GLPreviewFrame.cpp:2832 +#: hugin1/hugin/GLPreviewFrame.cpp:2902 msgid "" "With a wide field of view, panoramas with rectilinear projection get very " "stretched towards the edges.\n" msgstr "因為全景圖有過寬的視野角度，使用直線投影將會使的邊緣被嚴重拉伸。\n" -#: hugin1/hugin/GLPreviewFrame.cpp:2834 +#: hugin1/hugin/GLPreviewFrame.cpp:2904 msgid "" "Since the field of view is only very wide in the horizontal direction, try a " "cylindrical projection instead." msgstr "因為視野角度只有在水平方向過寬，請嘗試圓柱投影" -#: hugin1/hugin/GLPreviewFrame.cpp:2836 +#: hugin1/hugin/GLPreviewFrame.cpp:2906 msgid "For a very wide panorama, try equirectangular projection instead." msgstr "角度非常寬的全景，請試試等距長方圓柱投影。" -#: hugin1/hugin/GLPreviewFrame.cpp:2838 +#: hugin1/hugin/GLPreviewFrame.cpp:2908 msgid " You could also try Panini projection." msgstr "你也可以嘗試Panini 投影" -#: hugin1/hugin/GLPreviewFrame.cpp:2843 +#: hugin1/hugin/GLPreviewFrame.cpp:2913 msgid "" "With a wide vertical field of view, panoramas with cylindrical projection " "get very stretched at the top and bottom.\n" @@ -1771,7 +1826,7 @@ "因為全景圖垂直方向上有過大的視野角度，使用圓柱投影將會造成上下端嚴重拉伸變形" "等距長方圓柱投影可以把同樣的畫面顯示在較小的垂直距離內" -#: hugin1/hugin/GLPreviewFrame.cpp:2849 +#: hugin1/hugin/GLPreviewFrame.cpp:2919 msgid "" "Since the vertical field of view is not too wide, you could try setting the " "panorama projection to cylindrical.\n" @@ -1780,7 +1835,7 @@ "垂直方向的視野角度並不是太大，你可以試著將投影方式改為圓柱投影。\n" "圓柱投影不像等距長方圓柱投影，它會保留垂直線" -#: hugin1/hugin/GLPreviewFrame.cpp:2855 +#: hugin1/hugin/GLPreviewFrame.cpp:2925 msgid "" "Stereographic projection is conformal, unlike this Fisheye panorama " "projection.\n" @@ -1790,7 +1845,7 @@ "球極平面投影的角度不向魚眼投影，它是平均的。等角投影讓角度沿著一個點彎曲，使" "它更為直覺。" -#: hugin1/hugin/GLPreviewFrame.cpp:2860 +#: hugin1/hugin/GLPreviewFrame.cpp:2930 msgid "" "Panoramas with stereographic projection and a very wide field of view " "stretch the image around the edges a lot.\n" @@ -1800,13 +1855,13 @@ "球極平面投影會讓有具有寬視野角度的全景在邊緣有嚴重的拉伸變形。\n" "魚眼投影會壓縮這些變形，讓照片的寬度降低同時合理的保存中央畫面。" -#: hugin1/hugin/GLPreviewFrame.cpp:2867 +#: hugin1/hugin/GLPreviewFrame.cpp:2937 msgid "" "Setting the panorama to rectilinear projection would keep the straight lines " "straight." msgstr "在全景上使用直線投影會讓畫面中的直線的物體保持直的樣子" -#: hugin1/hugin/GLPreviewFrame.cpp:2888 +#: hugin1/hugin/GLPreviewFrame.cpp:2958 msgid "" "You have hidden the infobar, which shows hints about selection of " "projection.\n" @@ -1815,28 +1870,28 @@ "你把可以顯示投影法提示的資訊列關閉了。\n" "你可以在偏好設定中開啟資訊列。" -#: hugin1/hugin/GLPreviewFrame.cpp:2958 +#: hugin1/hugin/GLPreviewFrame.cpp:3028 msgid "normal, individual" msgstr "正向的，獨立的" -#: hugin1/hugin/GLPreviewFrame.cpp:2961 +#: hugin1/hugin/GLPreviewFrame.cpp:3031 msgid "mosaic" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2962 +#: hugin1/hugin/GLPreviewFrame.cpp:3032 msgid "mosaic, individual" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:2982 +#: hugin1/hugin/GLPreviewFrame.cpp:3052 msgid "Panosphere" msgstr "全景球" -#: hugin1/hugin/GLPreviewFrame.cpp:2985 +#: hugin1/hugin/GLPreviewFrame.cpp:3055 #, fuzzy msgid "Mosaic plane" msgstr "雙面" -#: hugin1/hugin/GLPreviewFrame.cpp:3199 +#: hugin1/hugin/GLPreviewFrame.cpp:3268 #, c-format msgid "" "%lu control points were removed from the panorama.\n" @@ -1844,24 +1899,24 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3200 hugin1/hugin/GLPreviewFrame.cpp:3507 +#: hugin1/hugin/GLPreviewFrame.cpp:3269 hugin1/hugin/GLPreviewFrame.cpp:3576 #, c-format msgid "Current selected optimizer strategy is \"%s\"." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3250 +#: hugin1/hugin/GLPreviewFrame.cpp:3319 msgid "" "The selected region contains no active image.\n" "Please select a region which is covered by at least 2 images." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3261 +#: hugin1/hugin/GLPreviewFrame.cpp:3330 msgid "" "The selected region is only covered by a single image.\n" "Can't create control points for a single image." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3272 +#: hugin1/hugin/GLPreviewFrame.cpp:3341 msgid "" "The selected rectangle is very big.\n" "This function is only intended for smaller areas. Otherwise unwanted side " @@ -1870,31 +1925,31 @@ "Proceed anyway?" msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 hugin1/hugin/PapywizardImport.cpp:467 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 hugin1/hugin/PapywizardImport.cpp:467 #, fuzzy msgid "Searching control points" msgstr "控制點清理" -#: hugin1/hugin/GLPreviewFrame.cpp:3297 +#: hugin1/hugin/GLPreviewFrame.cpp:3366 #, fuzzy msgid "Processing" msgstr "處理工具：" -#: hugin1/hugin/GLPreviewFrame.cpp:3304 +#: hugin1/hugin/GLPreviewFrame.cpp:3373 msgid "Remap image to panorama projection..." msgstr "" -#: hugin1/hugin/GLPreviewFrame.cpp:3358 +#: hugin1/hugin/GLPreviewFrame.cpp:3427 #, fuzzy msgid "Matching interest points..." msgstr "正在尋找相似點..." -#: hugin1/hugin/GLPreviewFrame.cpp:3477 +#: hugin1/hugin/GLPreviewFrame.cpp:3546 #, fuzzy msgid "Checking results..." msgstr "檢查成對的控制點" -#: hugin1/hugin/GLPreviewFrame.cpp:3506 +#: hugin1/hugin/GLPreviewFrame.cpp:3575 #, c-format msgid "" "%lu control points were added to the panorama.\n" @@ -1902,7 +1957,7 @@ "Should the panorama now be re-optimized?" msgstr "" -#: hugin1/hugin/GLViewer.cpp:139 +#: hugin1/hugin/GLViewer.cpp:136 msgid "" "Error initializing GLEW\n" "Fast preview window can not be opened." @@ -1910,7 +1965,7 @@ "初始化 GLEW 失敗\n" "快速預覽視窗將不會開啟。" -#: hugin1/hugin/GLViewer.cpp:151 +#: hugin1/hugin/GLViewer.cpp:148 msgid "" "Sorry, the fast preview window requires a system which supports OpenGL " "version 1.1 with the GL_ARB_multitexture extension.\n" @@ -1957,7 +2012,7 @@ msgstr "遮罩的數量" #: hugin1/hugin/ImagesList.cpp:444 hugin1/hugin/xrc/mask_editor_panel.xrc:340 -#: hugin1/hugin/xrc/preview_frame.xrc:957 +#: hugin1/hugin/xrc/preview_frame.xrc:980 msgid "Crop" msgstr "裁剪" @@ -1990,7 +2045,7 @@ msgid "The maximum Ev difference has to be greater than 0." msgstr "最大的曝光值(Ev)差異必須要大於0" -#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1270 +#: hugin1/hugin/ImagesPanel.cpp:696 hugin1/hugin/ImagesTree.cpp:1209 #: hugin1/hugin/xrc/main_frame.xrc:351 msgid "Stacks" msgstr "堆棧：" @@ -2167,7 +2222,7 @@ msgid "Shutter speed" msgstr "快門速度:" -#: hugin1/hugin/ImagesTree.cpp:162 +#: hugin1/hugin/ImagesTree.cpp:162 hugin1/ptbatcher/FindPanoDialog.cpp:1044 msgid "ISO" msgstr "ISO感光度：" @@ -2318,97 +2373,97 @@ msgid "Camera response parameter" msgstr "相機響應參數" -#: hugin1/hugin/ImagesTree.cpp:514 hugin1/hugin/ImagesTree.cpp:696 +#: hugin1/hugin/ImagesTree.cpp:439 hugin1/hugin/ImagesTree.cpp:621 msgid "not active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:517 hugin1/hugin/ImagesTree.cpp:699 +#: hugin1/hugin/ImagesTree.cpp:442 hugin1/hugin/ImagesTree.cpp:624 msgid "active" msgstr "" -#: hugin1/hugin/ImagesTree.cpp:659 +#: hugin1/hugin/ImagesTree.cpp:584 #, fuzzy, c-format msgid "Lens %ld" msgstr "鏡頭： %d" -#: hugin1/hugin/ImagesTree.cpp:662 +#: hugin1/hugin/ImagesTree.cpp:587 #, fuzzy, c-format msgid "Stack %ld" msgstr "堆棧： %d" -#: hugin1/hugin/ImagesTree.cpp:665 +#: hugin1/hugin/ImagesTree.cpp:590 #, fuzzy, c-format msgid "Output stack %ld" msgstr "輸出 %d 堆棧" -#: hugin1/hugin/ImagesTree.cpp:668 +#: hugin1/hugin/ImagesTree.cpp:593 #, fuzzy, c-format msgid "Output exposure layer %ld" msgstr "輸出光圈%d 的圖層" -#: hugin1/hugin/ImagesTree.cpp:1168 hugin1/hugin/ImagesTree.cpp:1183 +#: hugin1/hugin/ImagesTree.cpp:1107 hugin1/hugin/ImagesTree.cpp:1122 msgid "Link" msgstr "連結" -#: hugin1/hugin/ImagesTree.cpp:1172 hugin1/hugin/ImagesTree.cpp:1179 +#: hugin1/hugin/ImagesTree.cpp:1111 hugin1/hugin/ImagesTree.cpp:1118 msgid "Unlink" msgstr "取消連結" -#: hugin1/hugin/ImagesTree.cpp:1194 +#: hugin1/hugin/ImagesTree.cpp:1133 msgid "Select all for current lens" msgstr "選擇所有使用此鏡頭的照片" -#: hugin1/hugin/ImagesTree.cpp:1195 +#: hugin1/hugin/ImagesTree.cpp:1134 msgid "Unselect all for current lens" msgstr "把使用此鏡頭的照片取消選擇" -#: hugin1/hugin/ImagesTree.cpp:1199 +#: hugin1/hugin/ImagesTree.cpp:1138 msgid "Select all for current stack" msgstr "選擇所有在這個堆棧中的照片" -#: hugin1/hugin/ImagesTree.cpp:1200 +#: hugin1/hugin/ImagesTree.cpp:1139 msgid "Unselect all for current stack" msgstr "把所有在這個堆棧中的照片取消選擇" -#: hugin1/hugin/ImagesTree.cpp:1205 hugin1/hugin/ImagesTree.cpp:1239 -#: hugin1/hugin/ImagesTree.cpp:1408 +#: hugin1/hugin/ImagesTree.cpp:1144 hugin1/hugin/ImagesTree.cpp:1178 +#: hugin1/hugin/ImagesTree.cpp:1347 msgid "Select all" msgstr "全選" -#: hugin1/hugin/ImagesTree.cpp:1207 hugin1/hugin/ImagesTree.cpp:1241 -#: hugin1/hugin/ImagesTree.cpp:1409 +#: hugin1/hugin/ImagesTree.cpp:1146 hugin1/hugin/ImagesTree.cpp:1180 +#: hugin1/hugin/ImagesTree.cpp:1348 msgid "Unselect all" msgstr "全部取消選取" -#: hugin1/hugin/ImagesTree.cpp:1211 +#: hugin1/hugin/ImagesTree.cpp:1150 msgid "Edit image variables..." msgstr "編輯影像變數..." -#: hugin1/hugin/ImagesTree.cpp:1219 +#: hugin1/hugin/ImagesTree.cpp:1158 #, fuzzy msgid "Deactivate image" msgstr "儲存影像" -#: hugin1/hugin/ImagesTree.cpp:1223 +#: hugin1/hugin/ImagesTree.cpp:1162 #, fuzzy msgid "Activate image" msgstr "儲存影像" -#: hugin1/hugin/ImagesTree.cpp:1228 +#: hugin1/hugin/ImagesTree.cpp:1167 #, fuzzy msgid "Activate images" msgstr "顯示圖片" -#: hugin1/hugin/ImagesTree.cpp:1229 +#: hugin1/hugin/ImagesTree.cpp:1168 #, fuzzy msgid "Deactivate images" msgstr "每張圖片的控制點數量：" -#: hugin1/hugin/ImagesTree.cpp:1281 +#: hugin1/hugin/ImagesTree.cpp:1220 msgid "Control points" msgstr "控制點" -#: hugin1/hugin/ImagesTree.cpp:1291 hugin1/hugin/xrc/lenscal_frame.xrc:212 +#: hugin1/hugin/ImagesTree.cpp:1230 hugin1/hugin/xrc/lenscal_frame.xrc:212 #: hugin1/hugin/xrc/mask_editor_panel.xrc:333 #: hugin1/hugin/xrc/optimize_panel.xrc:73 #: hugin1/hugin/xrc/optimize_photo_panel.xrc:63 @@ -2441,12 +2496,24 @@ msgid "Did you know..." msgstr "你知道嗎..." -#: hugin1/hugin/MainFrame.cpp:338 +#: hugin1/hugin/MainFrame.cpp:205 hugin1/hugin/PanoOperation.cpp:230 +#: hugin1/hugin/huginApp.cpp:575 +msgid "" +"You selected only one raw file. This is not recommended.\n" +"All raw files should be converted at once." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:212 hugin1/hugin/PanoOperation.cpp:237 +#: hugin1/hugin/huginApp.cpp:582 +msgid "Convert anyway." +msgstr "" + +#: hugin1/hugin/MainFrame.cpp:374 #, c-format msgid "Version %s" msgstr "版本 %s" -#: hugin1/hugin/MainFrame.cpp:347 +#: hugin1/hugin/MainFrame.cpp:383 msgid "" "Fatal installation error\n" "The file data/splash.png was not found at:" @@ -2454,130 +2521,130 @@ "關鍵安裝錯誤\n" "檔案 data/splash.png 不存在於:" -#: hugin1/hugin/MainFrame.cpp:367 hugin1/ptbatcher/BatchFrame.cpp:142 +#: hugin1/hugin/MainFrame.cpp:403 hugin1/ptbatcher/BatchFrame.cpp:144 #: hugin1/hugin/xrc/batch_menu.xrc:56 hugin1/hugin/xrc/main_menu.xrc:141 -#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1026 -#: hugin1/hugin/xrc/preview_frame.xrc:1051 +#: hugin1/hugin/xrc/main_menu.xrc:143 hugin1/hugin/xrc/preview_frame.xrc:1049 +#: hugin1/hugin/xrc/preview_frame.xrc:1074 msgid "&Help" msgstr "說明 (&H)" -#: hugin1/hugin/MainFrame.cpp:424 +#: hugin1/hugin/MainFrame.cpp:462 msgid "&Actions" msgstr "選項 (&A)" -#: hugin1/hugin/MainFrame.cpp:442 hugin1/hugin/xrc/main_menu.xrc:138 +#: hugin1/hugin/MainFrame.cpp:480 hugin1/hugin/xrc/main_menu.xrc:138 #, fuzzy msgid "&Output" msgstr "輸出" -#: hugin1/hugin/MainFrame.cpp:464 +#: hugin1/hugin/MainFrame.cpp:502 #, c-format msgid "User defined sequence: %s" msgstr "" -#: hugin1/hugin/MainFrame.cpp:480 +#: hugin1/hugin/MainFrame.cpp:518 #, fuzzy msgid "User defined output sequences" msgstr "重設使用者定義....." -#: hugin1/hugin/MainFrame.cpp:500 hugin1/hugin/xrc/main_menu.xrc:56 -#: hugin1/hugin/xrc/preview_frame.xrc:984 +#: hugin1/hugin/MainFrame.cpp:538 hugin1/hugin/xrc/main_menu.xrc:56 +#: hugin1/hugin/xrc/preview_frame.xrc:1007 msgid "&Edit" msgstr "編輯 (&E)" -#: hugin1/hugin/MainFrame.cpp:522 +#: hugin1/hugin/MainFrame.cpp:560 #, fuzzy, c-format msgid "User defined assistant: %s" msgstr "重設使用者定義....." -#: hugin1/hugin/MainFrame.cpp:537 +#: hugin1/hugin/MainFrame.cpp:575 #, fuzzy msgid "User defined assistant" msgstr "執行接圖分析" -#: hugin1/hugin/MainFrame.cpp:632 +#: hugin1/hugin/MainFrame.cpp:670 msgid "Started" msgstr "開始了" -#: hugin1/hugin/MainFrame.cpp:765 hugin1/hugin/xrc/main_frame.xrc:34 +#: hugin1/hugin/MainFrame.cpp:814 hugin1/hugin/xrc/main_frame.xrc:34 msgid "Optimizer" msgstr "最佳化工具" -#: hugin1/hugin/MainFrame.cpp:777 hugin1/hugin/MainFrame.cpp:781 +#: hugin1/hugin/MainFrame.cpp:826 hugin1/hugin/MainFrame.cpp:830 #: hugin1/hugin/xrc/main_frame.xrc:38 hugin1/hugin/xrc/reset_dialog.xrc:46 msgid "Exposure" msgstr "光圈" -#: hugin1/hugin/MainFrame.cpp:821 +#: hugin1/hugin/MainFrame.cpp:870 #, fuzzy msgid "Save changes to the project file before opening another project?" msgstr "在關閉前儲存檔案？" -#: hugin1/hugin/MainFrame.cpp:824 +#: hugin1/hugin/MainFrame.cpp:873 #, fuzzy msgid "Save changes to the project file before starting a new project?" msgstr "在關閉前儲存檔案？" -#: hugin1/hugin/MainFrame.cpp:828 +#: hugin1/hugin/MainFrame.cpp:877 #, fuzzy msgid "Save changes to the project file before closing?" msgstr "在關閉前儲存檔案？" -#: hugin1/hugin/MainFrame.cpp:841 +#: hugin1/hugin/MainFrame.cpp:890 #, fuzzy msgid "" "If you load another project without saving, your changes since last save " "will be discarded." msgstr "如果你想要在儲存前關閉檔案，所有沒有存檔的部分將不會保留。" -#: hugin1/hugin/MainFrame.cpp:844 +#: hugin1/hugin/MainFrame.cpp:893 #, fuzzy msgid "" "If you start a new project without saving, your changes since last save will " "be discarded." msgstr "如果你想要在儲存前關閉檔案，所有沒有存檔的部分將不會保留。" -#: hugin1/hugin/MainFrame.cpp:848 +#: hugin1/hugin/MainFrame.cpp:897 #, fuzzy msgid "" "If you close without saving, your changes since your last save will be " "discarded." msgstr "如果你想要在儲存前關閉檔案，所有沒有存檔的部分將不會保留。" -#: hugin1/hugin/MainFrame.cpp:853 +#: hugin1/hugin/MainFrame.cpp:902 msgid "Don't Save" msgstr "不要儲存" -#: hugin1/hugin/MainFrame.cpp:856 +#: hugin1/hugin/MainFrame.cpp:905 msgid "Close without saving" msgstr "在未儲存的狀況下直接關閉" -#: hugin1/hugin/MainFrame.cpp:887 +#: hugin1/hugin/MainFrame.cpp:936 msgid "forced close" msgstr "強迫關閉" -#: hugin1/hugin/MainFrame.cpp:931 +#: hugin1/hugin/MainFrame.cpp:991 #, c-format msgid "saved project %s" msgstr "已儲存專案 %s" -#: hugin1/hugin/MainFrame.cpp:936 hugin1/hugin/MainFrame.cpp:942 -#: hugin1/hugin/MainFrame.cpp:1056 hugin1/hugin/MainFrame.cpp:1062 -#: hugin1/hugin/MainFrame.cpp:1073 hugin1/hugin/MainFrame.cpp:1079 -#: hugin1/hugin/MainFrame.cpp:1176 hugin1/hugin/MainFrame.cpp:1182 -#: hugin1/hugin/MainFrame.cpp:2227 hugin1/hugin/MainFrame.cpp:2233 -#: hugin1/hugin/MainFrame.cpp:2245 hugin1/hugin/MainFrame.cpp:2250 +#: hugin1/hugin/MainFrame.cpp:996 hugin1/hugin/MainFrame.cpp:1002 +#: hugin1/hugin/MainFrame.cpp:1116 hugin1/hugin/MainFrame.cpp:1122 +#: hugin1/hugin/MainFrame.cpp:1133 hugin1/hugin/MainFrame.cpp:1139 +#: hugin1/hugin/MainFrame.cpp:1236 hugin1/hugin/MainFrame.cpp:1242 +#: hugin1/hugin/MainFrame.cpp:2281 hugin1/hugin/MainFrame.cpp:2287 +#: hugin1/hugin/MainFrame.cpp:2299 hugin1/hugin/MainFrame.cpp:2304 #: hugin1/hugin/xrc/main_frame.xrc:4 msgid "Hugin - Panorama Stitcher" msgstr "Hugin - 全景圖接合工具" -#: hugin1/hugin/MainFrame.cpp:938 hugin1/hugin/MainFrame.cpp:1058 -#: hugin1/hugin/MainFrame.cpp:1075 hugin1/hugin/MainFrame.cpp:1178 -#: hugin1/hugin/MainFrame.cpp:2228 hugin1/hugin/MainFrame.cpp:2234 +#: hugin1/hugin/MainFrame.cpp:998 hugin1/hugin/MainFrame.cpp:1118 +#: hugin1/hugin/MainFrame.cpp:1135 hugin1/hugin/MainFrame.cpp:1238 +#: hugin1/hugin/MainFrame.cpp:2282 hugin1/hugin/MainFrame.cpp:2288 msgid "Panorama editor" msgstr "環景編輯器" -#: hugin1/hugin/MainFrame.cpp:949 +#: hugin1/hugin/MainFrame.cpp:1009 #, c-format msgid "" "Could not save project file \"%s\".\n" @@ -2590,36 +2657,36 @@ "\n" "(錯誤碼： %s)" -#: hugin1/hugin/MainFrame.cpp:1001 +#: hugin1/hugin/MainFrame.cpp:1061 msgid "Save PTmender script file" msgstr "儲存 PTmender 程式碼檔案" -#: hugin1/hugin/MainFrame.cpp:1003 +#: hugin1/hugin/MainFrame.cpp:1063 msgid "PTmender files (*.txt)|*.txt" msgstr "PTmender 檔案 (*.txt)|*.txt" -#: hugin1/hugin/MainFrame.cpp:1028 +#: hugin1/hugin/MainFrame.cpp:1088 msgid "Open project: " msgstr "開啟專案: " -#: hugin1/hugin/MainFrame.cpp:1050 +#: hugin1/hugin/MainFrame.cpp:1110 msgid "Project opened" msgstr "被開啟的專案" -#: hugin1/hugin/MainFrame.cpp:1067 +#: hugin1/hugin/MainFrame.cpp:1127 #, fuzzy msgid "Loading canceled" msgstr "載入圖片" -#: hugin1/hugin/MainFrame.cpp:1092 +#: hugin1/hugin/MainFrame.cpp:1152 msgid "Error opening project: " msgstr "開啟時專案發生錯誤: " -#: hugin1/hugin/MainFrame.cpp:1124 hugin1/hugin/MainFrame.cpp:1631 +#: hugin1/hugin/MainFrame.cpp:1184 hugin1/hugin/MainFrame.cpp:1679 msgid "Open project file" msgstr "開啟專案檔案" -#: hugin1/hugin/MainFrame.cpp:1134 +#: hugin1/hugin/MainFrame.cpp:1194 #, c-format msgid "" "File %s is an image file and not a project file.\n" @@ -2629,11 +2696,11 @@ "%s是影像而不是專案檔 \n" "這種檔案不是從 \"檔案->開啟...\" 中打開你想要把影像加到目前專案中嗎？" -#: hugin1/hugin/MainFrame.cpp:1160 +#: hugin1/hugin/MainFrame.cpp:1220 msgid "Open project: cancel" msgstr "開啟專案: 取消" -#: hugin1/hugin/MainFrame.cpp:1304 +#: hugin1/hugin/MainFrame.cpp:1358 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2641,7 +2708,7 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1315 +#: hugin1/hugin/MainFrame.cpp:1369 #, c-format msgid "" "Could not load image \"%s\".\n" @@ -2649,34 +2716,34 @@ "This file will be removed from the project." msgstr "" -#: hugin1/hugin/MainFrame.cpp:1664 +#: hugin1/hugin/MainFrame.cpp:1712 #, c-format msgid "Could not read project file %s." msgstr "無法開啟專案檔：%s" -#: hugin1/hugin/MainFrame.cpp:1673 +#: hugin1/hugin/MainFrame.cpp:1721 #, fuzzy msgid "Open Papywizard xml file" msgstr "開啟一個專案檔案" -#: hugin1/hugin/MainFrame.cpp:1674 +#: hugin1/hugin/MainFrame.cpp:1722 #, fuzzy msgid "Papywizard xml files (*.xml)|*.xml|All files (*)|*" msgstr "遮罩檔案 (*.msk)|*.msk;|全部檔案 (*)|*" -#: hugin1/hugin/MainFrame.cpp:1690 +#: hugin1/hugin/MainFrame.cpp:1738 msgid "Choose template project" msgstr "選取工程版面" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning all points" msgstr "調整所有點" -#: hugin1/hugin/MainFrame.cpp:1766 +#: hugin1/hugin/MainFrame.cpp:1814 msgid "Fine-tuning" msgstr "調整中" -#: hugin1/hugin/MainFrame.cpp:1837 +#: hugin1/hugin/MainFrame.cpp:1886 #, c-format msgid "" "%d points fine-tuned, %d points not updated due to low correlation\n" @@ -2701,23 +2768,23 @@ "\n" "請使用控制點列表 (F3) 來檢視目前專案的所有點\n" -#: hugin1/hugin/MainFrame.cpp:1839 +#: hugin1/hugin/MainFrame.cpp:1888 msgid "Fine-tune result" msgstr "最佳調整結果" -#: hugin1/hugin/MainFrame.cpp:1857 +#: hugin1/hugin/MainFrame.cpp:1906 msgid "Removing control points in masks" msgstr "移除了遮罩中 %d 個控制點" -#: hugin1/hugin/MainFrame.cpp:1866 +#: hugin1/hugin/MainFrame.cpp:1915 msgid "Select python script" msgstr "選擇" -#: hugin1/hugin/MainFrame.cpp:1868 +#: hugin1/hugin/MainFrame.cpp:1917 msgid "Python script (*.py)|*.py|All files (*.*)|*.*" msgstr "Python script (*.py)|*.py|所有檔案 (*.*)|*.*" -#: hugin1/hugin/MainFrame.cpp:2104 +#: hugin1/hugin/MainFrame.cpp:2158 #, c-format msgid "" "File \"%s\" not found.\n" @@ -2726,24 +2793,24 @@ "找不到檔案[%s].\n" "檔案可能已被更改檔名,移動,刪除." -#: hugin1/hugin/MainFrame.cpp:2105 hugin1/ptbatcher/Batch.cpp:360 -#: hugin1/ptbatcher/Batch.cpp:814 hugin1/ptbatcher/Batch.cpp:830 -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/hugin/MainFrame.cpp:2159 hugin1/ptbatcher/Batch.cpp:369 +#: hugin1/ptbatcher/Batch.cpp:823 hugin1/ptbatcher/Batch.cpp:839 +#: hugin1/ptbatcher/Batch.cpp:1007 msgid "Error!" msgstr "錯誤!" -#: hugin1/hugin/MainFrame.cpp:2131 +#: hugin1/hugin/MainFrame.cpp:2185 #, c-format msgid "" "Celeste model expected in %s not found, Hugin needs to be properly installed." msgstr "在%s中找不到Celeste模組，Hugin 需要正確安裝" -#: hugin1/hugin/MainFrame.cpp:2136 +#: hugin1/hugin/MainFrame.cpp:2190 #, c-format msgid "Could not load Celeste model file %s" msgstr "無法載入Celeste模組檔案 %s" -#: hugin1/hugin/MainFrame.cpp:2270 +#: hugin1/hugin/MainFrame.cpp:2324 msgid "" "Can't switch to simple interface. The project is using stacks and/or " "vignetting center shift.\n" @@ -2752,7 +2819,7 @@ "無法切換到簡易操作介面。目前的專案正在使用堆棧模式或暗角中心偏移 \n" "簡易操作介面無法支援這些功能" -#: hugin1/hugin/MainFrame.cpp:2280 +#: hugin1/hugin/MainFrame.cpp:2334 msgid "" "Can't switch to simple interface. The project is using translation or shear " "parameters.\n" @@ -2761,7 +2828,7 @@ "無法切換到簡易操作介面。目前的專案正在使用平移或水平錯動參數 \n" "簡易操作模式無法支援這些參數" -#: hugin1/hugin/MainFrame.cpp:2301 +#: hugin1/hugin/MainFrame.cpp:2355 msgid "" "Can't switch to advanced interface. The project is using translation or " "shear parameters.\n" @@ -2770,28 +2837,28 @@ "無法切換到進階操作模式。目前的專案正在使用平移或水平錯動參數\n" "進階操作模式無法支援這些參數" -#: hugin1/hugin/MainFrame.cpp:2355 +#: hugin1/hugin/MainFrame.cpp:2410 msgid "" "The assistant queue is empty. This indicates an error in the user defined " "assistant file." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2363 +#: hugin1/hugin/MainFrame.cpp:2418 msgid "Running assistant" msgstr "執行接圖分析" -#: hugin1/hugin/MainFrame.cpp:2380 +#: hugin1/hugin/MainFrame.cpp:2435 msgid "" "The assistant could not find vertical lines. Please add vertical lines in " "the panorama editor and optimize project manually." msgstr "" -#: hugin1/hugin/MainFrame.cpp:2395 +#: hugin1/hugin/MainFrame.cpp:2450 #, c-format msgid "Warning %d unconnected image groups found:" msgstr "注意: 發現 %d 未連接圖片組:" -#: hugin1/hugin/MainFrame.cpp:2396 +#: hugin1/hugin/MainFrame.cpp:2451 #, fuzzy msgid "" "Please create control points between unconnected images using the Control " @@ -2803,57 +2870,57 @@ "\n" "在增加控制點後, 再按[對準]按鈕" -#: hugin1/hugin/MainFrame.cpp:2399 hugin1/hugin/MainFrame.cpp:2405 +#: hugin1/hugin/MainFrame.cpp:2454 hugin1/hugin/MainFrame.cpp:2460 msgid "" "The assistant did not complete successfully. Please check the resulting " "project file." msgstr "接圖分析對準沒有成功，請檢查輸出的結果。" -#: hugin1/hugin/MainFrame.cpp:2466 +#: hugin1/hugin/MainFrame.cpp:2521 msgid "Project file not found" msgstr "找不到專案檔" -#: hugin1/hugin/MainFrame.cpp:2481 +#: hugin1/hugin/MainFrame.cpp:2536 msgid "Can't launch PTBatcherGui" msgstr "無法啟動 批次處理" -#: hugin1/hugin/MainFrame.cpp:2489 +#: hugin1/hugin/MainFrame.cpp:2544 msgid "Launched incorrect programme" msgstr "錯誤的程式被啟動" -#: hugin1/hugin/MaskEditorPanel.cpp:114 +#: hugin1/hugin/MaskEditorPanel.cpp:110 msgid "Mask type" msgstr "遮罩類型" -#: hugin1/hugin/MaskEditorPanel.cpp:454 +#: hugin1/hugin/MaskEditorPanel.cpp:451 msgid "" "Create a polygon mask by clicking with the left mouse button on image, set " "the last point with the right mouse button." msgstr "在影像上用左鍵產生多邊形遮罩，使用右鍵定義最後一點" -#: hugin1/hugin/MaskEditorPanel.cpp:463 hugin1/hugin/MaskEditorPanel.cpp:476 +#: hugin1/hugin/MaskEditorPanel.cpp:460 hugin1/hugin/MaskEditorPanel.cpp:473 msgid "Save mask" msgstr "儲存遮罩" -#: hugin1/hugin/MaskEditorPanel.cpp:465 hugin1/hugin/MaskEditorPanel.cpp:497 +#: hugin1/hugin/MaskEditorPanel.cpp:462 hugin1/hugin/MaskEditorPanel.cpp:494 msgid "Mask files (*.msk)|*.msk|All files (*)|*" msgstr "遮罩檔案 (*.msk)|*.msk;|全部檔案 (*)|*" -#: hugin1/hugin/MaskEditorPanel.cpp:495 +#: hugin1/hugin/MaskEditorPanel.cpp:492 msgid "Load mask" msgstr "載入遮罩" -#: hugin1/hugin/MaskEditorPanel.cpp:501 +#: hugin1/hugin/MaskEditorPanel.cpp:498 msgid "Load mask: cancel" msgstr "載入遮罩: 取消" -#: hugin1/hugin/MaskEditorPanel.cpp:512 +#: hugin1/hugin/MaskEditorPanel.cpp:509 #, c-format msgid "Could not parse mask from file %s." msgstr "無法從檔案 %s 解析遮罩" -#: hugin1/hugin/MaskEditorPanel.cpp:873 hugin1/hugin/MaskEditorPanel.cpp:892 -#: hugin1/hugin/MaskEditorPanel.cpp:911 hugin1/hugin/MaskEditorPanel.cpp:930 +#: hugin1/hugin/MaskEditorPanel.cpp:874 hugin1/hugin/MaskEditorPanel.cpp:893 +#: hugin1/hugin/MaskEditorPanel.cpp:912 hugin1/hugin/MaskEditorPanel.cpp:931 msgid "Please enter a valid number" msgstr "請輸入一個有效數字" @@ -2993,7 +3060,7 @@ msgstr "光學性質對準" #: hugin1/hugin/OptimizePhotometricPanel.cpp:261 -#: hugin1/hugin/PanoOperation.cpp:740 hugin1/hugin/PanoOperation.cpp:803 +#: hugin1/hugin/PanoOperation.cpp:821 hugin1/hugin/PanoOperation.cpp:884 msgid "Loading images" msgstr "載入圖片" @@ -3036,65 +3103,69 @@ msgid "Photometric optimization finished" msgstr "光學性質最佳化已經完成" -#: hugin1/hugin/PanoOperation.cpp:170 +#: hugin1/hugin/PanoOperation.cpp:215 msgid "Add individual images..." msgstr "增加單獨圖片..." -#: hugin1/hugin/PanoOperation.cpp:259 +#: hugin1/hugin/PanoOperation.cpp:237 +msgid "Let me select several raw files." +msgstr "" + +#: hugin1/hugin/PanoOperation.cpp:339 msgid "Add time-series of images..." msgstr "依時間序列增加圖片..." -#: hugin1/hugin/PanoOperation.cpp:372 +#: hugin1/hugin/PanoOperation.cpp:453 msgid "No matching images found." msgstr "沒有找到彼此對應的影像" -#: hugin1/hugin/PanoOperation.cpp:385 +#: hugin1/hugin/PanoOperation.cpp:466 #, fuzzy msgid "Manipulate image variables..." msgstr "編輯影像變數..." -#: hugin1/hugin/PanoOperation.cpp:409 +#: hugin1/hugin/PanoOperation.cpp:490 msgid "Remove selected image(s)" msgstr "移除選取的圖片" -#: hugin1/hugin/PanoOperation.cpp:424 +#: hugin1/hugin/PanoOperation.cpp:505 msgid "Anchor this image for position" msgstr "鎖定這張圖片的位置" -#: hugin1/hugin/PanoOperation.cpp:436 +#: hugin1/hugin/PanoOperation.cpp:517 msgid "Anchor this image for exposure" msgstr "鎖定這張圖片的光圈" -#: hugin1/hugin/PanoOperation.cpp:466 +#: hugin1/hugin/PanoOperation.cpp:547 msgid "New lens" msgstr "新鏡頭" -#: hugin1/hugin/PanoOperation.cpp:490 +#: hugin1/hugin/PanoOperation.cpp:571 msgid "Change lens..." msgstr "修改鏡頭..." -#: hugin1/hugin/PanoOperation.cpp:497 +#: hugin1/hugin/PanoOperation.cpp:578 msgid "Enter new lens number" msgstr "輸入新的鏡頭編號" -#: hugin1/hugin/PanoOperation.cpp:498 +#: hugin1/hugin/PanoOperation.cpp:579 msgid "Lens number" msgstr "鏡頭編號" -#: hugin1/hugin/PanoOperation.cpp:499 +#: hugin1/hugin/PanoOperation.cpp:580 msgid "Change lens number" msgstr "修改鏡頭編號" -#: hugin1/hugin/PanoOperation.cpp:522 +#: hugin1/hugin/PanoOperation.cpp:603 #, fuzzy msgid "Load lens from lens database" msgstr "從 Lensfun 資料庫載入鏡頭數據" -#: hugin1/hugin/PanoOperation.cpp:526 +#: hugin1/hugin/PanoOperation.cpp:607 msgid "Load lens from ini file" msgstr "從 ini 檔中載入鏡頭參數" -#: hugin1/hugin/PanoOperation.cpp:537 +#: hugin1/hugin/PanoOperation.cpp:618 msgid "" "You selected only one image.\n" "Should the loaded parameters be applied to all images with the same lens?" @@ -3102,12 +3173,12 @@ "你只有選取一個影像。\n" "載入的參數應該要加到所有具有同樣鏡頭的影像上嗎？" -#: hugin1/hugin/PanoOperation.cpp:537 hugin1/ptbatcher/FindPanoDialog.cpp:238 -#: hugin1/ptbatcher/FindPanoDialog.cpp:273 +#: hugin1/hugin/PanoOperation.cpp:618 hugin1/ptbatcher/FindPanoDialog.cpp:240 +#: hugin1/ptbatcher/FindPanoDialog.cpp:275 msgid "Question" msgstr "問題" -#: hugin1/hugin/PanoOperation.cpp:552 +#: hugin1/hugin/PanoOperation.cpp:633 msgid "" "You selected images with different sizes.\n" "Apply lens parameter file can result in unwanted results.\n" @@ -3117,101 +3188,101 @@ "直接套用鏡頭參數可能導致意外的結果。\n" "確定要直接套用設定嗎？" -#: hugin1/hugin/PanoOperation.cpp:590 +#: hugin1/hugin/PanoOperation.cpp:671 msgid "Save lens to ini file" msgstr "儲存鏡頭參數到ini檔" -#: hugin1/hugin/PanoOperation.cpp:610 +#: hugin1/hugin/PanoOperation.cpp:691 msgid "Remove control points" msgstr "移除控制點" -#: hugin1/hugin/PanoOperation.cpp:640 +#: hugin1/hugin/PanoOperation.cpp:721 msgid "Selected images have no control points." msgstr "選擇沒有控制點的影像" -#: hugin1/hugin/PanoOperation.cpp:649 +#: hugin1/hugin/PanoOperation.cpp:730 #, c-format msgid "Really delete %lu control points?" msgstr "真的要刪除 %lu 個控制點嗎?" -#: hugin1/hugin/PanoOperation.cpp:651 +#: hugin1/hugin/PanoOperation.cpp:732 msgid "Delete Control Points" msgstr "刪除控制點" -#: hugin1/hugin/PanoOperation.cpp:665 hugin1/hugin/xrc/cp_editor_panel.xrc:334 +#: hugin1/hugin/PanoOperation.cpp:746 hugin1/hugin/xrc/cp_editor_panel.xrc:334 msgid "Clean control points" msgstr "控制點清理" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Cleaning Control points" msgstr "正在進行控制點清理" -#: hugin1/hugin/PanoOperation.cpp:676 +#: hugin1/hugin/PanoOperation.cpp:757 msgid "Checking pairwise" msgstr "檢查成對的控制點" -#: hugin1/hugin/PanoOperation.cpp:700 +#: hugin1/hugin/PanoOperation.cpp:781 msgid "Checking whole project" msgstr "正在檢查整個專案" -#: hugin1/hugin/PanoOperation.cpp:717 +#: hugin1/hugin/PanoOperation.cpp:798 msgid "Finished cleaning" msgstr "清理完畢" -#: hugin1/hugin/PanoOperation.cpp:731 +#: hugin1/hugin/PanoOperation.cpp:812 msgid "Remove control points on clouds" msgstr "移除點在雲上的控制點" -#: hugin1/hugin/PanoOperation.cpp:852 +#: hugin1/hugin/PanoOperation.cpp:933 msgid "Reset user defined..." msgstr "重設使用者定義....." -#: hugin1/hugin/PanoOperation.cpp:855 +#: hugin1/hugin/PanoOperation.cpp:936 msgid "Reset positions" msgstr "重設照片位置" -#: hugin1/hugin/PanoOperation.cpp:858 +#: hugin1/hugin/PanoOperation.cpp:939 #, fuzzy msgid "Reset translation parameters" msgstr "平移參數" -#: hugin1/hugin/PanoOperation.cpp:861 +#: hugin1/hugin/PanoOperation.cpp:942 msgid "Reset lens parameters" msgstr "重設鏡頭參數" -#: hugin1/hugin/PanoOperation.cpp:864 +#: hugin1/hugin/PanoOperation.cpp:945 msgid "Reset photometric parameters" msgstr "重設光學參數" -#: hugin1/hugin/PanoOperation.cpp:1187 +#: hugin1/hugin/PanoOperation.cpp:1204 msgid "New stack" msgstr "新的堆棧圖" -#: hugin1/hugin/PanoOperation.cpp:1211 +#: hugin1/hugin/PanoOperation.cpp:1228 msgid "Change stack..." msgstr "修改堆棧..." -#: hugin1/hugin/PanoOperation.cpp:1218 +#: hugin1/hugin/PanoOperation.cpp:1235 msgid "Enter new stack number" msgstr "輸入新的堆棧圖編號" -#: hugin1/hugin/PanoOperation.cpp:1219 +#: hugin1/hugin/PanoOperation.cpp:1236 msgid "stack number" msgstr "堆棧圖編號" -#: hugin1/hugin/PanoOperation.cpp:1220 +#: hugin1/hugin/PanoOperation.cpp:1237 msgid "Change stack number" msgstr "修改堆棧圖編號" -#: hugin1/hugin/PanoOperation.cpp:1241 +#: hugin1/hugin/PanoOperation.cpp:1258 msgid "Set stack size..." msgstr "修改每個堆棧的數量..." -#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:577 +#: hugin1/hugin/PanoOutputDialog.cpp:340 hugin1/hugin/PanoPanel.cpp:578 msgid "Quality:" msgstr "質量:" -#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:562 +#: hugin1/hugin/PanoOutputDialog.cpp:354 hugin1/hugin/PanoPanel.cpp:563 #: hugin1/hugin/xrc/pano_panel.xrc:532 hugin1/hugin/xrc/pano_panel.xrc:602 #: hugin1/hugin/xrc/pano_panel.xrc:1177 hugin1/hugin/xrc/pano_panel.xrc:1235 msgid "Compression:" @@ -3282,63 +3353,63 @@ msgid "Hammer-Aitoff Equal Area" msgstr "Lambert 等面積方位角" -#: hugin1/hugin/PanoPanel.cpp:754 +#: hugin1/hugin/PanoPanel.cpp:755 msgid "width needs to be an integer bigger than 0" msgstr "寬度值需要是一個大於 0 的整數" -#: hugin1/hugin/PanoPanel.cpp:771 +#: hugin1/hugin/PanoPanel.cpp:772 msgid "height needs to be an integer bigger than 0" msgstr "高度值需要是一個大於 0 的整數" -#: hugin1/hugin/PanoPanel.cpp:800 +#: hugin1/hugin/PanoPanel.cpp:801 msgid "Left boundary must be smaller than right." msgstr "左邊界應小於右邊界" -#: hugin1/hugin/PanoPanel.cpp:806 +#: hugin1/hugin/PanoPanel.cpp:807 msgid "Top boundary must be smaller than bottom." msgstr "上邊界應小於下邊界" -#: hugin1/hugin/PanoPanel.cpp:869 +#: hugin1/hugin/PanoPanel.cpp:870 msgid " PTmender options not yet implemented" msgstr "尚未執行 PTmender 選項" -#: hugin1/hugin/PanoPanel.cpp:939 +#: hugin1/hugin/PanoPanel.cpp:940 msgid " PTblender options not yet implemented" msgstr "尚未執行 PTblender 選項" -#: hugin1/hugin/PanoPanel.cpp:995 +#: hugin1/hugin/PanoPanel.cpp:996 msgid " Options for this HDRMerge program not yet implemented" msgstr "尚未執行 HDRMerge 軟體選項" -#: hugin1/hugin/PanoPanel.cpp:1100 hugin1/hugin/PanoPanel.cpp:1387 +#: hugin1/hugin/PanoPanel.cpp:1101 hugin1/hugin/PanoPanel.cpp:1388 msgid "Could not create temporary project file" msgstr "無法產生暫存檔" -#: hugin1/hugin/PanoPanel.cpp:1145 hugin1/hugin/PanoPanel.cpp:1265 -#: hugin1/hugin/PanoPanel.cpp:1430 hugin1/ptbatcher/Batch.cpp:680 -#: hugin1/stitch_project/hugin_stitch_project.cpp:382 +#: hugin1/hugin/PanoPanel.cpp:1146 hugin1/hugin/PanoPanel.cpp:1266 +#: hugin1/hugin/PanoPanel.cpp:1431 hugin1/ptbatcher/Batch.cpp:689 +#: hugin1/stitch_project/hugin_stitch_project.cpp:394 msgid "Specify output prefix" msgstr "指定輸出檔名" -#: hugin1/hugin/PanoPanel.cpp:1163 hugin1/hugin/PanoPanel.cpp:1283 -#: hugin1/hugin/PanoPanel.cpp:1448 hugin1/ptbatcher/BatchFrame.cpp:528 -#: hugin1/stitch_project/hugin_stitch_project.cpp:398 +#: hugin1/hugin/PanoPanel.cpp:1164 hugin1/hugin/PanoPanel.cpp:1284 +#: hugin1/hugin/PanoPanel.cpp:1449 hugin1/ptbatcher/BatchFrame.cpp:535 +#: hugin1/stitch_project/hugin_stitch_project.cpp:410 #, c-format msgid "" "You have no permissions to write in folder \"%s\".\n" "Please select another folder for the final output." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1351 +#: hugin1/hugin/PanoPanel.cpp:1352 #, fuzzy msgid "Select user defined output" msgstr "重設使用者定義....." -#: hugin1/hugin/PanoPanel.cpp:1352 +#: hugin1/hugin/PanoPanel.cpp:1353 msgid "User defined output|*.executor" msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1673 +#: hugin1/hugin/PanoPanel.cpp:1674 #, c-format msgid "" "The width and height of jpeg images has to be smaller than 65500 pixel. But " @@ -3348,7 +3419,7 @@ "format." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1687 +#: hugin1/hugin/PanoPanel.cpp:1688 #, c-format msgid "" "The panorama you are trying to stitch is %.1f gigapixels.\n" @@ -3360,7 +3431,7 @@ "如果太大的話，調整底圖大小並裁切範圍，然後透過接合工具標籤來拼接這麼大的全景" "可能會需要很多時間和很大的記憶體" -#: hugin1/hugin/PanoPanel.cpp:1694 +#: hugin1/hugin/PanoPanel.cpp:1695 msgid "" "The width or the height of the final panorama exceeds 32700 pixel.\n" "Some programs have problems to open or display such big images.\n" @@ -3368,26 +3439,26 @@ "If this is too big, reduce the panorama Canvas Size or the cropped region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1702 +#: hugin1/hugin/PanoPanel.cpp:1703 msgid "Are you sure you want to stitch such a large panorama?" msgstr "你確定要拼接這麼大一張全景圖？" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Stitch anyway" msgstr "仍然繼續接合" -#: hugin1/hugin/PanoPanel.cpp:1710 hugin1/hugin/PanoPanel.cpp:1765 +#: hugin1/hugin/PanoPanel.cpp:1711 hugin1/hugin/PanoPanel.cpp:1766 msgid "Let me fix that" msgstr "讓我重新設定" -#: hugin1/hugin/PanoPanel.cpp:1738 +#: hugin1/hugin/PanoPanel.cpp:1739 msgid "" "There are no active images in the output region.\n" "Please check your settings, so that at least one image is in the output " "region." msgstr "" -#: hugin1/hugin/PanoPanel.cpp:1758 +#: hugin1/hugin/PanoPanel.cpp:1759 #, c-format msgid "" "The folder \"%s\" has only %.1f MiB free. This is not enough for stitching " @@ -3418,184 +3489,203 @@ msgid "Miscellaneous" msgstr "雜項" -#: hugin1/hugin/PreferencesDialog.cpp:116 +#: hugin1/hugin/PreferencesDialog.cpp:119 msgid "System default" msgstr "系統預設" -#: hugin1/hugin/PreferencesDialog.cpp:119 +#: hugin1/hugin/PreferencesDialog.cpp:122 msgid "Basque" msgstr "巴斯克文" -#: hugin1/hugin/PreferencesDialog.cpp:127 +#: hugin1/hugin/PreferencesDialog.cpp:130 msgid "Catalan" msgstr "加泰羅尼亞文" -#: hugin1/hugin/PreferencesDialog.cpp:130 +#: hugin1/hugin/PreferencesDialog.cpp:133 msgid "Chinese (Simplified)" msgstr "中文 (簡體)" -#: hugin1/hugin/PreferencesDialog.cpp:133 +#: hugin1/hugin/PreferencesDialog.cpp:136 msgid "Chinese (Traditional)" msgstr "中文 (繁體)" -#: hugin1/hugin/PreferencesDialog.cpp:136 +#: hugin1/hugin/PreferencesDialog.cpp:139 msgid "Czech" msgstr "捷克文" -#: hugin1/hugin/PreferencesDialog.cpp:139 +#: hugin1/hugin/PreferencesDialog.cpp:142 msgid "Danish" msgstr "丹麥文" -#: hugin1/hugin/PreferencesDialog.cpp:142 +#: hugin1/hugin/PreferencesDialog.cpp:145 msgid "Dutch" msgstr "荷蘭文" -#: hugin1/hugin/PreferencesDialog.cpp:145 +#: hugin1/hugin/PreferencesDialog.cpp:148 msgid "English" msgstr "英文" -#: hugin1/hugin/PreferencesDialog.cpp:148 +#: hugin1/hugin/PreferencesDialog.cpp:151 msgid "French" msgstr "法文" -#: hugin1/hugin/PreferencesDialog.cpp:151 +#: hugin1/hugin/PreferencesDialog.cpp:154 msgid "German" msgstr "德文" -#: hugin1/hugin/PreferencesDialog.cpp:154 +#: hugin1/hugin/PreferencesDialog.cpp:157 msgid "Hungarian" msgstr "匈牙利文" -#: hugin1/hugin/PreferencesDialog.cpp:157 +#: hugin1/hugin/PreferencesDialog.cpp:160 msgid "Italian" msgstr "意大利文" -#: hugin1/hugin/PreferencesDialog.cpp:160 +#: hugin1/hugin/PreferencesDialog.cpp:163 msgid "Japanese" msgstr "日文" -#: hugin1/hugin/PreferencesDialog.cpp:168 +#: hugin1/hugin/PreferencesDialog.cpp:171 msgid "Polish" msgstr "波蘭文" -#: hugin1/hugin/PreferencesDialog.cpp:171 +#: hugin1/hugin/PreferencesDialog.cpp:174 msgid "Portuguese (Brazilian)" msgstr "葡萄牙文 (巴西)" -#: hugin1/hugin/PreferencesDialog.cpp:174 +#: hugin1/hugin/PreferencesDialog.cpp:177 msgid "Russian" msgstr "俄文" -#: hugin1/hugin/PreferencesDialog.cpp:177 +#: hugin1/hugin/PreferencesDialog.cpp:180 msgid "Slovak" msgstr "斯洛伐克文" -#: hugin1/hugin/PreferencesDialog.cpp:185 +#: hugin1/hugin/PreferencesDialog.cpp:188 msgid "Spanish" msgstr "西班牙文" -#: hugin1/hugin/PreferencesDialog.cpp:188 +#: hugin1/hugin/PreferencesDialog.cpp:191 msgid "Swedish" msgstr "瑞典文" -#: hugin1/hugin/PreferencesDialog.cpp:196 +#: hugin1/hugin/PreferencesDialog.cpp:199 msgid "Finnish" msgstr "芬蘭文" -#: hugin1/hugin/PreferencesDialog.cpp:199 +#: hugin1/hugin/PreferencesDialog.cpp:202 msgid "Valencian (Southern Catalan)" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:294 +#: hugin1/hugin/PreferencesDialog.cpp:302 msgid "Select Enblend" msgstr "選取 Enblend" -#: hugin1/hugin/PreferencesDialog.cpp:297 -#: hugin1/hugin/PreferencesDialog.cpp:314 +#: hugin1/hugin/PreferencesDialog.cpp:305 +#: hugin1/hugin/PreferencesDialog.cpp:322 +#: hugin1/hugin/PreferencesDialog.cpp:339 +#: hugin1/hugin/PreferencesDialog.cpp:355 +#: hugin1/hugin/PreferencesDialog.cpp:371 msgid "Executables (*.exe)|*.exe" msgstr "可執行檔案 (*.exe)|*.exe" -#: hugin1/hugin/PreferencesDialog.cpp:311 +#: hugin1/hugin/PreferencesDialog.cpp:319 msgid "Select Enfuse" msgstr "選取 Enfuse" -#: hugin1/hugin/PreferencesDialog.cpp:340 -#: hugin1/hugin/PreferencesDialog.cpp:428 hugin1/hugin/xrc/pref_dialog.xrc:1002 -#: hugin1/hugin/xrc/pref_dialog.xrc:1061 +#: hugin1/hugin/PreferencesDialog.cpp:337 +#, fuzzy +msgid "Select dcraw" +msgstr "全選" + +#: hugin1/hugin/PreferencesDialog.cpp:353 +#, fuzzy +msgid "Select RawTherapee-cli" +msgstr "選取 PTStitcher.exe" + +#: hugin1/hugin/PreferencesDialog.cpp:369 +#, fuzzy +msgid "Select Darktable-cli" +msgstr "全選" + +#: hugin1/hugin/PreferencesDialog.cpp:397 +#: hugin1/hugin/PreferencesDialog.cpp:485 +#: hugin1/hugin/xrc/pref_dialog.xrc:1085 hugin1/hugin/xrc/pref_dialog.xrc:1144 #, fuzzy msgid "Select ExifTool argfile" msgstr "在左圖選取點" -#: hugin1/hugin/PreferencesDialog.cpp:342 -#: hugin1/hugin/PreferencesDialog.cpp:400 -#: hugin1/hugin/PreferencesDialog.cpp:430 -#: hugin1/hugin/PreferencesDialog.cpp:470 +#: hugin1/hugin/PreferencesDialog.cpp:399 +#: hugin1/hugin/PreferencesDialog.cpp:457 +#: hugin1/hugin/PreferencesDialog.cpp:487 +#: hugin1/hugin/PreferencesDialog.cpp:527 #, fuzzy msgid "ExifTool Argfiles (*.arg)|*.arg|All Files(*)|*" msgstr "紀錄檔案 (*.pto)|*.pto|全部檔案 (*)|*" -#: hugin1/hugin/PreferencesDialog.cpp:378 +#: hugin1/hugin/PreferencesDialog.cpp:435 #, c-format msgid "" "File %s does not exist.\n" "Should the argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:379 -#: hugin1/hugin/PreferencesDialog.cpp:394 -#: hugin1/hugin/PreferencesDialog.cpp:449 -#: hugin1/hugin/PreferencesDialog.cpp:464 +#: hugin1/hugin/PreferencesDialog.cpp:436 +#: hugin1/hugin/PreferencesDialog.cpp:451 +#: hugin1/hugin/PreferencesDialog.cpp:506 +#: hugin1/hugin/PreferencesDialog.cpp:521 msgid "Exiftool argfile" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:393 +#: hugin1/hugin/PreferencesDialog.cpp:450 msgid "" "No file selected.\n" "Should an argfile be created with default tags?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:398 -#: hugin1/hugin/PreferencesDialog.cpp:468 +#: hugin1/hugin/PreferencesDialog.cpp:455 +#: hugin1/hugin/PreferencesDialog.cpp:525 #, fuzzy msgid "Select new ExifTool argfile" msgstr "在左圖選取點" -#: hugin1/hugin/PreferencesDialog.cpp:419 -#: hugin1/hugin/PreferencesDialog.cpp:489 +#: hugin1/hugin/PreferencesDialog.cpp:476 +#: hugin1/hugin/PreferencesDialog.cpp:546 #, fuzzy, c-format msgid "Could not save file \"%s\"." msgstr "無法開啟專案檔：%s" -#: hugin1/hugin/PreferencesDialog.cpp:448 +#: hugin1/hugin/PreferencesDialog.cpp:505 #, c-format msgid "" "File %s does not exist.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:463 +#: hugin1/hugin/PreferencesDialog.cpp:520 msgid "" "No file selected.\n" "Should an example argfile be created?" msgstr "" -#: hugin1/hugin/PreferencesDialog.cpp:786 +#: hugin1/hugin/PreferencesDialog.cpp:848 msgid "Really reset displayed preferences to default values?" msgstr "真的要將顯示的偏好設定重新設定成預設值嗎?" -#: hugin1/hugin/PreferencesDialog.cpp:786 hugin1/hugin/xrc/pref_dialog.xrc:1531 +#: hugin1/hugin/PreferencesDialog.cpp:848 +#: hugin1/hugin/xrc/pref_dialog.xrc:1614 msgid "Load Defaults" msgstr "載入預設值" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Please select an entry first" msgstr "請選取一個欄位再試一次" -#: hugin1/hugin/PreferencesDialog.cpp:1069 +#: hugin1/hugin/PreferencesDialog.cpp:1139 msgid "Select Entry" msgstr "請選取一個欄位" -#: hugin1/hugin/PreferencesDialog.cpp:1089 +#: hugin1/hugin/PreferencesDialog.cpp:1159 msgid "" "You can't delete the last setting.\n" "At least one setting is required." @@ -3603,29 +3693,29 @@ "您無法刪除最後一個設定.\n" "至少需要一個設定." -#: hugin1/hugin/PreferencesDialog.cpp:1093 +#: hugin1/hugin/PreferencesDialog.cpp:1163 #, c-format msgid "Do you really want to remove control point detector setting \"%s\"?" msgstr "確定移除刪除控制點偵測器設定 [%s]?" -#: hugin1/hugin/PreferencesDialog.cpp:1094 +#: hugin1/hugin/PreferencesDialog.cpp:1164 msgid "Delete control point detector setting" msgstr "刪除控制點偵測器設定" -#: hugin1/hugin/PreferencesDialog.cpp:1151 +#: hugin1/hugin/PreferencesDialog.cpp:1221 msgid "Load control point detector settings" msgstr "載入控制點偵測器設定" -#: hugin1/hugin/PreferencesDialog.cpp:1153 -#: hugin1/hugin/PreferencesDialog.cpp:1168 +#: hugin1/hugin/PreferencesDialog.cpp:1223 +#: hugin1/hugin/PreferencesDialog.cpp:1238 msgid "Control point detector settings (*.setting)|*.setting" msgstr "控制點偵測器設定 (*.setting)|*.setting" -#: hugin1/hugin/PreferencesDialog.cpp:1166 +#: hugin1/hugin/PreferencesDialog.cpp:1236 msgid "Save control point detector settings" msgstr "儲存控制點偵測器設定" -#: hugin1/hugin/PreviewColorPickerTool.cpp:42 +#: hugin1/hugin/PreviewColorPickerTool.cpp:45 msgid "" "Click on a area which should be neutral gray / white in the final panorama." msgstr "點選在輸出的全景圖中應該要是中性的灰色/白色區域。" @@ -3650,48 +3740,53 @@ msgid "Remove %lu control points" msgstr "移除了 %lu 個控制點" -#: hugin1/hugin/PreviewFrame.cpp:101 +#: hugin1/hugin/PreviewFrame.cpp:105 msgid "Panorama preview" msgstr "全景圖片預覽" -#: hugin1/hugin/PreviewFrame.cpp:182 +#: hugin1/hugin/PreviewFrame.cpp:186 msgid "Preview Options" msgstr "預覽選項" -#: hugin1/hugin/PreviewFrame.cpp:185 +#: hugin1/hugin/PreviewFrame.cpp:189 msgid "projection (f):" msgstr "投影 (f):" -#: hugin1/hugin/PreviewFrame.cpp:210 hugin1/hugin/xrc/preview_frame.xrc:348 +#: hugin1/hugin/PreviewFrame.cpp:214 hugin1/hugin/xrc/preview_frame.xrc:348 msgid "Blend mode:" msgstr "混合模式:" -#: hugin1/hugin/PreviewFrame.cpp:232 +#: hugin1/hugin/PreviewFrame.cpp:236 msgid "Output:" msgstr "輸出:" -#: hugin1/hugin/PreviewFrame.cpp:237 +#: hugin1/hugin/PreviewFrame.cpp:241 msgid "LDR" msgstr "LDR" -#: hugin1/hugin/PreviewFrame.cpp:238 +#: hugin1/hugin/PreviewFrame.cpp:242 msgid "HDR" msgstr "HDR" -#: hugin1/hugin/PreviewFrame.cpp:250 hugin1/hugin/xrc/preview_frame.xrc:366 +#: hugin1/hugin/PreviewFrame.cpp:254 hugin1/hugin/xrc/preview_frame.xrc:366 msgid "EV:" msgstr "EV:" -#: hugin1/hugin/PreviewFrame.cpp:280 +#: hugin1/hugin/PreviewFrame.cpp:281 hugin1/hugin/xrc/preview_frame.xrc:397 +#, fuzzy +msgid "Range compression:" +msgstr "壓縮:" + +#: hugin1/hugin/PreviewFrame.cpp:293 msgid "Projection Parameters" msgstr "投影參數" -#: hugin1/hugin/PreviewFrame.cpp:325 hugin1/hugin/PreviewPanel.cpp:658 +#: hugin1/hugin/PreviewFrame.cpp:338 hugin1/hugin/PreviewPanel.cpp:688 msgid "" "Left click to define new center point, right click to move point to horizon." msgstr "點左鍵以設定新的中心點，點右鍵將點移動到水平線上" -#: hugin1/hugin/PreviewFrame.cpp:360 hugin1/hugin/PreviewFrame.cpp:497 +#: hugin1/hugin/PreviewFrame.cpp:373 hugin1/hugin/PreviewFrame.cpp:511 msgid "Center panorama with left mouse button, set horizon with right button" msgstr "使用滑鼠左鍵使全景圖片居中, 使用右鍵設定水平線" @@ -3708,7 +3803,7 @@ msgid "Click a connection to edit control points." msgstr "點擊一個連接以編輯控制點." -#: hugin1/hugin/PreviewPanel.cpp:403 +#: hugin1/hugin/PreviewPanel.cpp:433 #, c-format msgid "" "Could not stitch preview.\n" @@ -3716,33 +3811,115 @@ "One cause could be an invalid or missing image file." msgstr "" -#: hugin1/hugin/huginApp.cpp:235 +#: hugin1/hugin/RawImport.cpp:75 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found.\n" +"Please specify a valid executable in preferences." +msgstr "[%s]未被發現. 請在偏好設定中指定一個有效路徑" + +#: hugin1/hugin/RawImport.cpp:93 +#, fuzzy, c-format +msgid "" +"Executable \"%s\" not found in PATH.\n" +"Please specify a valid executable in preferences." +msgstr "[%s]未被發現. 請在偏好設定中指定一個有效路徑" + +#: hugin1/hugin/RawImport.cpp:141 hugin1/hugin/RawImport.cpp:178 +#: hugin1/hugin/RawImport.cpp:248 hugin1/hugin/RawImport.cpp:269 +#: hugin1/hugin/RawImport.cpp:346 hugin1/hugin/RawImport.cpp:407 +#, fuzzy, c-format +msgid "Executing: %s %s" +msgstr "偵測中： %s" + +#: hugin1/hugin/RawImport.cpp:147 hugin1/hugin/RawImport.cpp:184 +#, c-format +msgid "Updating EXIF data for %s" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:219 +#, c-format +msgid "" +"Processing profile \"%s\" not found.\n" +"Please specify a valid file or leave field empty for default settings." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:457 hugin1/hugin/xrc/import_raw_dialog.xrc:159 +msgid "Import Raw Images" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:506 +msgid "" +"Could not process of output of reference image.\n" +"Can't process further images." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:531 hugin1/hugin/RawImport.cpp:543 +#: hugin1/hugin/xrc/batch_frame.xrc:464 +msgid "Close" +msgstr "關閉" + +#: hugin1/hugin/RawImport.cpp:711 +msgid "Warning: Read error" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:712 +msgid "" +"The following files will be skipped because the metadata of these files " +"could not read." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:735 +msgid "Warning: raw images from different cameras" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:736 +msgid "" +"The following images were shot with different camera than the other one.\n" +"The raw import works only for images from the same cam." +msgstr "" + +#: hugin1/hugin/RawImport.cpp:838 +msgid "" +"At least one raw images was not successfully converted.\n" +"This image(s) will be skipped" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "Select default RT processing profile" +msgstr "" + +#: hugin1/hugin/RawImport.cpp:866 +msgid "RT processing profile|*.pp3" +msgstr "" + +#: hugin1/hugin/huginApp.cpp:242 #, fuzzy, c-format msgid "Directory '%s' does not exists" msgstr "" "目錄 %s 不存在 \n" "請指定有效的路徑" -#: hugin1/hugin/huginApp.cpp:239 +#: hugin1/hugin/huginApp.cpp:246 msgid "Could not set environment variable PYTHONHOME" msgstr "" -#: hugin1/hugin/huginApp.cpp:358 +#: hugin1/hugin/huginApp.cpp:379 #, fuzzy msgid "Open Batch Processor" msgstr "批次處理" -#: hugin1/hugin/huginApp.cpp:359 hugin1/hugin/xrc/main_menu.xrc:202 -#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1082 +#: hugin1/hugin/huginApp.cpp:380 hugin1/hugin/xrc/main_menu.xrc:202 +#: hugin1/hugin/xrc/main_menu.xrc:232 hugin1/hugin/xrc/preview_frame.xrc:1105 msgid "Opens PTBatcher, the batch processor for Hugin's project files" msgstr "開啟 PTBatcher, Hugin 專案檔案的批次處理器" -#: hugin1/hugin/huginApp.cpp:364 +#: hugin1/hugin/huginApp.cpp:385 #, fuzzy msgid "Open Lens calibrate tool" msgstr "Hugin 鏡頭校正視窗" -#: hugin1/hugin/huginApp.cpp:365 +#: hugin1/hugin/huginApp.cpp:386 msgid "Opens Calibrate_lens_gui, a simple GUI for lens calibration" msgstr "" @@ -3756,26 +3933,26 @@ "在路徑中無法找到 [%s].\n" "也許您沒有正確的安裝或是指定了一個錯誤的目錄" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:346 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:359 msgid "cleaning up temporary keypoint files" msgstr "正在清理暫時的識別點檔案" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:401 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:414 #, c-format msgid "" "Please use %namefile, %i or %s to specify the input files for the control " "point detector" msgstr "請使用 %namefile, %i 或者 %s 來為控制點偵測器指定輸入檔案" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:402 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:529 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:535 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:415 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:538 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:544 msgid "Error in control point detector command" msgstr "控制點偵測器指令發生錯誤" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:449 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:605 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:694 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:615 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:704 msgid "" "Command line for control point detector too long.\n" "This is a Windows limitation\n" @@ -3787,14 +3964,14 @@ "請選取較少的圖片, 或者將圖片放在\n" "一個路徑較短的檔案夾中" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:450 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:606 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:695 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:463 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:616 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 msgid "Too many images selected" msgstr "選取過多圖片" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 #, c-format msgid "" "Too many arguments (images). Try using the %%s parameter in preferences.\n" @@ -3805,38 +3982,38 @@ "\n" "不能執行指令:%s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:462 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:477 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:576 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:636 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:705 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:720 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:475 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:490 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:586 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:646 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:715 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:730 msgid "wxExecute Error" msgstr "wxExecute 發生錯誤" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:468 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:622 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:711 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:481 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:632 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:721 msgid "finding control points" msgstr "正在尋找控制點" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:473 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:569 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:629 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:716 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:486 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:579 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:639 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:726 #, c-format msgid "Could not execute command: %s" msgstr "無法執行指令: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:476 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:575 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:635 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:719 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:489 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:585 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:645 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:729 #, c-format msgid "" "Command: %s\n" @@ -3845,9 +4022,9 @@ "指令: %s\n" "失敗的錯誤碼: %d" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:482 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:642 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:727 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:495 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:652 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:737 #, c-format msgid "" "Could not open %s for reading\n" @@ -3862,29 +4039,29 @@ "\n" "被執行的指令: %s" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:483 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:643 -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:728 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:496 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:653 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:738 msgid "Control point detector failure" msgstr "控制點偵測器的失敗" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:528 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:537 msgid "" "Please use %i to specify the input files and %k to specify the keypoint file " "for the generate keys step" msgstr "請使用 %i 來指定輸入檔案以及 %k 來為產生 keys 步驟指定 keypoint 檔案 " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:534 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:543 msgid "" "Please use %k to specify the keypoint files and %o to specify the output " "project file for the matching step" msgstr "在配對步驟中,請使用 %k 來指定 keypoint 檔案並使用 %o 指定輸出專案檔 " -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:562 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:572 msgid "generating key file" msgstr "產生 key 檔案" -#: hugin1/icpfind/AutoCtrlPointCreator.cpp:617 +#: hugin1/icpfind/AutoCtrlPointCreator.cpp:627 #, c-format msgid "" "Too many arguments (images). Try using a cp generator setting which supports " @@ -3896,11 +4073,11 @@ "\n" "不能執行指令: %s" -#: hugin1/icpfind/CPDetectorConfig.cpp:137 +#: hugin1/icpfind/CPDetectorConfig.cpp:142 msgid "Default" msgstr "預設" -#: hugin1/ptbatcher/Batch.cpp:252 +#: hugin1/ptbatcher/Batch.cpp:261 msgid "" "Cannot clear batch in progress.\n" "Do you want to cancel it?" @@ -3908,258 +4085,258 @@ "無法清理進行中的批次處理.\n" "您想取消它嗎?" -#: hugin1/ptbatcher/Batch.cpp:254 hugin1/ptbatcher/BatchFrame.cpp:691 -#: hugin1/ptbatcher/BatchFrame.cpp:752 hugin1/ptbatcher/BatchFrame.cpp:788 -#: hugin1/ptbatcher/BatchFrame.cpp:826 hugin1/ptbatcher/BatchFrame.cpp:856 -#: hugin1/ptbatcher/BatchFrame.cpp:1129 hugin1/ptbatcher/BatchFrame.cpp:1290 -#: hugin1/ptbatcher/BatchFrame.cpp:1297 hugin1/hugin/xrc/pref_dialog.xrc:875 +#: hugin1/ptbatcher/Batch.cpp:263 hugin1/ptbatcher/BatchFrame.cpp:698 +#: hugin1/ptbatcher/BatchFrame.cpp:759 hugin1/ptbatcher/BatchFrame.cpp:795 +#: hugin1/ptbatcher/BatchFrame.cpp:833 hugin1/ptbatcher/BatchFrame.cpp:863 +#: hugin1/ptbatcher/BatchFrame.cpp:1136 hugin1/ptbatcher/BatchFrame.cpp:1297 +#: hugin1/ptbatcher/BatchFrame.cpp:1304 msgid "PTBatcherGUI" msgstr "批次處裡" -#: hugin1/ptbatcher/Batch.cpp:267 hugin1/ptbatcher/Batch.cpp:277 +#: hugin1/ptbatcher/Batch.cpp:276 hugin1/ptbatcher/Batch.cpp:286 msgid "Cleared batch." msgstr "已清除批次處理." -#: hugin1/ptbatcher/Batch.cpp:360 +#: hugin1/ptbatcher/Batch.cpp:369 #, c-format msgid "Error: Could not get status, project with index %d is not in list." msgstr "錯誤: 無法獲得狀態, 專案%d不存在." -#: hugin1/ptbatcher/Batch.cpp:409 +#: hugin1/ptbatcher/Batch.cpp:418 msgid "Error: Could not load batch file." msgstr "錯誤: 無法載入批次處理檔案." -#: hugin1/ptbatcher/Batch.cpp:565 +#: hugin1/ptbatcher/Batch.cpp:574 msgid "Batch successfully completed." msgstr "成功完成批次處理." -#: hugin1/ptbatcher/Batch.cpp:572 +#: hugin1/ptbatcher/Batch.cpp:581 msgid "Batch completed with errors." msgstr "完成批次處理但存在錯誤." -#: hugin1/ptbatcher/Batch.cpp:591 +#: hugin1/ptbatcher/Batch.cpp:600 msgid "Initializing shutdown..." msgstr "準備關機..." -#: hugin1/ptbatcher/Batch.cpp:591 hugin1/ptbatcher/Batch.cpp:596 +#: hugin1/ptbatcher/Batch.cpp:600 hugin1/ptbatcher/Batch.cpp:605 msgid "Shutting down..." msgstr "正在關機..." -#: hugin1/ptbatcher/Batch.cpp:616 +#: hugin1/ptbatcher/Batch.cpp:625 msgid "Prepare to hibernate..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:617 +#: hugin1/ptbatcher/Batch.cpp:626 #, fuzzy msgid "Initializing hibernating..." msgstr "準備關機..." -#: hugin1/ptbatcher/Batch.cpp:620 +#: hugin1/ptbatcher/Batch.cpp:629 msgid "Prepare to suspend..." msgstr "" -#: hugin1/ptbatcher/Batch.cpp:621 +#: hugin1/ptbatcher/Batch.cpp:630 #, fuzzy msgid "Initializing suspend mode..." msgstr "準備關機..." -#: hugin1/ptbatcher/Batch.cpp:670 +#: hugin1/ptbatcher/Batch.cpp:679 #, fuzzy msgid "Specify project file" msgstr "儲存專案檔案" -#: hugin1/ptbatcher/Batch.cpp:691 +#: hugin1/ptbatcher/Batch.cpp:700 msgid "No output prefix specified" msgstr "沒有指定輸出檔名" -#: hugin1/ptbatcher/Batch.cpp:698 +#: hugin1/ptbatcher/Batch.cpp:707 msgid "No project files specified" msgstr "沒有指定專案檔案" -#: hugin1/ptbatcher/Batch.cpp:725 -#: hugin1/stitch_project/hugin_stitch_project.cpp:438 +#: hugin1/ptbatcher/Batch.cpp:734 +#: hugin1/stitch_project/hugin_stitch_project.cpp:450 #, c-format msgid "%s - Stitching" msgstr "%s - 接合中" -#: hugin1/ptbatcher/Batch.cpp:757 +#: hugin1/ptbatcher/Batch.cpp:766 #, c-format msgid "%s - Assistant" msgstr "%s - 接圖分析" -#: hugin1/ptbatcher/Batch.cpp:814 +#: hugin1/ptbatcher/Batch.cpp:823 #, c-format msgid "Error removing, project with id %d is not in list." msgstr "移除過程發生錯誤, 專案%d不存在." -#: hugin1/ptbatcher/Batch.cpp:830 +#: hugin1/ptbatcher/Batch.cpp:839 msgid "Error: Could not delete project file " msgstr "錯誤: 無法刪除專案檔案" -#: hugin1/ptbatcher/Batch.cpp:846 +#: hugin1/ptbatcher/Batch.cpp:855 msgid "Running batch..." msgstr "正在執行批次處理..." -#: hugin1/ptbatcher/Batch.cpp:849 +#: hugin1/ptbatcher/Batch.cpp:858 #, fuzzy msgid "PTBatcherGUI is stitching" msgstr "批次處裡 開始" -#: hugin1/ptbatcher/Batch.cpp:855 +#: hugin1/ptbatcher/Batch.cpp:864 msgid "Batch already in progress." msgstr "批次處理已在進行中" -#: hugin1/ptbatcher/Batch.cpp:869 +#: hugin1/ptbatcher/Batch.cpp:878 #, fuzzy, c-format msgid "Running command \"%s\"" msgstr "正在執行指令 \"" -#: hugin1/ptbatcher/Batch.cpp:888 +#: hugin1/ptbatcher/Batch.cpp:902 #, c-format msgid "Now stitching: %s" msgstr "接合中： %s" -#: hugin1/ptbatcher/Batch.cpp:895 +#: hugin1/ptbatcher/Batch.cpp:909 #, c-format msgid "Now detecting: %s" msgstr "偵測中： %s" -#: hugin1/ptbatcher/Batch.cpp:993 +#: hugin1/ptbatcher/Batch.cpp:1007 #, c-format msgid "Error: Could not set status, project with index %d is not in list." msgstr "錯誤: 無法設定狀態, 專案%d不存在." -#: hugin1/ptbatcher/BatchFrame.cpp:152 +#: hugin1/ptbatcher/BatchFrame.cpp:154 msgid "Not doing much..." msgstr "不再做..." -#: hugin1/ptbatcher/BatchFrame.cpp:170 hugin1/hugin/xrc/main_frame.xrc:67 +#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:67 msgid "You have pressed the Command key." msgstr "\"Command\"按鍵被按下" -#: hugin1/ptbatcher/BatchFrame.cpp:172 hugin1/hugin/xrc/main_frame.xrc:66 +#: hugin1/ptbatcher/BatchFrame.cpp:174 hugin1/hugin/xrc/main_frame.xrc:66 msgid "You have pressed the Control key." msgstr "\"Control (Ctrl)\" 按鍵被按下" -#: hugin1/ptbatcher/BatchFrame.cpp:175 +#: hugin1/ptbatcher/BatchFrame.cpp:177 msgid "Should the loading of the batch queue be skipped?" msgstr "載入批次處理序列的程序要跳過嗎？" -#: hugin1/ptbatcher/BatchFrame.cpp:199 +#: hugin1/ptbatcher/BatchFrame.cpp:201 #, fuzzy msgid "Do nothing" msgstr "不要預覽視窗" -#: hugin1/ptbatcher/BatchFrame.cpp:200 +#: hugin1/ptbatcher/BatchFrame.cpp:202 #, fuzzy msgid "Close PTBatcherGUI" msgstr "批次處裡" -#: hugin1/ptbatcher/BatchFrame.cpp:203 +#: hugin1/ptbatcher/BatchFrame.cpp:205 #, fuzzy msgid "Shutdown computer" msgstr "完成後關機" -#: hugin1/ptbatcher/BatchFrame.cpp:211 +#: hugin1/ptbatcher/BatchFrame.cpp:213 msgid "Suspend computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:215 +#: hugin1/ptbatcher/BatchFrame.cpp:217 msgid "Hibernate computer" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Please enter the command-line application to execute:" msgstr "請輸入指令串程序來執行:" -#: hugin1/ptbatcher/BatchFrame.cpp:357 +#: hugin1/ptbatcher/BatchFrame.cpp:364 msgid "Enter application" msgstr "進入應用程式" -#: hugin1/ptbatcher/BatchFrame.cpp:374 hugin1/ptbatcher/FindPanoDialog.cpp:248 +#: hugin1/ptbatcher/BatchFrame.cpp:381 hugin1/ptbatcher/FindPanoDialog.cpp:250 msgid "Specify a directory to search for projects in" msgstr "請指定一個尋找專案檔的目錄" -#: hugin1/ptbatcher/BatchFrame.cpp:394 hugin1/ptbatcher/BatchFrame.cpp:422 +#: hugin1/ptbatcher/BatchFrame.cpp:401 hugin1/ptbatcher/BatchFrame.cpp:429 msgid "Specify project source file(s)" msgstr "指定專案源檔案" -#: hugin1/ptbatcher/BatchFrame.cpp:465 +#: hugin1/ptbatcher/BatchFrame.cpp:472 #, fuzzy, c-format msgid "Added projects from dir %s" msgstr "已增加專案從目錄" -#: hugin1/ptbatcher/BatchFrame.cpp:476 +#: hugin1/ptbatcher/BatchFrame.cpp:483 #, c-format msgid "Add project %s to stitching queue." msgstr "把專案 %s 新增到批次處理序列中." -#: hugin1/ptbatcher/BatchFrame.cpp:479 +#: hugin1/ptbatcher/BatchFrame.cpp:486 #, c-format msgid "Add project %s to assistant queue." msgstr "新增專案 %s 到接圖分析序列中" -#: hugin1/ptbatcher/BatchFrame.cpp:493 +#: hugin1/ptbatcher/BatchFrame.cpp:500 msgid "Batch stopped" msgstr "批次處理已暫停" -#: hugin1/ptbatcher/BatchFrame.cpp:496 hugin1/ptbatcher/BatchFrame.cpp:1231 -#: hugin1/ptbatcher/BatchFrame.cpp:1267 hugin1/ptbatcher/BatchFrame.cpp:1280 -#: hugin1/ptbatcher/BatchFrame.cpp:1419 +#: hugin1/ptbatcher/BatchFrame.cpp:503 hugin1/ptbatcher/BatchFrame.cpp:1238 +#: hugin1/ptbatcher/BatchFrame.cpp:1274 hugin1/ptbatcher/BatchFrame.cpp:1287 +#: hugin1/ptbatcher/BatchFrame.cpp:1426 msgid "Hugin's Batch processor" msgstr "Hugin的批次處理" -#: hugin1/ptbatcher/BatchFrame.cpp:509 +#: hugin1/ptbatcher/BatchFrame.cpp:516 msgid "Specify output prefix for project " msgstr "為專案指定輸出檔名" -#: hugin1/ptbatcher/BatchFrame.cpp:550 +#: hugin1/ptbatcher/BatchFrame.cpp:557 msgid "The prefix of an assistant target cannot be changed." msgstr "接圖分析列表的指定檔名不能修改" -#: hugin1/ptbatcher/BatchFrame.cpp:558 +#: hugin1/ptbatcher/BatchFrame.cpp:565 msgid "Please select a project" msgstr "請選取一個專案" -#: hugin1/ptbatcher/BatchFrame.cpp:563 hugin1/ptbatcher/BatchFrame.cpp:708 +#: hugin1/ptbatcher/BatchFrame.cpp:570 hugin1/ptbatcher/BatchFrame.cpp:715 #, fuzzy msgid "Please select only one project" msgstr "請選取一個專案" -#: hugin1/ptbatcher/BatchFrame.cpp:647 +#: hugin1/ptbatcher/BatchFrame.cpp:654 msgid "Specify batch file to open" msgstr "指定要開啟的批次處理檔案" -#: hugin1/ptbatcher/BatchFrame.cpp:649 +#: hugin1/ptbatcher/BatchFrame.cpp:656 msgid "Batch files (*.ptb)|*.ptb;|All files (*)|*" msgstr "批次處理檔案 (*.ptb)|*.ptb;|全部檔案 (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:681 +#: hugin1/ptbatcher/BatchFrame.cpp:688 msgid "Cannot open app in Hugin." msgstr "無法在 Hugin 中開啟應用程式." -#: hugin1/ptbatcher/BatchFrame.cpp:689 +#: hugin1/ptbatcher/BatchFrame.cpp:696 msgid "No project selected. Open Hugin without project?" msgstr "沒有選取專案. 直接啟動Hugin?" -#: hugin1/ptbatcher/BatchFrame.cpp:721 +#: hugin1/ptbatcher/BatchFrame.cpp:728 msgid "Batch paused" msgstr "批次處理已暫停" -#: hugin1/ptbatcher/BatchFrame.cpp:724 hugin1/ptbatcher/BatchFrame.cpp:1415 +#: hugin1/ptbatcher/BatchFrame.cpp:731 hugin1/ptbatcher/BatchFrame.cpp:1422 msgid "Pausing processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:731 +#: hugin1/ptbatcher/BatchFrame.cpp:738 msgid "Continuing batch..." msgstr "繼續批次處理..." -#: hugin1/ptbatcher/BatchFrame.cpp:734 hugin1/ptbatcher/BatchFrame.cpp:1192 -#: hugin1/ptbatcher/BatchFrame.cpp:1409 +#: hugin1/ptbatcher/BatchFrame.cpp:741 hugin1/ptbatcher/BatchFrame.cpp:1199 +#: hugin1/ptbatcher/BatchFrame.cpp:1416 msgid "Processing Hugin's batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:750 +#: hugin1/ptbatcher/BatchFrame.cpp:757 msgid "" "There are failed projects in the list.\n" "Remove them too?" @@ -4167,7 +4344,7 @@ "列表中有失敗專案.\n" "也移除它們?" -#: hugin1/ptbatcher/BatchFrame.cpp:786 +#: hugin1/ptbatcher/BatchFrame.cpp:793 msgid "" "Cannot remove project in progress.\n" "Do you want to cancel it?" @@ -4175,16 +4352,16 @@ "無法移除進行中的專案.\n" "您想取消它嗎?" -#: hugin1/ptbatcher/BatchFrame.cpp:800 +#: hugin1/ptbatcher/BatchFrame.cpp:807 #, fuzzy, c-format msgid "Removed project %s" msgstr "移除專案" -#: hugin1/ptbatcher/BatchFrame.cpp:810 +#: hugin1/ptbatcher/BatchFrame.cpp:817 msgid "Please select a project to remove" msgstr "請選取一個專案來移除" -#: hugin1/ptbatcher/BatchFrame.cpp:824 +#: hugin1/ptbatcher/BatchFrame.cpp:831 msgid "" "Cannot reset project in progress.\n" "Do you want to cancel it?" @@ -4192,16 +4369,16 @@ "無法重新設定進行中的專案.\n" "您想取消它嗎?" -#: hugin1/ptbatcher/BatchFrame.cpp:839 +#: hugin1/ptbatcher/BatchFrame.cpp:846 #, fuzzy, c-format msgid "Reset project %s" msgstr "重新設定專案" -#: hugin1/ptbatcher/BatchFrame.cpp:845 +#: hugin1/ptbatcher/BatchFrame.cpp:852 msgid "Please select a project to reset" msgstr "請選取一個專案去重新設定" -#: hugin1/ptbatcher/BatchFrame.cpp:854 +#: hugin1/ptbatcher/BatchFrame.cpp:861 msgid "" "Cannot reset projects in progress.\n" "Do you want to cancel the batch?" @@ -4209,31 +4386,31 @@ "無法重新設定進行中的專案.\n" "您想取消這個批次處理嗎?" -#: hugin1/ptbatcher/BatchFrame.cpp:893 +#: hugin1/ptbatcher/BatchFrame.cpp:900 msgid "Specify batch file to save" msgstr "指定批次處理檔案來儲存" -#: hugin1/ptbatcher/BatchFrame.cpp:895 +#: hugin1/ptbatcher/BatchFrame.cpp:902 msgid "Batch file (*.ptb)|*.ptb;|All files (*)|*" msgstr "批次處理檔案 (*.ptb)|*.ptb;|全部檔案 (*)|*" -#: hugin1/ptbatcher/BatchFrame.cpp:1127 +#: hugin1/ptbatcher/BatchFrame.cpp:1134 msgid "" "The batch queue contains many items.\n" "This can have negative effects on performance.\n" "Should the batch queue be cleared now?" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 #, fuzzy msgid "Clear batch queue now" msgstr "清除批次處理" -#: hugin1/ptbatcher/BatchFrame.cpp:1134 +#: hugin1/ptbatcher/BatchFrame.cpp:1141 msgid "Keep batch queue" msgstr "" -#: hugin1/ptbatcher/BatchFrame.cpp:1189 +#: hugin1/ptbatcher/BatchFrame.cpp:1196 msgid "Starting batch" msgstr "開始批次處理" @@ -4269,7 +4446,7 @@ msgid "E&xit" msgstr "退出 (&x)\tAlt-X" -#: hugin1/ptbatcher/FindPanoDialog.cpp:237 +#: hugin1/ptbatcher/FindPanoDialog.cpp:239 msgid "" "The list contains possibly unprocessed panoramas.\n" "If you close the dialog, you will lose them.\n" @@ -4279,11 +4456,11 @@ "如果關閉視窗可能會導致他們消失\n" "確定要繼續嗎？" -#: hugin1/ptbatcher/FindPanoDialog.cpp:262 +#: hugin1/ptbatcher/FindPanoDialog.cpp:264 msgid "Accepted" msgstr "接受" -#: hugin1/ptbatcher/FindPanoDialog.cpp:272 +#: hugin1/ptbatcher/FindPanoDialog.cpp:274 msgid "" "The list contains still not yet processed panoramas.\n" "If you continue, they will be disregarded.\n" @@ -4293,11 +4470,11 @@ "繼續可能會導致他們被忽略\n" "仍然要繼續嗎？" -#: hugin1/ptbatcher/FindPanoDialog.cpp:282 +#: hugin1/ptbatcher/FindPanoDialog.cpp:284 msgid "Stop" msgstr "停止" -#: hugin1/ptbatcher/FindPanoDialog.cpp:293 +#: hugin1/ptbatcher/FindPanoDialog.cpp:295 #, c-format msgid "" "Directory %s does not exist.\n" @@ -4306,7 +4483,7 @@ "目錄 %s 不存在 \n" "請指定有效的路徑" -#: hugin1/ptbatcher/FindPanoDialog.cpp:315 +#: hugin1/ptbatcher/FindPanoDialog.cpp:317 msgid "" "You have selected no possible panorama.\n" "Please select at least one panorama and try again." @@ -4314,7 +4491,7 @@ "你沒有選擇正常的全景\n" "請至少選擇一張全景並再試一次" -#: hugin1/ptbatcher/FindPanoDialog.cpp:338 +#: hugin1/ptbatcher/FindPanoDialog.cpp:340 msgid "" "Not all project files could be written successfully.\n" "Maybe you have no write permission for these directories or your disc is " @@ -4323,141 +4500,143 @@ "不是所有的專案檔成功寫入\n" "硬碟可能滿了或是沒有寫入的權限" -#: hugin1/ptbatcher/FindPanoDialog.cpp:383 +#: hugin1/ptbatcher/FindPanoDialog.cpp:386 #, fuzzy msgid "Remove image from project" msgstr "從這個專案中移除目前圖片" -#: hugin1/ptbatcher/FindPanoDialog.cpp:389 +#: hugin1/ptbatcher/FindPanoDialog.cpp:392 #, fuzzy msgid "Split here into two panoramas" msgstr "搜尋環景" -#: hugin1/ptbatcher/FindPanoDialog.cpp:474 +#: hugin1/ptbatcher/FindPanoDialog.cpp:495 #, c-format msgid "Reading file %s" msgstr "讀取檔案 %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:571 hugin1/hugin/xrc/batch_frame.xrc:216 +#: hugin1/ptbatcher/FindPanoDialog.cpp:592 +#: hugin1/hugin/xrc/batch_frame.xrc:216 msgid "Start" msgstr "開始" -#: hugin1/ptbatcher/FindPanoDialog.cpp:577 +#: hugin1/ptbatcher/FindPanoDialog.cpp:598 #, c-format msgid "Found %d possible panoramas." msgstr "找到 %d 個可能的環景" -#: hugin1/ptbatcher/FindPanoDialog.cpp:581 +#: hugin1/ptbatcher/FindPanoDialog.cpp:602 msgid "No possible panoramas found." msgstr "沒有找到可能的環景" -#: hugin1/ptbatcher/FindPanoDialog.cpp:688 +#: hugin1/ptbatcher/FindPanoDialog.cpp:709 #, c-format msgid "%d images: %s" msgstr "%d 個影像： %s" -#: hugin1/ptbatcher/FindPanoDialog.cpp:920 +#: hugin1/ptbatcher/FindPanoDialog.cpp:938 msgid "%M:%S min" msgstr "" -#: hugin1/ptbatcher/FindPanoDialog.cpp:924 +#: hugin1/ptbatcher/FindPanoDialog.cpp:942 #, c-format msgid "%S s" msgstr "" -#: hugin1/ptbatcher/PTBatcherGUI.cpp:164 -#: hugin1/stitch_project/hugin_stitch_project.cpp:319 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:179 +#: hugin1/stitch_project/hugin_stitch_project.cpp:331 msgid "Syntax error in parameters detected, aborting." msgstr "偵測到參數語法錯誤, 中斷." -#: hugin1/ptbatcher/PTBatcherGUI.cpp:217 +#: hugin1/ptbatcher/PTBatcherGUI.cpp:232 msgid "PTBatcherGUI started" msgstr "批次處裡 開始" -#: hugin1/ptbatcher/ProjectArray.cpp:68 +#: hugin1/ptbatcher/ProjectArray.cpp:71 msgid "Waiting" msgstr "等待" -#: hugin1/ptbatcher/ProjectArray.cpp:70 +#: hugin1/ptbatcher/ProjectArray.cpp:73 msgid "In progress" msgstr "進行中" -#: hugin1/ptbatcher/ProjectArray.cpp:72 +#: hugin1/ptbatcher/ProjectArray.cpp:75 msgid "Complete" msgstr "完成" -#: hugin1/ptbatcher/ProjectArray.cpp:74 +#: hugin1/ptbatcher/ProjectArray.cpp:77 msgid "Failed" msgstr "已失敗" -#: hugin1/ptbatcher/ProjectArray.cpp:76 hugin1/ptbatcher/ProjectListBox.cpp:230 +#: hugin1/ptbatcher/ProjectArray.cpp:79 +#: hugin1/ptbatcher/ProjectListBox.cpp:233 msgid "File missing" msgstr "找不到檔案" -#: hugin1/ptbatcher/ProjectArray.cpp:78 +#: hugin1/ptbatcher/ProjectArray.cpp:81 msgid "Paused" msgstr "已暫停" -#: hugin1/ptbatcher/ProjectListBox.cpp:61 +#: hugin1/ptbatcher/ProjectListBox.cpp:64 msgid "ID" msgstr "編號" -#: hugin1/ptbatcher/ProjectListBox.cpp:62 +#: hugin1/ptbatcher/ProjectListBox.cpp:65 msgid "Project" msgstr "專案" -#: hugin1/ptbatcher/ProjectListBox.cpp:63 +#: hugin1/ptbatcher/ProjectListBox.cpp:66 msgid "Output prefix" msgstr "輸出檔名" -#: hugin1/ptbatcher/ProjectListBox.cpp:64 +#: hugin1/ptbatcher/ProjectListBox.cpp:67 msgid "Status" msgstr "狀態" -#: hugin1/ptbatcher/ProjectListBox.cpp:65 +#: hugin1/ptbatcher/ProjectListBox.cpp:68 msgid "Last modified" msgstr "最後修改" -#: hugin1/ptbatcher/ProjectListBox.cpp:66 +#: hugin1/ptbatcher/ProjectListBox.cpp:69 msgid "Output format" msgstr "輸出格式" -#: hugin1/ptbatcher/ProjectListBox.cpp:67 -#: hugin1/hugin/xrc/preview_frame.xrc:503 +#: hugin1/ptbatcher/ProjectListBox.cpp:70 +#: hugin1/hugin/xrc/preview_frame.xrc:528 msgid "Projection" msgstr "投影" -#: hugin1/ptbatcher/ProjectListBox.cpp:68 +#: hugin1/ptbatcher/ProjectListBox.cpp:71 msgid "Size" msgstr "尺寸" -#: hugin1/ptbatcher/ProjectListBox.cpp:153 +#: hugin1/ptbatcher/ProjectListBox.cpp:156 #, c-format msgid "%d" msgstr "%d" -#: hugin1/ptbatcher/ProjectListBox.cpp:180 +#: hugin1/ptbatcher/ProjectListBox.cpp:183 msgid "Error, cannot convert id" msgstr "錯誤, 無法位移編號" -#: hugin1/ptbatcher/ProjectListBox.cpp:291 hugin1/hugin/xrc/pref_dialog.xrc:279 -#: hugin1/hugin/xrc/preview_frame.xrc:282 +#: hugin1/ptbatcher/ProjectListBox.cpp:294 +#: hugin1/hugin/xrc/pref_dialog.xrc:362 hugin1/hugin/xrc/preview_frame.xrc:282 msgid "Assistant" msgstr "接圖分析" -#: hugin1/ptbatcher/ProjectListBox.cpp:391 hugin1/hugin/xrc/batch_frame.xrc:38 +#: hugin1/ptbatcher/ProjectListBox.cpp:394 hugin1/hugin/xrc/batch_frame.xrc:38 msgid "Change prefix" msgstr "修改檔名" -#: hugin1/ptbatcher/ProjectListBox.cpp:392 hugin1/hugin/xrc/batch_frame.xrc:44 +#: hugin1/ptbatcher/ProjectListBox.cpp:395 hugin1/hugin/xrc/batch_frame.xrc:44 msgid "Reset project" msgstr "重新設定專案" -#: hugin1/ptbatcher/ProjectListBox.cpp:393 hugin1/hugin/xrc/batch_frame.xrc:56 +#: hugin1/ptbatcher/ProjectListBox.cpp:396 hugin1/hugin/xrc/batch_frame.xrc:56 msgid "Edit with Hugin" msgstr "使用 Hugin 編輯" -#: hugin1/ptbatcher/ProjectListBox.cpp:394 +#: hugin1/ptbatcher/ProjectListBox.cpp:397 #: hugin1/hugin/xrc/lenscal_frame.xrc:37 msgid "Remove" msgstr "移除" @@ -4492,16 +4671,16 @@ msgid "Log files (*.log)|*.log|All files (*)|*" msgstr "紀錄檔案 (*.pto)|*.pto|全部檔案 (*)|*" -#: hugin1/stitch_project/hugin_stitch_project.cpp:347 +#: hugin1/stitch_project/hugin_stitch_project.cpp:359 #, fuzzy, c-format msgid "Could not find the specified user output file \"%s\"." msgstr "無法開啟專案檔：%s" -#: hugin1/stitch_project/hugin_stitch_project.cpp:356 +#: hugin1/stitch_project/hugin_stitch_project.cpp:368 msgid "Specify project source project file" msgstr "指定專案源檔案" -#: hugin1/stitch_project/hugin_stitch_project.cpp:390 +#: hugin1/stitch_project/hugin_stitch_project.cpp:402 #, c-format msgid "" "The given filename contains one of the following invalid characters: %s\n" @@ -4511,7 +4690,7 @@ "Hugin 不能使用這些檔名，請重新輸入可接受的檔名" #: hugin1/hugin/xrc/about.xrc:4 hugin1/hugin/xrc/main_menu.xrc:162 -#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1045 +#: hugin1/hugin/xrc/main_tool.xrc:79 hugin1/hugin/xrc/preview_frame.xrc:1068 msgid "About Hugin" msgstr "關於 Hugin" @@ -4544,19 +4723,19 @@ msgstr "系統預設" #: hugin1/hugin/xrc/about.xrc:198 hugin1/hugin/xrc/cpdetector_dialog.xrc:328 -#: hugin1/hugin/xrc/dlg_warning.xrc:46 +#: hugin1/hugin/xrc/dlg_warning.xrc:45 hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/image_variable_dlg.xrc:634 #: hugin1/hugin/xrc/image_variable_dlg.xrc:705 #: hugin1/hugin/xrc/image_variable_dlg.xrc:794 #: hugin1/hugin/xrc/image_variable_dlg.xrc:833 -#: hugin1/hugin/xrc/images_panel.xrc:549 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:140 #: hugin1/hugin/xrc/lensdb_dialogs.xrc:336 hugin1/hugin/xrc/main_frame.xrc:401 #: hugin1/hugin/xrc/mask_editor_panel.xrc:499 #: hugin1/hugin/xrc/pano_panel.xrc:49 hugin1/hugin/xrc/pano_panel.xrc:91 #: hugin1/hugin/xrc/pano_panel.xrc:138 hugin1/hugin/xrc/pano_panel.xrc:1028 #: hugin1/hugin/xrc/pano_panel.xrc:1354 hugin1/hugin/xrc/pano_panel.xrc:1403 -#: hugin1/hugin/xrc/pref_dialog.xrc:1544 hugin1/hugin/xrc/preview_frame.xrc:109 +#: hugin1/hugin/xrc/pref_dialog.xrc:1627 +#: hugin1/hugin/xrc/preview_frame.xrc:109 #: hugin1/hugin/xrc/reset_dialog.xrc:116 msgid "OK" msgstr "確定" @@ -4634,8 +4813,11 @@ #: hugin1/hugin/xrc/cpdetector_dialog.xrc:143 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:182 #: hugin1/hugin/xrc/cpdetector_dialog.xrc:243 -#: hugin1/hugin/xrc/pref_dialog.xrc:1001 hugin1/hugin/xrc/pref_dialog.xrc:1060 -#: hugin1/hugin/xrc/pref_dialog.xrc:1243 hugin1/hugin/xrc/pref_dialog.xrc:1322 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:96 +#: hugin1/hugin/xrc/pref_dialog.xrc:185 hugin1/hugin/xrc/pref_dialog.xrc:207 +#: hugin1/hugin/xrc/pref_dialog.xrc:229 hugin1/hugin/xrc/pref_dialog.xrc:1084 +#: hugin1/hugin/xrc/pref_dialog.xrc:1143 hugin1/hugin/xrc/pref_dialog.xrc:1326 +#: hugin1/hugin/xrc/pref_dialog.xrc:1405 msgid "Choose..." msgstr "選擇..." @@ -4723,7 +4905,7 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:204 #: hugin1/hugin/xrc/pano_panel.xrc:768 hugin1/hugin/xrc/pano_panel.xrc:795 #: hugin1/hugin/xrc/pano_panel.xrc:822 hugin1/hugin/xrc/pano_panel.xrc:849 -#: hugin1/hugin/xrc/pref_dialog.xrc:910 +#: hugin1/hugin/xrc/pref_dialog.xrc:993 msgid "Options" msgstr "選項" @@ -4758,10 +4940,6 @@ msgid "Send selected panoramas to queue" msgstr "把選擇的環景送到列表" -#: hugin1/hugin/xrc/batch_frame.xrc:464 -msgid "Close" -msgstr "關閉" - #: hugin1/hugin/xrc/batch_frame.xrc:479 msgid "Searching panoramas" msgstr "搜尋環景" @@ -4864,12 +5042,12 @@ msgstr "" #: hugin1/hugin/xrc/batch_menu.xrc:51 hugin1/hugin/xrc/lenscal_frame.xrc:463 -#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1090 +#: hugin1/hugin/xrc/main_menu.xrc:223 hugin1/hugin/xrc/preview_frame.xrc:1113 msgid "&Quit" msgstr "退出 (&Q)" #: hugin1/hugin/xrc/batch_menu.xrc:52 hugin1/hugin/xrc/main_menu.xrc:225 -#: hugin1/hugin/xrc/preview_frame.xrc:1092 +#: hugin1/hugin/xrc/preview_frame.xrc:1115 msgid "Exit program" msgstr "退出應用程式" @@ -4974,47 +5152,154 @@ msgid "adddir" msgstr "增加目錄" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 -msgid "previous image pair" -msgstr "上一對圖片" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 +msgid "Description:" +msgstr "說明:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 -msgid "next image pair" -msgstr "下一對圖片" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 +msgid "Type:" +msgstr "類型:" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 -msgid "mode:" -msgstr "模式:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 +msgid "All images at once" +msgstr "全部圖片同時" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 -msgid "vertical line" -msgstr "垂直線" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 +msgid "Panorama with stacks" +msgstr "有堆棧圖的全景圖" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 -msgid "horizontal line" -msgstr "水平線" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 +msgid "Multi-row panorama" +msgstr "多列全景圖片" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 -msgid "Zoom:" -msgstr "縮放:" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 +msgid "Multi-row panorama with stacks" +msgstr "有堆棧圖的多列全景圖" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 -#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 -msgid "fit to window" -msgstr "自動調整" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 +msgid "Prealigned panorama" +msgstr "預先對準全景圖片" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 -#: hugin1/hugin/xrc/pref_dialog.xrc:440 -msgid "Fine-tune" -msgstr "最佳調整" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 +msgid "Detector" +msgstr "偵測器" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 -msgid "Tries to optimize the currently active point" -msgstr "嘗試最佳化目前選取的點." +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 +msgid "One step detector" +msgstr "一段式探測器" -#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 -msgid "auto fine-&tune" +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 +msgid "Program:" +msgstr "應用程式:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 +msgid "Arguments:" +msgstr "引數:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 +msgid "Cleanup arguments:" +msgstr "清除引數" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 +msgid "Two step detector" +msgstr "兩段式偵測器" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 +msgid "Feature descriptor:" +msgstr "特徵描述：" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 +msgid "Feature matcher:" +msgstr "特徵相容器:" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 +msgid "Detector for stacks" +msgstr "堆棧式圖片偵測器" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 +msgid "Leave empty when no control point detector should run on stacks." +msgstr "當堆棧圖片沒有需要使用的控制點偵測器時,保持空白." + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 +msgid "Advanced option" +msgstr "進階選項" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 +msgid "This setting has no advanced options." +msgstr "這個設定沒有進階選項" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 +msgid "" +"The following patterns will be substituted before running:\n" +"%o -- output project (0.oto will be appended when using Autopano)\n" +"%p -- number of control points between each pair\n" +"%v -- HFOV of first image\n" +"%f -- projection of first image (0-4, as in panotools)\n" +"%i -- image files\n" +"%namefile -- file that contains image filenames\n" +"%s -- input panotools script\n" +"%k -- intermediate key file(s)" +msgstr "" +"以下指令碼將在執行前被取代:\n" +"%o -- 輸出專案 (當使用 Autopano 時 0.oto 將被附加)\n" +"%p -- 每對圖片的控制點的數\n" +"%v -- 第一張圖片的水平角度\n" +"%f -- 第一張圖片的投影 (0-4,如 panotools )\n" +"%i -- 圖片檔案\n" +"%namefile -- 包含圖片檔名的檔案\n" +"%s -- 輸入 panotools 程式碼\n" +"%k -- 中途 key 檔案" + +#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 +msgid "Parameters for Control Point Detectors" +msgstr "控制點偵測器參數" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:32 +msgid "previous image pair" +msgstr "上一對圖片" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:64 +msgid "next image pair" +msgstr "下一對圖片" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:177 +msgid "mode:" +msgstr "模式:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:186 +msgid "vertical line" +msgstr "垂直線" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:187 +msgid "horizontal line" +msgstr "水平線" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:210 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:367 +msgid "Zoom:" +msgstr "縮放:" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:220 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:376 +msgid "fit to window" +msgstr "自動調整" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:240 +#: hugin1/hugin/xrc/pref_dialog.xrc:523 +msgid "Fine-tune" +msgstr "最佳調整" + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:241 +msgid "Tries to optimize the currently active point" +msgstr "嘗試最佳化目前選取的點." + +#: hugin1/hugin/xrc/cp_editor_panel.xrc:261 +msgid "auto fine-&tune" msgstr "自動調整 (&t)" #: hugin1/hugin/xrc/cp_editor_panel.xrc:267 @@ -5068,7 +5353,7 @@ #: hugin1/hugin/xrc/cp_list_frame.xrc:17 #: hugin1/hugin/xrc/image_variable_dlg.xrc:758 -#: hugin1/hugin/xrc/pref_dialog.xrc:676 +#: hugin1/hugin/xrc/pref_dialog.xrc:759 msgid "Delete" msgstr "刪除" @@ -5076,151 +5361,183 @@ msgid "Select by Distance" msgstr "通過距離進行選取" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:17 -msgid "Description:" -msgstr "說明:" +#: hugin1/hugin/xrc/dlg_warning.xrc:55 +#, fuzzy +msgid "Warning: Invalid filenames" +msgstr "無效的檔名" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:29 -#: hugin1/hugin/xrc/image_variable_dlg.xrc:547 -msgid "Type:" -msgstr "類型:" +#: hugin1/hugin/xrc/dlg_warning.xrc:74 +msgid "" +"The following files exist already.\n" +"They will be overwritten when running the raw import.\n" +"Do you want to overwrite these files?" +msgstr "" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:37 -msgid "Autopano (by A. Jenny)" -msgstr "Autopano (作者 A. Jenny)" +#: hugin1/hugin/xrc/dlg_warning.xrc:102 hugin1/hugin/xrc/main_frame.xrc:106 +msgid "Yes" +msgstr "是" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:38 -msgid "All images at once" -msgstr "全部圖片同時" +#: hugin1/hugin/xrc/dlg_warning.xrc:108 hugin1/hugin/xrc/main_frame.xrc:112 +msgid "No" +msgstr "否" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:39 -msgid "Panorama with stacks" -msgstr "有堆棧圖的全景圖" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 +msgid "Edit Panorama Tools Script" +msgstr "編輯全景圖片工具的程式碼" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:40 -msgid "Multi-row panorama" -msgstr "多列全景圖片" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 +msgid "" +"This is the script which will be sent to the Panorama Tools engine. Editing " +"these lines is an advanced technique." +msgstr "這是將要被傳遞給全景圖片工具引擎的程式碼. 編輯這些指令是一項進階的技巧" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:41 -msgid "Multi-row panorama with stacks" -msgstr "有堆棧圖的多列全景圖" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 +msgid "Continue with these changes" +msgstr "繼續這些修改" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:42 -msgid "Prealigned panorama" -msgstr "預先對準全景圖片" +#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 +msgid "Discard changes and cancel" +msgstr "放棄修改並且取消" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:55 -msgid "Detector" -msgstr "偵測器" +#: hugin1/hugin/xrc/images_panel.xrc:30 +msgid "Group by:" +msgstr "分類模式：" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:62 -msgid "One step detector" -msgstr "一段式探測器" +#: hugin1/hugin/xrc/images_panel.xrc:42 +msgid "Minimum overlap:" +msgstr "最小的重疊：" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:68 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:227 -msgid "Program:" -msgstr "應用程式:" +#: hugin1/hugin/xrc/images_panel.xrc:51 +#, fuzzy +msgid "" +"Minimum overlap for output stack detection\n" +"With -1 the assigned stacks in the project are used." +msgstr "堆棧偵測輸出的最小重疊" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:94 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:153 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:192 -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:253 -msgid "Arguments:" -msgstr "引數:" +#: hugin1/hugin/xrc/images_panel.xrc:67 +msgid "Maximum Ev difference:" +msgstr "最大的曝光值(Ev)差異" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:107 -msgid "Cleanup arguments:" -msgstr "清除引數" +#: hugin1/hugin/xrc/images_panel.xrc:76 +msgid "Maximum EV difference for detection of output layers" +msgstr "輸出圖層偵測的最大的曝光(Ev)差異" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:121 -msgid "Two step detector" -msgstr "兩段式偵測器" +#: hugin1/hugin/xrc/images_panel.xrc:90 +msgid "Display" +msgstr "顯示資料" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:127 -msgid "Feature descriptor:" -msgstr "特徵描述：" +#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 +msgid "General" +msgstr "一般" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:166 -msgid "Feature matcher:" -msgstr "特徵相容器:" +#: hugin1/hugin/xrc/images_panel.xrc:93 +msgid "EXIF data" +msgstr "EXIF 資訊" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:213 -msgid "Detector for stacks" -msgstr "堆棧式圖片偵測器" +#: hugin1/hugin/xrc/images_panel.xrc:94 +#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 +msgid "Positions" +msgstr "位置" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:218 -msgid "Leave empty when no control point detector should run on stacks." -msgstr "當堆棧圖片沒有需要使用的控制點偵測器時,保持空白." +#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 +#: hugin1/hugin/xrc/reset_dialog.xrc:36 +msgid "Lens parameters" +msgstr "鏡頭參數" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:273 -msgid "Advanced option" -msgstr "進階選項" +#: hugin1/hugin/xrc/images_panel.xrc:96 +msgid "Photometric parameters" +msgstr "光學參數" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:287 -msgid "This setting has no advanced options." -msgstr "這個設定沒有進階選項" +#: hugin1/hugin/xrc/images_panel.xrc:130 +msgid "Lens type" +msgstr "鏡頭類型:" -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:302 -msgid "" -"The following patterns will be substituted before running:\n" -"%o -- output project (0.oto will be appended when using Autopano)\n" -"%p -- number of control points between each pair\n" -"%v -- HFOV of first image\n" -"%f -- projection of first image (0-4, as in panotools)\n" -"%i -- image files\n" -"%namefile -- file that contains image filenames\n" -"%s -- input panotools script\n" -"%k -- intermediate key file(s)" -msgstr "" -"以下指令碼將在執行前被取代:\n" -"%o -- 輸出專案 (當使用 Autopano 時 0.oto 將被附加)\n" -"%p -- 每對圖片的控制點的數\n" -"%v -- 第一張圖片的水平角度\n" -"%f -- 第一張圖片的投影 (0-4,如 panotools )\n" -"%i -- 圖片檔案\n" -"%namefile -- 包含圖片檔名的檔案\n" -"%s -- 輸入 panotools 程式碼\n" -"%k -- 中途 key 檔案" +#: hugin1/hugin/xrc/images_panel.xrc:145 +msgid "Add images..." +msgstr "新增影像..." -#: hugin1/hugin/xrc/cpdetector_dialog.xrc:342 -msgid "Parameters for Control Point Detectors" -msgstr "控制點偵測器參數" +#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 +#: hugin1/hugin/xrc/lenscal_frame.xrc:60 +#: hugin1/hugin/xrc/preview_frame.xrc:178 +msgid "Lens type:" +msgstr "鏡頭類型:" -#: hugin1/hugin/xrc/dlg_warning.xrc:35 -msgid "Invalid filenames" -msgstr "無效的檔名" +#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 +#: hugin1/hugin/xrc/lenscal_frame.xrc:104 +#: hugin1/hugin/xrc/preview_frame.xrc:213 +msgid "Focal length multiplier:" +msgstr "焦距比:" + +#: hugin1/hugin/xrc/images_panel.xrc:227 +msgid "Feature Matching" +msgstr "特徵點偵測" + +#: hugin1/hugin/xrc/images_panel.xrc:242 +msgid "Settings:" +msgstr "設定:" + +#: hugin1/hugin/xrc/images_panel.xrc:254 +#, fuzzy +msgid "Run selected control point detector on the selected images" +msgstr "移除連接到選取圖片上的控制點" + +#: hugin1/hugin/xrc/images_panel.xrc:278 +#: hugin1/hugin/xrc/lenscal_frame.xrc:365 hugin1/hugin/xrc/main_tool.xrc:52 +msgid "Optimize" +msgstr "最佳化" + +#: hugin1/hugin/xrc/images_panel.xrc:293 +msgid "Geometric:" +msgstr "幾何的：" + +#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 +msgid "Calculate" +msgstr "計算" + +#: hugin1/hugin/xrc/images_panel.xrc:314 +msgid "Photometric:" +msgstr "光學性質的：" + +#: hugin1/hugin/xrc/images_panel.xrc:360 +msgid "Selected Image" +msgstr "選取圖片" + +#: hugin1/hugin/xrc/images_panel.xrc:446 +msgid "Load lens data..." +msgstr "載入鏡頭數據..." -#: hugin1/hugin/xrc/edit_script_dialog.xrc:4 -msgid "Edit Panorama Tools Script" -msgstr "編輯全景圖片工具的程式碼" +#: hugin1/hugin/xrc/images_panel.xrc:462 +msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" +msgstr "輸入水平視角 (HFOV) 或者焦距和鏡頭焦距位移率:" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:9 -msgid "" -"This is the script which will be sent to the Panorama Tools engine. Editing " -"these lines is an advanced technique." -msgstr "這是將要被傳遞給全景圖片工具引擎的程式碼. 編輯這些指令是一項進階的技巧" +#: hugin1/hugin/xrc/images_panel.xrc:473 +msgid "HFOV (v):" +msgstr "水平視角 (v):" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:27 -msgid "Continue with these changes" -msgstr "繼續這些修改" +#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:670 +#: hugin1/hugin/xrc/pref_dialog.xrc:689 +msgid "degrees" +msgstr "角度" -#: hugin1/hugin/xrc/edit_script_dialog.xrc:32 -msgid "Discard changes and cancel" -msgstr "放棄修改並且取消" +#: hugin1/hugin/xrc/images_panel.xrc:563 +msgid "Camera and Lens data" +msgstr "照相機和鏡頭數據" #: hugin1/hugin/xrc/image_variable_dlg.xrc:15 -#: hugin1/hugin/xrc/preview_frame.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:61 +#: hugin1/hugin/xrc/preview_frame.xrc:733 msgid "Yaw:" msgstr "轉向角度:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:28 -#: hugin1/hugin/xrc/preview_frame.xrc:75 hugin1/hugin/xrc/preview_frame.xrc:723 +#: hugin1/hugin/xrc/preview_frame.xrc:75 +#: hugin1/hugin/xrc/preview_frame.xrc:748 msgid "Pitch:" msgstr "俯仰角度:" #: hugin1/hugin/xrc/image_variable_dlg.xrc:41 -#: hugin1/hugin/xrc/preview_frame.xrc:89 hugin1/hugin/xrc/preview_frame.xrc:738 +#: hugin1/hugin/xrc/preview_frame.xrc:89 +#: hugin1/hugin/xrc/preview_frame.xrc:763 msgid "Roll:" msgstr "滾轉角度:" @@ -5228,34 +5545,11 @@ msgid "Translation parameter" msgstr "平移參數" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:69 -#: hugin1/hugin/xrc/preview_frame.xrc:753 -msgid "X:" -msgstr "X:" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:82 -#: hugin1/hugin/xrc/preview_frame.xrc:768 -msgid "Y:" -msgstr "Y:" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:95 -#: hugin1/hugin/xrc/preview_frame.xrc:783 +#: hugin1/hugin/xrc/preview_frame.xrc:808 msgid "Z:" msgstr "Z:" -#: hugin1/hugin/xrc/image_variable_dlg.xrc:108 -msgid "Tpy:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:121 -msgid "Tpp:" -msgstr "" - -#: hugin1/hugin/xrc/image_variable_dlg.xrc:142 -#: hugin1/hugin/xrc/images_panel.xrc:94 -msgid "Positions" -msgstr "位置" - #: hugin1/hugin/xrc/image_variable_dlg.xrc:165 msgid "degrees of view (v):" msgstr "視圖角度 (v):" @@ -5357,7 +5651,7 @@ #: hugin1/hugin/xrc/image_variable_dlg.xrc:645 #: hugin1/hugin/xrc/pano_panel.xrc:102 hugin1/hugin/xrc/pano_panel.xrc:149 -#: hugin1/hugin/xrc/pref_dialog.xrc:1555 +#: hugin1/hugin/xrc/pref_dialog.xrc:1638 msgid "Help" msgstr "幫助" @@ -5401,8 +5695,8 @@ msgstr "載入遮罩" #: hugin1/hugin/xrc/image_variable_dlg.xrc:751 -#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1593 -#: hugin1/hugin/xrc/pref_dialog.xrc:1660 +#: hugin1/hugin/xrc/main_tool.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1676 +#: hugin1/hugin/xrc/pref_dialog.xrc:1743 msgid "Save" msgstr "儲存" @@ -5415,120 +5709,47 @@ msgid "Manipulate image variables" msgstr "編輯影像變數..." -#: hugin1/hugin/xrc/images_panel.xrc:30 -msgid "Group by:" -msgstr "分類模式：" - -#: hugin1/hugin/xrc/images_panel.xrc:42 -msgid "Minimum overlap:" -msgstr "最小的重疊：" - -#: hugin1/hugin/xrc/images_panel.xrc:51 -msgid "Minimum overlap for output stack detection" -msgstr "堆棧偵測輸出的最小重疊" - -#: hugin1/hugin/xrc/images_panel.xrc:67 -msgid "Maximum Ev difference:" -msgstr "最大的曝光值(Ev)差異" - -#: hugin1/hugin/xrc/images_panel.xrc:76 -msgid "Maximum EV difference for detection of output layers" -msgstr "輸出圖層偵測的最大的曝光(Ev)差異" - -#: hugin1/hugin/xrc/images_panel.xrc:90 -msgid "Display" -msgstr "顯示資料" - -#: hugin1/hugin/xrc/images_panel.xrc:92 hugin1/hugin/xrc/pref_dialog.xrc:9 -msgid "General" -msgstr "一般" - -#: hugin1/hugin/xrc/images_panel.xrc:93 -msgid "EXIF data" -msgstr "EXIF 資訊" - -#: hugin1/hugin/xrc/images_panel.xrc:95 hugin1/hugin/xrc/lenscal_frame.xrc:389 -#: hugin1/hugin/xrc/reset_dialog.xrc:36 -msgid "Lens parameters" -msgstr "鏡頭參數" - -#: hugin1/hugin/xrc/images_panel.xrc:96 -msgid "Photometric parameters" -msgstr "光學參數" - -#: hugin1/hugin/xrc/images_panel.xrc:130 -msgid "Lens type" -msgstr "鏡頭類型:" - -#: hugin1/hugin/xrc/images_panel.xrc:145 -msgid "Add images..." -msgstr "新增影像..." - -#: hugin1/hugin/xrc/images_panel.xrc:154 hugin1/hugin/xrc/images_panel.xrc:427 -#: hugin1/hugin/xrc/lenscal_frame.xrc:60 hugin1/hugin/xrc/preview_frame.xrc:178 -msgid "Lens type:" -msgstr "鏡頭類型:" - -#: hugin1/hugin/xrc/images_panel.xrc:189 hugin1/hugin/xrc/images_panel.xrc:519 -#: hugin1/hugin/xrc/lenscal_frame.xrc:104 -#: hugin1/hugin/xrc/preview_frame.xrc:213 -msgid "Focal length multiplier:" -msgstr "焦距比:" - -#: hugin1/hugin/xrc/images_panel.xrc:227 -msgid "Feature Matching" -msgstr "特徵點偵測" - -#: hugin1/hugin/xrc/images_panel.xrc:242 -msgid "Settings:" -msgstr "設定:" - -#: hugin1/hugin/xrc/images_panel.xrc:254 +#: hugin1/hugin/xrc/import_raw_dialog.xrc:12 #, fuzzy -msgid "Run selected control point detector on the selected images" -msgstr "移除連接到選取圖片上的控制點" - -#: hugin1/hugin/xrc/images_panel.xrc:278 hugin1/hugin/xrc/lenscal_frame.xrc:365 -#: hugin1/hugin/xrc/main_tool.xrc:52 -msgid "Optimize" -msgstr "最佳化" - -#: hugin1/hugin/xrc/images_panel.xrc:293 -msgid "Geometric:" -msgstr "幾何的：" +msgid "WB reference:" +msgstr "偏好設定 (&P)" -#: hugin1/hugin/xrc/images_panel.xrc:309 hugin1/hugin/xrc/images_panel.xrc:330 -msgid "Calculate" -msgstr "計算" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:35 +msgid "dcraw" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:314 -msgid "Photometric:" -msgstr "光學性質的：" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:44 +#, fuzzy +msgid "Additional dcraw parameters:" +msgstr "連結參數" -#: hugin1/hugin/xrc/images_panel.xrc:360 -msgid "Selected Image" -msgstr "選取圖片" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:72 +msgid "RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:446 -msgid "Load lens data..." -msgstr "載入鏡頭數據..." +#: hugin1/hugin/xrc/import_raw_dialog.xrc:81 +#, fuzzy +msgid "Processing profile:" +msgstr "處理工具：" -#: hugin1/hugin/xrc/images_panel.xrc:462 -msgid "Enter horizontal field of view (HFOV) or focal length and crop factor:" -msgstr "輸入水平視角 (HFOV) 或者焦距和鏡頭焦距位移率:" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:88 +msgid "Leave empty to use default settings in RawTherapee" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:473 -msgid "HFOV (v):" -msgstr "水平視角 (v):" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:118 +msgid "darktable" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:484 hugin1/hugin/xrc/pref_dialog.xrc:587 -#: hugin1/hugin/xrc/pref_dialog.xrc:606 -msgid "degrees" -msgstr "角度" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:132 +#: hugin1/hugin/xrc/pref_dialog.xrc:164 +msgid "Raw converter" +msgstr "" -#: hugin1/hugin/xrc/images_panel.xrc:563 -msgid "Camera and Lens data" -msgstr "照相機和鏡頭數據" +#: hugin1/hugin/xrc/import_raw_dialog.xrc:148 +#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 +#: hugin1/hugin/xrc/pref_dialog.xrc:791 +msgid "Import" +msgstr "輸入" #: hugin1/hugin/xrc/lenscal_frame.xrc:30 hugin1/hugin/xrc/main_tool.xrc:46 msgid "Add" @@ -5669,14 +5890,6 @@ msgid "Don't ask again" msgstr "不要再詢問我" -#: hugin1/hugin/xrc/main_frame.xrc:106 -msgid "Yes" -msgstr "是" - -#: hugin1/hugin/xrc/main_frame.xrc:112 -msgid "No" -msgstr "否" - #: hugin1/hugin/xrc/main_frame.xrc:141 msgid "" "The project covers a big brightness range, but Hugin could not automatically " @@ -5736,21 +5949,21 @@ msgid "Import positions from Papywizard XML" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:969 +#: hugin1/hugin/xrc/main_menu.xrc:6 hugin1/hugin/xrc/preview_frame.xrc:992 msgid "&Undo" msgstr "復原 (&U)" #: hugin1/hugin/xrc/main_menu.xrc:8 hugin1/hugin/xrc/main_tool.xrc:34 -#: hugin1/hugin/xrc/preview_frame.xrc:971 +#: hugin1/hugin/xrc/preview_frame.xrc:994 msgid "Undo the last action" msgstr "復原最後一個動作" -#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:974 +#: hugin1/hugin/xrc/main_menu.xrc:11 hugin1/hugin/xrc/preview_frame.xrc:997 msgid "&Redo" msgstr "取消復原 (&R)" #: hugin1/hugin/xrc/main_menu.xrc:13 hugin1/hugin/xrc/main_tool.xrc:40 -#: hugin1/hugin/xrc/preview_frame.xrc:976 +#: hugin1/hugin/xrc/preview_frame.xrc:999 msgid "Redo the last action" msgstr "取消復原最後動作" @@ -5794,12 +6007,12 @@ msgid "Use only normal control points in optimization." msgstr "這張影像的控制點數量" -#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:980 +#: hugin1/hugin/xrc/main_menu.xrc:39 hugin1/hugin/xrc/preview_frame.xrc:1003 msgid "&Optimize" msgstr "最佳化 (&O)" #: hugin1/hugin/xrc/main_menu.xrc:41 hugin1/hugin/xrc/main_tool.xrc:53 -#: hugin1/hugin/xrc/preview_frame.xrc:982 +#: hugin1/hugin/xrc/preview_frame.xrc:1005 msgid "Re-run the optimizer with current settings" msgstr "依照目前設定重新執行最佳化器" @@ -5829,16 +6042,16 @@ msgid "Run a python script" msgstr "執行Python語法" -#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1006 +#: hugin1/hugin/xrc/main_menu.xrc:59 hugin1/hugin/xrc/preview_frame.xrc:1029 msgid "&View" msgstr "檢視 (&V)" -#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:991 +#: hugin1/hugin/xrc/main_menu.xrc:61 hugin1/hugin/xrc/preview_frame.xrc:1014 #, fuzzy msgid "Full &Screen" msgstr "全螢幕" -#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:994 +#: hugin1/hugin/xrc/main_menu.xrc:63 hugin1/hugin/xrc/preview_frame.xrc:1017 msgid "Shows Hugin's main window on full-screen" msgstr "全螢幕顯示hugins主視窗" @@ -5920,22 +6133,22 @@ msgid "Show the Stitcher panel" msgstr "顯示接合工具面板" -#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1010 +#: hugin1/hugin/xrc/main_menu.xrc:114 hugin1/hugin/xrc/preview_frame.xrc:1033 #, fuzzy msgid "&Simple" msgstr "簡易" -#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1015 +#: hugin1/hugin/xrc/main_menu.xrc:119 hugin1/hugin/xrc/preview_frame.xrc:1038 #, fuzzy msgid "&Advanced" msgstr "進階" -#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1019 +#: hugin1/hugin/xrc/main_menu.xrc:123 hugin1/hugin/xrc/preview_frame.xrc:1042 #, fuzzy msgid "&Expert" msgstr "專家級" -#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1022 +#: hugin1/hugin/xrc/main_menu.xrc:126 hugin1/hugin/xrc/preview_frame.xrc:1045 #, fuzzy msgid "&Interface" msgstr "操作介面" @@ -5958,86 +6171,86 @@ msgid "Stitch with the settings from a user defined output sequence" msgstr "" -#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1028 +#: hugin1/hugin/xrc/main_menu.xrc:145 hugin1/hugin/xrc/preview_frame.xrc:1051 msgid "Some information on the different buttons and so on." msgstr "不同按鈕之類的資訊." -#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1031 +#: hugin1/hugin/xrc/main_menu.xrc:148 hugin1/hugin/xrc/preview_frame.xrc:1054 msgid "&Tip of the day" msgstr "今日提示 (&T)" -#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1032 +#: hugin1/hugin/xrc/main_menu.xrc:149 hugin1/hugin/xrc/preview_frame.xrc:1055 msgid "Show one of the tips of the day." msgstr "顯示一條今天的提示." -#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1035 +#: hugin1/hugin/xrc/main_menu.xrc:152 hugin1/hugin/xrc/preview_frame.xrc:1058 msgid "&Keyboard Shortcuts" msgstr "鍵盤快捷鍵 (&K)" -#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1036 +#: hugin1/hugin/xrc/main_menu.xrc:153 hugin1/hugin/xrc/preview_frame.xrc:1059 msgid "keyboard shortcuts" msgstr "鍵盤快捷鍵" -#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1039 +#: hugin1/hugin/xrc/main_menu.xrc:156 hugin1/hugin/xrc/preview_frame.xrc:1062 msgid "&FAQ" msgstr "常見問題解答 (&F)" -#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1040 +#: hugin1/hugin/xrc/main_menu.xrc:157 hugin1/hugin/xrc/preview_frame.xrc:1063 msgid "Frequently Asked Questions" msgstr "經常的詢問的問題" -#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1044 +#: hugin1/hugin/xrc/main_menu.xrc:161 hugin1/hugin/xrc/preview_frame.xrc:1067 msgid "&About" msgstr "關於 (&A)" #: hugin1/hugin/xrc/main_menu.xrc:165 hugin1/hugin/xrc/main_menu.xrc:219 -#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1048 -#: hugin1/hugin/xrc/preview_frame.xrc:1086 -#: hugin1/hugin/xrc/preview_frame.xrc:1123 +#: hugin1/hugin/xrc/main_menu.xrc:245 hugin1/hugin/xrc/preview_frame.xrc:1071 +#: hugin1/hugin/xrc/preview_frame.xrc:1109 +#: hugin1/hugin/xrc/preview_frame.xrc:1146 msgid "&Preferences" msgstr "偏好設定 (&P)" -#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1056 -#: hugin1/hugin/xrc/preview_frame.xrc:1098 +#: hugin1/hugin/xrc/main_menu.xrc:172 hugin1/hugin/xrc/preview_frame.xrc:1079 +#: hugin1/hugin/xrc/preview_frame.xrc:1121 msgid "&New" msgstr "新增 (&N)" #: hugin1/hugin/xrc/main_menu.xrc:174 hugin1/hugin/xrc/main_tool.xrc:7 -#: hugin1/hugin/xrc/preview_frame.xrc:1058 -#: hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1123 msgid "New project" msgstr "新專案" -#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1061 -#: hugin1/hugin/xrc/preview_frame.xrc:1103 +#: hugin1/hugin/xrc/main_menu.xrc:177 hugin1/hugin/xrc/preview_frame.xrc:1084 +#: hugin1/hugin/xrc/preview_frame.xrc:1126 msgid "&Open" msgstr "開啟 (&O)" #: hugin1/hugin/xrc/main_menu.xrc:179 hugin1/hugin/xrc/main_tool.xrc:13 -#: hugin1/hugin/xrc/preview_frame.xrc:1063 -#: hugin1/hugin/xrc/preview_frame.xrc:1105 +#: hugin1/hugin/xrc/preview_frame.xrc:1086 +#: hugin1/hugin/xrc/preview_frame.xrc:1128 msgid "Open project" msgstr "開啟專案" -#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1066 -#: hugin1/hugin/xrc/preview_frame.xrc:1108 +#: hugin1/hugin/xrc/main_menu.xrc:182 hugin1/hugin/xrc/preview_frame.xrc:1089 +#: hugin1/hugin/xrc/preview_frame.xrc:1131 msgid "&Save" msgstr "儲存 (&S)" #: hugin1/hugin/xrc/main_menu.xrc:184 hugin1/hugin/xrc/main_tool.xrc:21 -#: hugin1/hugin/xrc/preview_frame.xrc:1068 -#: hugin1/hugin/xrc/preview_frame.xrc:1110 +#: hugin1/hugin/xrc/preview_frame.xrc:1091 +#: hugin1/hugin/xrc/preview_frame.xrc:1133 msgid "Save current project file" msgstr "儲存目前專案檔案" -#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1071 -#: hugin1/hugin/xrc/preview_frame.xrc:1113 +#: hugin1/hugin/xrc/main_menu.xrc:187 hugin1/hugin/xrc/preview_frame.xrc:1094 +#: hugin1/hugin/xrc/preview_frame.xrc:1136 msgid "S&ave as" msgstr "另存為 (&a)" #: hugin1/hugin/xrc/main_menu.xrc:189 hugin1/hugin/xrc/main_tool.xrc:27 -#: hugin1/hugin/xrc/preview_frame.xrc:1072 -#: hugin1/hugin/xrc/preview_frame.xrc:1114 +#: hugin1/hugin/xrc/preview_frame.xrc:1095 +#: hugin1/hugin/xrc/preview_frame.xrc:1137 msgid "Save current project to a new file" msgstr "將目前專案儲存成為一個新檔案" @@ -6051,19 +6264,19 @@ "batch processing" msgstr "編寫目前專案成為一個與 PTStitcher 相容的程式碼檔案, 用於批次處理" -#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1076 -#: hugin1/hugin/xrc/preview_frame.xrc:1118 +#: hugin1/hugin/xrc/main_menu.xrc:196 hugin1/hugin/xrc/preview_frame.xrc:1099 +#: hugin1/hugin/xrc/preview_frame.xrc:1141 #, fuzzy msgid "Most recently &used projects" msgstr "最近使用的專案" -#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1077 -#: hugin1/hugin/xrc/preview_frame.xrc:1119 +#: hugin1/hugin/xrc/main_menu.xrc:197 hugin1/hugin/xrc/preview_frame.xrc:1100 +#: hugin1/hugin/xrc/preview_frame.xrc:1142 msgid "List of most recently used project files" msgstr "最近使用的專案檔的清單" #: hugin1/hugin/xrc/main_menu.xrc:201 hugin1/hugin/xrc/main_menu.xrc:231 -#: hugin1/hugin/xrc/preview_frame.xrc:1081 +#: hugin1/hugin/xrc/preview_frame.xrc:1104 msgid "&Run Batch Processor" msgstr "執行批次處理 (&R)" @@ -6148,7 +6361,7 @@ msgid "Show the OpenGL preview image" msgstr "顯示 OpenGL 預覽圖片" -#: hugin1/hugin/xrc/main_tool.xrc:66 hugin1/hugin/xrc/preview_frame.xrc:452 +#: hugin1/hugin/xrc/main_tool.xrc:66 msgid "Preview panorama" msgstr "預覽全景圖片" @@ -6205,15 +6418,10 @@ msgstr "從同樣鏡頭的影像中排除的區域" #: hugin1/hugin/xrc/mask_editor_panel.xrc:88 -#: hugin1/hugin/xrc/pref_dialog.xrc:715 +#: hugin1/hugin/xrc/pref_dialog.xrc:798 msgid "Export" msgstr "匯出" -#: hugin1/hugin/xrc/mask_editor_panel.xrc:95 -#: hugin1/hugin/xrc/pref_dialog.xrc:708 -msgid "Import" -msgstr "輸入" - #: hugin1/hugin/xrc/mask_editor_panel.xrc:103 msgid "Copy" msgstr "複製" @@ -6258,8 +6466,8 @@ #: hugin1/hugin/xrc/mask_editor_panel.xrc:222 msgid "" -"Applies all changes to all images with the same lens as the selected " -"image(s)." +"Applies all changes to all images with the same lens as the selected image" +"(s)." msgstr "" #: hugin1/hugin/xrc/mask_editor_panel.xrc:234 @@ -6364,7 +6572,8 @@ msgid "execute the PTOptimizer engine" msgstr "執行 PTOptimizer 引擎" -#: hugin1/hugin/xrc/optimize_panel.xrc:101 hugin1/hugin/xrc/reset_dialog.xrc:12 +#: hugin1/hugin/xrc/optimize_panel.xrc:101 +#: hugin1/hugin/xrc/reset_dialog.xrc:12 msgid "Image Orientation" msgstr "圖片方位" @@ -6409,39 +6618,39 @@ msgid "Interpolator (i):" msgstr "插補器 (i):" -#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1164 +#: hugin1/hugin/xrc/pano_panel.xrc:17 hugin1/hugin/xrc/pref_dialog.xrc:1247 msgid "Poly3 (Bicubic)" msgstr "Poly3 (Bicubic)" -#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1165 +#: hugin1/hugin/xrc/pano_panel.xrc:18 hugin1/hugin/xrc/pref_dialog.xrc:1248 msgid "Spline 16" msgstr "Spline 16" -#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1166 +#: hugin1/hugin/xrc/pano_panel.xrc:19 hugin1/hugin/xrc/pref_dialog.xrc:1249 msgid "Spline 36" msgstr "Spline 36" -#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1167 +#: hugin1/hugin/xrc/pano_panel.xrc:20 hugin1/hugin/xrc/pref_dialog.xrc:1250 msgid "Sinc 256" msgstr "Sinc 256" -#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1168 +#: hugin1/hugin/xrc/pano_panel.xrc:21 hugin1/hugin/xrc/pref_dialog.xrc:1251 msgid "Spline 64" msgstr "Spline 64" -#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1169 +#: hugin1/hugin/xrc/pano_panel.xrc:22 hugin1/hugin/xrc/pref_dialog.xrc:1252 msgid "Bilinear" msgstr "雙線性(Bilnear)" -#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1170 +#: hugin1/hugin/xrc/pano_panel.xrc:23 hugin1/hugin/xrc/pref_dialog.xrc:1253 msgid "Nearest neighbor" msgstr "最近相鄰" -#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1171 +#: hugin1/hugin/xrc/pano_panel.xrc:24 hugin1/hugin/xrc/pref_dialog.xrc:1254 msgid "Sinc 1024" msgstr "Sinc 1024" -#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1174 +#: hugin1/hugin/xrc/pano_panel.xrc:27 hugin1/hugin/xrc/pref_dialog.xrc:1257 msgid "approximation of values between source pixels" msgstr "源像素之間的逼近值" @@ -6469,7 +6678,7 @@ msgid "Enfuse options" msgstr "Enfuse 選項" -#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:524 +#: hugin1/hugin/xrc/pano_panel.xrc:198 hugin1/hugin/xrc/preview_frame.xrc:549 msgid "Field of View:" msgstr "視角" @@ -6612,10 +6821,6 @@ msgid "Image fusion:" msgstr "演算融合光圈軟體:" -#: hugin1/hugin/xrc/pano_panel.xrc:785 -msgid "enfuse" -msgstr "enfuse" - #: hugin1/hugin/xrc/pano_panel.xrc:803 msgid "HDR merger:" msgstr "HDR 合併器:" @@ -6716,16 +6921,16 @@ msgid "Output parameters" msgstr "輸出參數" -#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:843 +#: hugin1/hugin/xrc/pano_panel.xrc:1378 hugin1/hugin/xrc/pref_dialog.xrc:926 #, fuzzy msgid "Seam blend mode:" msgstr "混合模式:" -#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:851 +#: hugin1/hugin/xrc/pano_panel.xrc:1386 hugin1/hugin/xrc/pref_dialog.xrc:934 msgid "hard seam (faster)" msgstr "" -#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:852 +#: hugin1/hugin/xrc/pano_panel.xrc:1387 hugin1/hugin/xrc/pref_dialog.xrc:935 #, fuzzy msgid "blend seam" msgstr "Enblend 錯誤" @@ -6795,27 +7000,43 @@ msgid "This affects the control points editor and mask editor." msgstr "移除遮罩區域中的所有控制點" -#: hugin1/hugin/xrc/pref_dialog.xrc:171 +#: hugin1/hugin/xrc/pref_dialog.xrc:170 +#, fuzzy +msgid "dcraw executable:" +msgstr "Enblend 可執行:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:177 hugin1/hugin/xrc/pref_dialog.xrc:199 +#: hugin1/hugin/xrc/pref_dialog.xrc:221 hugin1/hugin/xrc/pref_dialog.xrc:274 +msgid "(leave empty for OS default)" +msgstr "(空白時設定為作業系統預設)" + +#: hugin1/hugin/xrc/pref_dialog.xrc:192 +#, fuzzy +msgid "RT-cli executable:" +msgstr "Enblend 可執行:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:214 +#, fuzzy +msgid "darktable-cli executable:" +msgstr "Enblend 可執行:" + +#: hugin1/hugin/xrc/pref_dialog.xrc:254 msgid "File Options" msgstr "檔案選項" -#: hugin1/hugin/xrc/pref_dialog.xrc:178 +#: hugin1/hugin/xrc/pref_dialog.xrc:261 msgid "Temporary dir:" msgstr "暫存目錄:" -#: hugin1/hugin/xrc/pref_dialog.xrc:191 -msgid "(leave empty for OS default)" -msgstr "(空白時設定為作業系統預設)" - -#: hugin1/hugin/xrc/pref_dialog.xrc:209 +#: hugin1/hugin/xrc/pref_dialog.xrc:292 msgid "Default project filename:" msgstr "預設專案檔名：" -#: hugin1/hugin/xrc/pref_dialog.xrc:227 +#: hugin1/hugin/xrc/pref_dialog.xrc:310 msgid "Default output prefix:" msgstr "指定引數" -#: hugin1/hugin/xrc/pref_dialog.xrc:246 +#: hugin1/hugin/xrc/pref_dialog.xrc:329 #, fuzzy, c-format msgid "" "The following placeholders are replaced automatically:\n" @@ -6846,43 +7067,43 @@ "%lens - 鏡頭 (第一個影像)\n" "%projectname - 專案檔名 (只針對輸出檔名)" -#: hugin1/hugin/xrc/pref_dialog.xrc:268 +#: hugin1/hugin/xrc/pref_dialog.xrc:351 msgid "Default filenames" msgstr "預設檔名：" -#: hugin1/hugin/xrc/pref_dialog.xrc:276 +#: hugin1/hugin/xrc/pref_dialog.xrc:359 msgid "Filenames" msgstr "檔案名稱" -#: hugin1/hugin/xrc/pref_dialog.xrc:285 +#: hugin1/hugin/xrc/pref_dialog.xrc:368 msgid "Image loading" msgstr "圖片載入中" -#: hugin1/hugin/xrc/pref_dialog.xrc:289 +#: hugin1/hugin/xrc/pref_dialog.xrc:372 msgid "Automatically align images after loading" msgstr "載入後自動對準圖片" -#: hugin1/hugin/xrc/pref_dialog.xrc:302 +#: hugin1/hugin/xrc/pref_dialog.xrc:385 msgid "Detect vertical lines" msgstr "偵測垂直線" -#: hugin1/hugin/xrc/pref_dialog.xrc:303 +#: hugin1/hugin/xrc/pref_dialog.xrc:386 msgid "Detects vertical lines in the images to level the pano" msgstr "偵測影像中的垂直線來校正環景水平" -#: hugin1/hugin/xrc/pref_dialog.xrc:310 +#: hugin1/hugin/xrc/pref_dialog.xrc:393 msgid "Remove cloud-like control points (Celeste)" msgstr "移除了 %d 個像雲的控制點" -#: hugin1/hugin/xrc/pref_dialog.xrc:322 +#: hugin1/hugin/xrc/pref_dialog.xrc:405 msgid "Optional assistant steps" msgstr "可選擇的接圖分析步驟" -#: hugin1/hugin/xrc/pref_dialog.xrc:330 +#: hugin1/hugin/xrc/pref_dialog.xrc:413 msgid "Auto align" msgstr "自動對準" -#: hugin1/hugin/xrc/pref_dialog.xrc:337 +#: hugin1/hugin/xrc/pref_dialog.xrc:420 msgid "" "Number of Control Points\n" "per overlap" @@ -6890,67 +7111,67 @@ "控制點號碼\n" "每重疊區域" -#: hugin1/hugin/xrc/pref_dialog.xrc:359 +#: hugin1/hugin/xrc/pref_dialog.xrc:442 msgid "Downscale final pano" msgstr "縮減最終全景圖片" -#: hugin1/hugin/xrc/pref_dialog.xrc:375 +#: hugin1/hugin/xrc/pref_dialog.xrc:458 msgid "percent of max. width" msgstr "百分之最大寬度" -#: hugin1/hugin/xrc/pref_dialog.xrc:393 +#: hugin1/hugin/xrc/pref_dialog.xrc:476 msgid "Control Points Editor" msgstr "控制點編輯器" -#: hugin1/hugin/xrc/pref_dialog.xrc:399 +#: hugin1/hugin/xrc/pref_dialog.xrc:482 msgid "HDR and 16 Bit display" msgstr "HDR 和 16 位顯示模式" -#: hugin1/hugin/xrc/pref_dialog.xrc:408 +#: hugin1/hugin/xrc/pref_dialog.xrc:491 msgid "Curve" msgstr "曲線" -#: hugin1/hugin/xrc/pref_dialog.xrc:416 +#: hugin1/hugin/xrc/pref_dialog.xrc:499 msgid "linear" msgstr "直線的" -#: hugin1/hugin/xrc/pref_dialog.xrc:417 +#: hugin1/hugin/xrc/pref_dialog.xrc:500 msgid "logarithmic" msgstr "對數的" -#: hugin1/hugin/xrc/pref_dialog.xrc:418 +#: hugin1/hugin/xrc/pref_dialog.xrc:501 msgid "gamma 2.2" msgstr "伽瑪 2.2" -#: hugin1/hugin/xrc/pref_dialog.xrc:426 +#: hugin1/hugin/xrc/pref_dialog.xrc:509 msgid "used for display in GUI" msgstr "用於圖形化使用者介面輸出" -#: hugin1/hugin/xrc/pref_dialog.xrc:447 +#: hugin1/hugin/xrc/pref_dialog.xrc:530 msgid "Patch width:" msgstr "局部圖片寬度:" -#: hugin1/hugin/xrc/pref_dialog.xrc:461 hugin1/hugin/xrc/pref_dialog.xrc:503 +#: hugin1/hugin/xrc/pref_dialog.xrc:544 hugin1/hugin/xrc/pref_dialog.xrc:586 msgid "pixels" msgstr "像素" -#: hugin1/hugin/xrc/pref_dialog.xrc:468 +#: hugin1/hugin/xrc/pref_dialog.xrc:551 msgid "Search area width:" msgstr "尋找區域寬度:" -#: hugin1/hugin/xrc/pref_dialog.xrc:482 +#: hugin1/hugin/xrc/pref_dialog.xrc:565 msgid "percent of image width" msgstr "百分之圖片寬度" -#: hugin1/hugin/xrc/pref_dialog.xrc:489 +#: hugin1/hugin/xrc/pref_dialog.xrc:572 msgid "Local search area width:" msgstr "局部尋找區域寬度:" -#: hugin1/hugin/xrc/pref_dialog.xrc:511 +#: hugin1/hugin/xrc/pref_dialog.xrc:594 msgid "Correlation Threshold:" msgstr "相關閥值:" -#: hugin1/hugin/xrc/pref_dialog.xrc:523 +#: hugin1/hugin/xrc/pref_dialog.xrc:606 msgid "" "0: no similarity\n" "1: maximum similarity" @@ -6958,11 +7179,11 @@ "0: 不相似\n" "1: 最大相似" -#: hugin1/hugin/xrc/pref_dialog.xrc:531 +#: hugin1/hugin/xrc/pref_dialog.xrc:614 msgid "Peak Curvature Threshold:" msgstr "峰值曲率閥值:" -#: hugin1/hugin/xrc/pref_dialog.xrc:543 +#: hugin1/hugin/xrc/pref_dialog.xrc:626 msgid "" "0: no peak\n" "0.2: distinctive peak" @@ -6970,118 +7191,114 @@ "0: 無峰值\n" " 0.2: 定義佳的峰值" -#: hugin1/hugin/xrc/pref_dialog.xrc:560 +#: hugin1/hugin/xrc/pref_dialog.xrc:643 msgid "Rotation search" msgstr "旋轉尋找" -#: hugin1/hugin/xrc/pref_dialog.xrc:564 +#: hugin1/hugin/xrc/pref_dialog.xrc:647 msgid "Enable rotation search (slower, but more accurate)" msgstr "啟用旋轉尋找 (較慢, 但更加準確)" -#: hugin1/hugin/xrc/pref_dialog.xrc:573 +#: hugin1/hugin/xrc/pref_dialog.xrc:656 msgid "Start angle:" msgstr "起始角:" -#: hugin1/hugin/xrc/pref_dialog.xrc:594 +#: hugin1/hugin/xrc/pref_dialog.xrc:677 msgid "Stop angle:" msgstr "終止角:" -#: hugin1/hugin/xrc/pref_dialog.xrc:613 +#: hugin1/hugin/xrc/pref_dialog.xrc:696 msgid "Steps:" msgstr "步驟:" -#: hugin1/hugin/xrc/pref_dialog.xrc:640 +#: hugin1/hugin/xrc/pref_dialog.xrc:723 msgid "Control Point Detectors" msgstr "控制點偵測器" -#: hugin1/hugin/xrc/pref_dialog.xrc:646 +#: hugin1/hugin/xrc/pref_dialog.xrc:729 msgid "Control Point Detector Programs" msgstr "控制點偵測器程式" -#: hugin1/hugin/xrc/pref_dialog.xrc:662 +#: hugin1/hugin/xrc/pref_dialog.xrc:745 msgid "New..." msgstr "新增..." -#: hugin1/hugin/xrc/pref_dialog.xrc:669 hugin1/hugin/xrc/pref_dialog.xrc:1009 -#: hugin1/hugin/xrc/pref_dialog.xrc:1068 +#: hugin1/hugin/xrc/pref_dialog.xrc:752 hugin1/hugin/xrc/pref_dialog.xrc:1092 +#: hugin1/hugin/xrc/pref_dialog.xrc:1151 msgid "Edit..." msgstr "編輯..." -#: hugin1/hugin/xrc/pref_dialog.xrc:683 +#: hugin1/hugin/xrc/pref_dialog.xrc:766 msgid "Move up" msgstr "向上移動" -#: hugin1/hugin/xrc/pref_dialog.xrc:690 +#: hugin1/hugin/xrc/pref_dialog.xrc:773 msgid "Move down" msgstr "向下移動" -#: hugin1/hugin/xrc/pref_dialog.xrc:697 +#: hugin1/hugin/xrc/pref_dialog.xrc:780 msgid "Set default" msgstr "系統預設" -#: hugin1/hugin/xrc/pref_dialog.xrc:728 +#: hugin1/hugin/xrc/pref_dialog.xrc:811 msgid "The assistant is using the default setting." msgstr "接圖分析正在使用預設設定." -#: hugin1/hugin/xrc/pref_dialog.xrc:750 +#: hugin1/hugin/xrc/pref_dialog.xrc:833 msgid "Output Format" msgstr "輸出格式" -#: hugin1/hugin/xrc/pref_dialog.xrc:757 +#: hugin1/hugin/xrc/pref_dialog.xrc:840 msgid "Default File Format:" msgstr "預設檔案格式：" -#: hugin1/hugin/xrc/pref_dialog.xrc:770 +#: hugin1/hugin/xrc/pref_dialog.xrc:853 msgid "default output format for final panorama" msgstr "預設的全景結果輸出格式" -#: hugin1/hugin/xrc/pref_dialog.xrc:777 +#: hugin1/hugin/xrc/pref_dialog.xrc:860 msgid "TIFF Compression:" msgstr "TIFF 壓縮:" -#: hugin1/hugin/xrc/pref_dialog.xrc:791 +#: hugin1/hugin/xrc/pref_dialog.xrc:874 msgid "default TIFF compression" msgstr "預設的TIFF壓縮器" -#: hugin1/hugin/xrc/pref_dialog.xrc:797 +#: hugin1/hugin/xrc/pref_dialog.xrc:880 msgid "JPEG Quality:" msgstr "JPEG 品質:" -#: hugin1/hugin/xrc/pref_dialog.xrc:808 +#: hugin1/hugin/xrc/pref_dialog.xrc:891 msgid "default JPEG compression setting" msgstr "預設的JPEG壓縮設定" -#: hugin1/hugin/xrc/pref_dialog.xrc:823 +#: hugin1/hugin/xrc/pref_dialog.xrc:906 #, fuzzy msgid "Blender" msgstr "融合軟體:" -#: hugin1/hugin/xrc/pref_dialog.xrc:829 +#: hugin1/hugin/xrc/pref_dialog.xrc:912 #, fuzzy msgid "Default blender:" msgstr "預設檔名：" -#: hugin1/hugin/xrc/pref_dialog.xrc:836 +#: hugin1/hugin/xrc/pref_dialog.xrc:919 msgid "Default blender which is used for new projects." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:868 +#: hugin1/hugin/xrc/pref_dialog.xrc:951 msgid "Processor" msgstr "處理器" -#: hugin1/hugin/xrc/pref_dialog.xrc:876 -msgid "Hugin&stitch&project" -msgstr "" - -#: hugin1/hugin/xrc/pref_dialog.xrc:879 +#: hugin1/hugin/xrc/pref_dialog.xrc:962 msgid "The engine that will run the stitch" msgstr "核心程式會執行接圖" -#: hugin1/hugin/xrc/pref_dialog.xrc:888 +#: hugin1/hugin/xrc/pref_dialog.xrc:971 msgid "Start stitching jobs immediately" msgstr "立刻開始接合工作" -#: hugin1/hugin/xrc/pref_dialog.xrc:889 +#: hugin1/hugin/xrc/pref_dialog.xrc:972 msgid "" "If selected, the processor will immediately resume processing the jobs " "queue. Otherwise the processor is started in suspended state and the user " @@ -7090,38 +7307,38 @@ "選取這個選項，批次處理會自動恢復序列的處理，不然批次處理會在暫停的狀態下開" "始，需要手動開始" -#: hugin1/hugin/xrc/pref_dialog.xrc:896 +#: hugin1/hugin/xrc/pref_dialog.xrc:979 msgid "Overwrite existing files" msgstr "覆蓋已經存在的檔案" -#: hugin1/hugin/xrc/pref_dialog.xrc:897 +#: hugin1/hugin/xrc/pref_dialog.xrc:980 msgid "WARNING: existing files will be silently overwritten." msgstr "警告： 已經存在的檔案可能會在沒有通知的情況下被覆蓋" -#: hugin1/hugin/xrc/pref_dialog.xrc:904 +#: hugin1/hugin/xrc/pref_dialog.xrc:987 msgid "Verbose Output" msgstr "完整的輸出" -#: hugin1/hugin/xrc/pref_dialog.xrc:905 +#: hugin1/hugin/xrc/pref_dialog.xrc:988 msgid "" "Enable to get the details, useful when reporting a bug or just to watch the " "project's progress." msgstr "啟用來記錄細節。在回報問題或單純監看專案運作時很有用" -#: hugin1/hugin/xrc/pref_dialog.xrc:927 +#: hugin1/hugin/xrc/pref_dialog.xrc:1010 msgid "Stitching" msgstr "正在接合中" -#: hugin1/hugin/xrc/pref_dialog.xrc:937 +#: hugin1/hugin/xrc/pref_dialog.xrc:1020 msgid "Copy metadata into final files using ExifTool" msgstr "將詮釋資料(metadata)用ExifTool複製到輸出的最後檔案" -#: hugin1/hugin/xrc/pref_dialog.xrc:942 +#: hugin1/hugin/xrc/pref_dialog.xrc:1025 #, fuzzy msgid "ExifTool options" msgstr "Enfuse 選項" -#: hugin1/hugin/xrc/pref_dialog.xrc:951 +#: hugin1/hugin/xrc/pref_dialog.xrc:1034 msgid "" "These argfiles are used to copy metadata from the image file to the final " "panorama.\n" @@ -7130,56 +7347,56 @@ "\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:971 +#: hugin1/hugin/xrc/pref_dialog.xrc:1054 msgid "" "The following argfile will be used to copy tags from the first image to all " "intermediate images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:987 +#: hugin1/hugin/xrc/pref_dialog.xrc:1070 #, fuzzy msgid "Intermediate ExifTool argfile:" msgstr "在左圖選取點" -#: hugin1/hugin/xrc/pref_dialog.xrc:993 hugin1/hugin/xrc/pref_dialog.xrc:1052 +#: hugin1/hugin/xrc/pref_dialog.xrc:1076 hugin1/hugin/xrc/pref_dialog.xrc:1135 #, fuzzy msgid "Leave empty for default" msgstr "(空白時設定為作業系統預設)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1010 hugin1/hugin/xrc/pref_dialog.xrc:1069 +#: hugin1/hugin/xrc/pref_dialog.xrc:1093 hugin1/hugin/xrc/pref_dialog.xrc:1152 #, fuzzy msgid "Edit selected ExifTool argfile" msgstr "在左圖選取點" -#: hugin1/hugin/xrc/pref_dialog.xrc:1029 +#: hugin1/hugin/xrc/pref_dialog.xrc:1112 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 "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1046 +#: hugin1/hugin/xrc/pref_dialog.xrc:1129 #, fuzzy msgid "Final ExifTool argfile:" msgstr "在左圖選取點" -#: hugin1/hugin/xrc/pref_dialog.xrc:1086 +#: hugin1/hugin/xrc/pref_dialog.xrc:1169 msgid "Create Photo Sphere XMP data" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1087 +#: hugin1/hugin/xrc/pref_dialog.xrc:1170 msgid "This will only be done for equirectangular output images." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1102 +#: hugin1/hugin/xrc/pref_dialog.xrc:1185 msgid "Advanced options" msgstr "進階選項" -#: hugin1/hugin/xrc/pref_dialog.xrc:1108 +#: hugin1/hugin/xrc/pref_dialog.xrc:1191 msgid "Number of threads:" msgstr "執行緒的數量：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1117 +#: hugin1/hugin/xrc/pref_dialog.xrc:1200 msgid "" "Nona and the OpenMP enabled enblend/enfuse can use multiple threads for " "processing.\n" @@ -7189,82 +7406,84 @@ "Nona 和 OpenMP 融合/曝光融合 支援多執行緒處理\n" "將這個數量最大設為您的系統中可用的處理器或者處理器核心" -#: hugin1/hugin/xrc/pref_dialog.xrc:1124 +#: hugin1/hugin/xrc/pref_dialog.xrc:1207 msgid "0 for automatic detection" msgstr "自動偵測請設定為0" -#: hugin1/hugin/xrc/pref_dialog.xrc:1140 +#: hugin1/hugin/xrc/pref_dialog.xrc:1223 #, fuzzy msgid "Stitching (2)" msgstr "正在接合中" -#: hugin1/hugin/xrc/pref_dialog.xrc:1156 +#: hugin1/hugin/xrc/pref_dialog.xrc:1239 msgid "Default Interpolator (i):" msgstr "預設內插器(i):" -#: hugin1/hugin/xrc/pref_dialog.xrc:1186 +#: hugin1/hugin/xrc/pref_dialog.xrc:1269 msgid "Create cropped images by default" msgstr "依預設產生裁剪後的圖片" -#: hugin1/hugin/xrc/pref_dialog.xrc:1193 -msgid "Use GPU for remapping (EXPERIMENTAL)" +#: hugin1/hugin/xrc/pref_dialog.xrc:1276 +#, fuzzy +msgid "Use GPU for remapping" msgstr "以圖形處理器執行重定位(實驗性的)" -#: hugin1/hugin/xrc/pref_dialog.xrc:1194 +#: hugin1/hugin/xrc/pref_dialog.xrc:1277 msgid "Use video card GPU to speed up remapping" msgstr "以顯示卡圖形處理器速重定位" -#: hugin1/hugin/xrc/pref_dialog.xrc:1217 +#: hugin1/hugin/xrc/pref_dialog.xrc:1300 msgid "Use alternative Enblend program" msgstr "使用可選 Enblend 應用程式" -#: hugin1/hugin/xrc/pref_dialog.xrc:1227 +#: hugin1/hugin/xrc/pref_dialog.xrc:1310 msgid "Enblend executable:" msgstr "Enblend 可執行:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1252 hugin1/hugin/xrc/pref_dialog.xrc:1331 +#: hugin1/hugin/xrc/pref_dialog.xrc:1335 hugin1/hugin/xrc/pref_dialog.xrc:1414 msgid "Default Arguments:" msgstr "預設引數:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1272 hugin1/hugin/xrc/pref_dialog.xrc:1351 +#: hugin1/hugin/xrc/pref_dialog.xrc:1355 hugin1/hugin/xrc/pref_dialog.xrc:1434 +#, fuzzy msgid "" "These are the default arguments for new projects.\n" "They can be changed for individual projects in the Stitcher tab.\n" -"Do not set -w, -o and --compression arguments, they are set by hugin" +"Do not set -w, -o and --compression arguments, they are set by hugin." msgstr "" "這些是新專案的預設引數，在[接合工具]標籤可以為個別專案調整\n" "請勿設定由 hugin 指定的 -w, -o 和 --compression 引數" -#: hugin1/hugin/xrc/pref_dialog.xrc:1282 +#: hugin1/hugin/xrc/pref_dialog.xrc:1365 msgid "Enblend" msgstr "Enblend" -#: hugin1/hugin/xrc/pref_dialog.xrc:1296 +#: hugin1/hugin/xrc/pref_dialog.xrc:1379 msgid "Use alternative Enfuse program" msgstr "使用可供選擇的 Enfuse 應用程式" -#: hugin1/hugin/xrc/pref_dialog.xrc:1306 +#: hugin1/hugin/xrc/pref_dialog.xrc:1389 msgid "Enfuse executable:" msgstr "Enfuse 可執行:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1361 +#: hugin1/hugin/xrc/pref_dialog.xrc:1444 msgid "Enfuse" msgstr "Enfuse" -#: hugin1/hugin/xrc/pref_dialog.xrc:1369 +#: hugin1/hugin/xrc/pref_dialog.xrc:1452 #, fuzzy msgid "Programs" msgstr "應用程式:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1377 +#: hugin1/hugin/xrc/pref_dialog.xrc:1460 msgid "Celeste parameters" msgstr "Celeste 參數" -#: hugin1/hugin/xrc/pref_dialog.xrc:1384 +#: hugin1/hugin/xrc/pref_dialog.xrc:1467 msgid "SVM threshold:" msgstr "SVM 閥值:" -#: hugin1/hugin/xrc/pref_dialog.xrc:1396 +#: hugin1/hugin/xrc/pref_dialog.xrc:1479 msgid "" "greater than 0.5: less sensitive\n" "less than 0.5: more sensitive" @@ -7272,19 +7491,19 @@ "大於 0.5: 較小靈敏度\n" "小於 0.5: 較大靈敏度" -#: hugin1/hugin/xrc/pref_dialog.xrc:1403 +#: hugin1/hugin/xrc/pref_dialog.xrc:1486 msgid "Gabor filter size" msgstr "Gabor 過濾尺寸" -#: hugin1/hugin/xrc/pref_dialog.xrc:1411 +#: hugin1/hugin/xrc/pref_dialog.xrc:1494 msgid "small" msgstr "小" -#: hugin1/hugin/xrc/pref_dialog.xrc:1412 +#: hugin1/hugin/xrc/pref_dialog.xrc:1495 msgid "large" msgstr "大" -#: hugin1/hugin/xrc/pref_dialog.xrc:1420 +#: hugin1/hugin/xrc/pref_dialog.xrc:1503 msgid "" "large is more accurate\n" "small can examine control points close to image border" @@ -7292,7 +7511,7 @@ "大的更精確\n" "小的能夠檢查靠近圖片邊界的控制點" -#: hugin1/hugin/xrc/pref_dialog.xrc:1438 +#: hugin1/hugin/xrc/pref_dialog.xrc:1521 msgid "" "The vignetting and exposure correction is determined by analysing color " "values in the overlapping areas.\n" @@ -7301,76 +7520,76 @@ "暗角校正和光圈校正是透過分析重疊區域的顏色值.\n" "為了提高運算速度，只使用了一個隨機點" -#: hugin1/hugin/xrc/pref_dialog.xrc:1447 +#: hugin1/hugin/xrc/pref_dialog.xrc:1530 msgid "Number of points per image: " msgstr "每張圖片的控制點數量：" -#: hugin1/hugin/xrc/pref_dialog.xrc:1462 +#: hugin1/hugin/xrc/pref_dialog.xrc:1545 msgid "Photometric optimizer" msgstr "光學性質最佳工具" -#: hugin1/hugin/xrc/pref_dialog.xrc:1470 +#: hugin1/hugin/xrc/pref_dialog.xrc:1553 #, fuzzy msgid "Warnings" msgstr "注意" -#: hugin1/hugin/xrc/pref_dialog.xrc:1474 +#: hugin1/hugin/xrc/pref_dialog.xrc:1557 msgid "Show message about saving project file and output prefix" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1481 +#: hugin1/hugin/xrc/pref_dialog.xrc:1564 msgid "Show warning about big exposure difference when adding images" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1494 +#: hugin1/hugin/xrc/pref_dialog.xrc:1577 msgid "After \"edit cp\" tool" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1502 +#: hugin1/hugin/xrc/pref_dialog.xrc:1585 msgid "Ask user" msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1503 +#: hugin1/hugin/xrc/pref_dialog.xrc:1586 #, fuzzy msgid "Re-optimize panorama" msgstr "全景圖片最佳化中" -#: hugin1/hugin/xrc/pref_dialog.xrc:1504 +#: hugin1/hugin/xrc/pref_dialog.xrc:1587 #, fuzzy msgid "Don't optimize panorama" msgstr "現在最佳化!" -#: hugin1/hugin/xrc/pref_dialog.xrc:1510 +#: hugin1/hugin/xrc/pref_dialog.xrc:1593 #, fuzzy msgid "Edit cp tool (on fast preview window)" msgstr "提示只在快速預覽視窗中顯示" -#: hugin1/hugin/xrc/pref_dialog.xrc:1518 +#: hugin1/hugin/xrc/pref_dialog.xrc:1601 msgid "Misc" msgstr "雜項" -#: hugin1/hugin/xrc/pref_dialog.xrc:1566 +#: hugin1/hugin/xrc/pref_dialog.xrc:1649 msgid "Preferences - hugin" msgstr "偏好設定 - hugin" -#: hugin1/hugin/xrc/pref_dialog.xrc:1574 +#: hugin1/hugin/xrc/pref_dialog.xrc:1657 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1607 hugin1/hugin/xrc/pref_dialog.xrc:1674 +#: hugin1/hugin/xrc/pref_dialog.xrc:1690 hugin1/hugin/xrc/pref_dialog.xrc:1757 #, fuzzy msgid "Edit ExifTool argfile" msgstr "在左圖選取點" -#: hugin1/hugin/xrc/pref_dialog.xrc:1617 +#: hugin1/hugin/xrc/pref_dialog.xrc:1700 msgid "" "This argfile is called with command line\n" "\"exiftool -overwrite_original -tagsfromfile image -E -@ argfile panorama\"." msgstr "" -#: hugin1/hugin/xrc/pref_dialog.xrc:1632 +#: hugin1/hugin/xrc/pref_dialog.xrc:1715 msgid "" "The following placeholders will be replaced before invoking ExifTool:\n" "%projection - projection name (in English)\n" @@ -7390,11 +7609,11 @@ "The placeholders are case sensitive." msgstr "" -#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:619 +#: hugin1/hugin/xrc/preview_frame.xrc:7 hugin1/hugin/xrc/preview_frame.xrc:644 msgid "Center the preview horizontally" msgstr "預覽圖片水平居中" -#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:8 hugin1/hugin/xrc/preview_frame.xrc:639 msgid "Center" msgstr "中心" @@ -7402,13 +7621,15 @@ msgid "Show the whole panorama" msgstr "顯示整幅全景圖" -#: hugin1/hugin/xrc/preview_frame.xrc:13 hugin1/hugin/xrc/preview_frame.xrc:514 -#: hugin1/hugin/xrc/preview_frame.xrc:631 +#: hugin1/hugin/xrc/preview_frame.xrc:13 +#: hugin1/hugin/xrc/preview_frame.xrc:539 +#: hugin1/hugin/xrc/preview_frame.xrc:656 msgid "Estimate field of view" msgstr "測量視角" -#: hugin1/hugin/xrc/preview_frame.xrc:14 hugin1/hugin/xrc/preview_frame.xrc:509 -#: hugin1/hugin/xrc/preview_frame.xrc:626 +#: hugin1/hugin/xrc/preview_frame.xrc:14 +#: hugin1/hugin/xrc/preview_frame.xrc:534 +#: hugin1/hugin/xrc/preview_frame.xrc:651 msgid "Fit" msgstr "調整" @@ -7416,7 +7637,8 @@ msgid "Automatically straighten a wavy horizon" msgstr "自動拉直波狀水平線" -#: hugin1/hugin/xrc/preview_frame.xrc:19 hugin1/hugin/xrc/preview_frame.xrc:638 +#: hugin1/hugin/xrc/preview_frame.xrc:19 +#: hugin1/hugin/xrc/preview_frame.xrc:663 msgid "Straighten" msgstr "拉直" @@ -7509,33 +7731,33 @@ "Sets the exposure value of the panorama to the mean exposure of all images." msgstr "將全景圖中的曝光值設定為全部圖片的曝光數平均值." -#: hugin1/hugin/xrc/preview_frame.xrc:399 +#: hugin1/hugin/xrc/preview_frame.xrc:425 msgid "Gray picker" msgstr "選擇灰階" -#: hugin1/hugin/xrc/preview_frame.xrc:400 +#: hugin1/hugin/xrc/preview_frame.xrc:426 msgid "Correct global white balance by selecting a neutral gray area." msgstr "藉由設定中性灰階區域來矯正全區白平衡" -#: hugin1/hugin/xrc/preview_frame.xrc:409 +#: hugin1/hugin/xrc/preview_frame.xrc:435 #, fuzzy msgid "Edit CP" msgstr "編輯 (&E)" -#: hugin1/hugin/xrc/preview_frame.xrc:410 +#: hugin1/hugin/xrc/preview_frame.xrc:436 #, fuzzy msgid "Create or delete control points in selected rectangle." msgstr "刪除控制點偵測器設定" -#: hugin1/hugin/xrc/preview_frame.xrc:432 +#: hugin1/hugin/xrc/preview_frame.xrc:458 msgid "Background:" msgstr "背景：" -#: hugin1/hugin/xrc/preview_frame.xrc:463 +#: hugin1/hugin/xrc/preview_frame.xrc:488 msgid "Scale:" msgstr "縮放:" -#: hugin1/hugin/xrc/preview_frame.xrc:490 +#: hugin1/hugin/xrc/preview_frame.xrc:515 msgid "" "* A gray line indicates there are no control points, but the image pair " "overlaps.\n" @@ -7546,159 +7768,147 @@ "* 綠、黃、宏分別代表好、中、差的對齊\n" "* 點下連線會在[控制點]標籤中開啟對應的影像" -#: hugin1/hugin/xrc/preview_frame.xrc:499 +#: hugin1/hugin/xrc/preview_frame.xrc:524 msgid "Layout" msgstr "版面" -#: hugin1/hugin/xrc/preview_frame.xrc:540 -msgid "×" -msgstr "×" - -#: hugin1/hugin/xrc/preview_frame.xrc:579 -#: hugin1/hugin/xrc/preview_frame.xrc:670 -#: hugin1/hugin/xrc/preview_frame.xrc:851 +#: hugin1/hugin/xrc/preview_frame.xrc:604 +#: hugin1/hugin/xrc/preview_frame.xrc:695 +#: hugin1/hugin/xrc/preview_frame.xrc:875 msgid "Guides:" msgstr "畫面導引線：" -#: hugin1/hugin/xrc/preview_frame.xrc:588 -#: hugin1/hugin/xrc/preview_frame.xrc:678 -#: hugin1/hugin/xrc/preview_frame.xrc:860 +#: hugin1/hugin/xrc/preview_frame.xrc:613 +#: hugin1/hugin/xrc/preview_frame.xrc:703 +#: hugin1/hugin/xrc/preview_frame.xrc:884 msgid "Rule of thirds" msgstr "三分線" -#: hugin1/hugin/xrc/preview_frame.xrc:589 -#: hugin1/hugin/xrc/preview_frame.xrc:679 -#: hugin1/hugin/xrc/preview_frame.xrc:861 +#: hugin1/hugin/xrc/preview_frame.xrc:614 +#: hugin1/hugin/xrc/preview_frame.xrc:704 +#: hugin1/hugin/xrc/preview_frame.xrc:885 msgid "Golden ratio" msgstr "黃金比例" -#: hugin1/hugin/xrc/preview_frame.xrc:590 -#: hugin1/hugin/xrc/preview_frame.xrc:680 -#: hugin1/hugin/xrc/preview_frame.xrc:862 +#: hugin1/hugin/xrc/preview_frame.xrc:615 +#: hugin1/hugin/xrc/preview_frame.xrc:705 +#: hugin1/hugin/xrc/preview_frame.xrc:886 msgid "Diagonal" msgstr "對角線" -#: hugin1/hugin/xrc/preview_frame.xrc:591 -#: hugin1/hugin/xrc/preview_frame.xrc:681 -#: hugin1/hugin/xrc/preview_frame.xrc:863 +#: hugin1/hugin/xrc/preview_frame.xrc:616 +#: hugin1/hugin/xrc/preview_frame.xrc:706 +#: hugin1/hugin/xrc/preview_frame.xrc:887 msgid "Diagonal method" msgstr "雙對角線" -#: hugin1/hugin/xrc/preview_frame.xrc:592 -#: hugin1/hugin/xrc/preview_frame.xrc:682 -#: hugin1/hugin/xrc/preview_frame.xrc:864 +#: hugin1/hugin/xrc/preview_frame.xrc:617 +#: hugin1/hugin/xrc/preview_frame.xrc:707 +#: hugin1/hugin/xrc/preview_frame.xrc:888 msgid "Golden triangle (down)" msgstr "黃金三角形 (朝下)" -#: hugin1/hugin/xrc/preview_frame.xrc:593 -#: hugin1/hugin/xrc/preview_frame.xrc:683 -#: hugin1/hugin/xrc/preview_frame.xrc:865 +#: hugin1/hugin/xrc/preview_frame.xrc:618 +#: hugin1/hugin/xrc/preview_frame.xrc:708 +#: hugin1/hugin/xrc/preview_frame.xrc:889 msgid "Golden triangle (up)" msgstr "黃金三角形 (朝上)" -#: hugin1/hugin/xrc/preview_frame.xrc:643 +#: hugin1/hugin/xrc/preview_frame.xrc:668 msgid "Automatically straighten a wavy horizon." msgstr "自動拉直波狀水平線." -#: hugin1/hugin/xrc/preview_frame.xrc:658 +#: hugin1/hugin/xrc/preview_frame.xrc:683 msgid "Drag mode:" msgstr "拖曳模式：" -#: hugin1/hugin/xrc/preview_frame.xrc:798 +#: hugin1/hugin/xrc/preview_frame.xrc:823 msgid "Apply" msgstr "執行" -#: hugin1/hugin/xrc/preview_frame.xrc:808 -msgid "Move the panorama or drag images into position" -msgstr "移動全景圖或是拖曳圖片到位置" - -#: hugin1/hugin/xrc/preview_frame.xrc:810 +#: hugin1/hugin/xrc/preview_frame.xrc:834 msgid "Move/Drag" msgstr "移動/拖曳" -#: hugin1/hugin/xrc/preview_frame.xrc:824 +#: hugin1/hugin/xrc/preview_frame.xrc:848 msgid "Set the crop region to the largest rectangle covered by images" msgstr "對圖片覆蓋的最大矩形設定裁剪區域" -#: hugin1/hugin/xrc/preview_frame.xrc:831 +#: hugin1/hugin/xrc/preview_frame.xrc:855 msgid "HDR Autocrop" msgstr "高動態範圍自動裁剪" -#: hugin1/hugin/xrc/preview_frame.xrc:836 +#: hugin1/hugin/xrc/preview_frame.xrc:860 msgid "Set the crop region to the largest rectangle covered by image stacks" msgstr "把裁切區域設定成影像堆棧能包含的的最大長方形" -#: hugin1/hugin/xrc/preview_frame.xrc:887 +#: hugin1/hugin/xrc/preview_frame.xrc:911 msgid "left:" msgstr "左:" -#: hugin1/hugin/xrc/preview_frame.xrc:901 +#: hugin1/hugin/xrc/preview_frame.xrc:925 msgid "top:" msgstr "上:" -#: hugin1/hugin/xrc/preview_frame.xrc:915 +#: hugin1/hugin/xrc/preview_frame.xrc:939 msgid "right:" msgstr "右:" -#: hugin1/hugin/xrc/preview_frame.xrc:929 +#: hugin1/hugin/xrc/preview_frame.xrc:953 msgid "bottom:" msgstr "下:" -#: hugin1/hugin/xrc/preview_frame.xrc:945 +#: hugin1/hugin/xrc/preview_frame.xrc:969 msgid "Reset crop to maximal possible area" msgstr "重設裁切邊藉以符合最大區域" -#: hugin1/hugin/xrc/preview_frame.xrc:955 -msgid "Change the panorama's cropping region" -msgstr "改變全景圖片裁剪區域" - -#: hugin1/hugin/xrc/preview_frame.xrc:988 +#: hugin1/hugin/xrc/preview_frame.xrc:1011 msgid "Panorama &editor" msgstr "環景 %編輯器" -#: hugin1/hugin/xrc/preview_frame.xrc:997 +#: hugin1/hugin/xrc/preview_frame.xrc:1020 msgid "&Overview" msgstr "&預覽" -#: hugin1/hugin/xrc/preview_frame.xrc:998 +#: hugin1/hugin/xrc/preview_frame.xrc:1021 msgid "Shows the overview of the panorama sphere." msgstr "顯示完整環景球總覽" -#: hugin1/hugin/xrc/preview_frame.xrc:1002 +#: hugin1/hugin/xrc/preview_frame.xrc:1025 #, fuzzy msgid "&Grid" msgstr "網格" -#: hugin1/hugin/xrc/preview_frame.xrc:1003 +#: hugin1/hugin/xrc/preview_frame.xrc:1026 msgid "Shows a grid." msgstr "顯示格線" -#: hugin1/hugin/xrc/preview_frame.xrc:1129 +#: hugin1/hugin/xrc/preview_frame.xrc:1152 #, fuzzy msgid "&All images" msgstr "增加影像" -#: hugin1/hugin/xrc/preview_frame.xrc:1134 +#: hugin1/hugin/xrc/preview_frame.xrc:1157 #, fuzzy msgid "Image with &median exposure of each stack" msgstr "連接堆棧圖中的圖片位置." -#: hugin1/hugin/xrc/preview_frame.xrc:1138 +#: hugin1/hugin/xrc/preview_frame.xrc:1161 #, fuzzy msgid "&Brightest image of each stack" msgstr "輸入每個堆棧的影像數量" -#: hugin1/hugin/xrc/preview_frame.xrc:1142 +#: hugin1/hugin/xrc/preview_frame.xrc:1165 #, fuzzy msgid "&Darkest image of each stack" msgstr "連接堆棧圖中的圖片位置." -#: hugin1/hugin/xrc/preview_frame.xrc:1147 +#: hugin1/hugin/xrc/preview_frame.xrc:1170 #, fuzzy msgid "&Keep currently selected images" msgstr "修改選取的圖片的鏡頭" -#: hugin1/hugin/xrc/preview_frame.xrc:1152 +#: hugin1/hugin/xrc/preview_frame.xrc:1175 #, fuzzy msgid "&Reset selection" msgstr "重設照片位置" @@ -7962,6 +8172,75 @@ "只有在圖片重疊程度很高並有很多分布良好的控制點時，\"對所有鏡頭變形參數最佳化" "\"的選項才有效果" +#, fuzzy +#~ msgid "(WB reference)" +#~ msgstr "偏好設定 (&P)" + +#, fuzzy +#~ msgid "Images" +#~ msgstr "圖片" + +#, fuzzy +#~ msgid "Add image(s)..." +#~ msgstr "新增影像..." + +#, fuzzy +#~ msgid "Add other images to list" +#~ msgstr "增加另外的圖片到目前專案中" + +#, fuzzy +#~ msgid "Remove image" +#~ msgstr "儲存影像" + +#, fuzzy +#~ msgid "Remove selected image from list" +#~ msgstr "移除選取的圖片" + +#, fuzzy +#~ msgid "Converter settings" +#~ msgstr "尖角偵測比例" + +#, fuzzy +#~ msgid "Import &raw file(s)..." +#~ msgstr "匯入專案(&I)..." + +#~ msgid "Move the panorama or drag images into position" +#~ msgstr "移動全景圖或是拖曳圖片到位置" + +#~ msgid "Change the panorama's cropping region" +#~ msgstr "改變全景圖片裁剪區域" + +#~ msgid "Use GPU for remapping (EXPERIMENTAL)" +#~ msgstr "以圖形處理器執行重定位(實驗性的)" + +#~ msgid "" +#~ "All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif," +#~ "*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files " +#~ "(*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*" +#~ msgstr "" +#~ "全部圖片檔案|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*." +#~ "PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*." +#~ "EXR|JPEG 檔案 (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF 檔案 (*.tif,*." +#~ "tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG 檔案 (*.png)|*.png;*.PNG|HDR 檔案 (*." +#~ "hdr)|*.hdr;*.HDR|EXR 檔案 (*.exr)|*.exr;*.EXR|全部檔案 (*)|*" + +#~ msgid "Autopano (by A. Jenny)" +#~ msgstr "Autopano (作者 A. Jenny)" + +#~ msgid "X:" +#~ msgstr "X:" + +#~ msgid "Y:" +#~ msgstr "Y:" + +#~ msgid "enfuse" +#~ msgstr "enfuse" + +#~ msgid "×" +#~ msgstr "×" + #~ msgid "Interface" #~ msgstr "操作介面" @@ -8902,9 +9181,6 @@ #~ msgid "Flatfield" #~ msgstr "平面" -#~ msgid "Image file:" -#~ msgstr "圖片檔案:" - #~ msgid "Polynomial" #~ msgstr "多項式" @@ -9138,9 +9414,6 @@ #~ msgid "* r^6" #~ msgstr "* r^6" -#~ msgid "&Import Project..." -#~ msgstr "匯入專案(&I)..." - #~ msgid "Nona" #~ msgstr "Nona" @@ -9236,9 +9509,6 @@ #~ "Autopano-SIFT not found. Please specify a valid path in the preferences" #~ msgstr "沒有發現 Autopano-SIFT. 請在偏好設定中指定一個有效目錄" -#~ msgid "\"%s\" not found. Please specify a valid path in the preferences" -#~ msgstr "[%s]未被發現. 請在偏好設定中指定一個有效路徑" - #~ msgid "Error in Autopano command" #~ msgstr "Autopano 指令錯誤" @@ -9326,9 +9596,6 @@ #~ msgid "PTStitcher note" #~ msgstr "PTStitcher 注釋" -#~ msgid "Select PTStitcher.exe" -#~ msgstr "選取 PTStitcher.exe" - #~ msgid "No PTStitcher.exe selected" #~ msgstr "未選取 PTStitcher.exe"