Merge branch 'dev' into release-5.5
This commit is contained in:
Morgan Hardwood
@@ -1,11 +1,11 @@
|
||||
if(APPLE)
|
||||
cmake_minimum_required(VERSION 3.3)
|
||||
CMAKE_POLICY(SET CMP0025 NEW)
|
||||
cmake_policy(SET CMP0025 NEW)
|
||||
else()
|
||||
cmake_minimum_required(VERSION 2.8.8)
|
||||
endif()
|
||||
|
||||
# Must stay before the PROJECT() command:
|
||||
# Must stay before the project() command:
|
||||
if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
|
||||
set(CMAKE_CXX_COMPILER_ARG1 "-std=c++11" CACHE STRING "C++ version for eclipse" FORCE)
|
||||
# Users building with Eclipse should set CMAKE_ECLIPSE_VERSION through the
|
||||
@@ -13,18 +13,18 @@ if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
|
||||
#set(CMAKE_ECLIPSE_VERSION "4.6.0" CACHE STRING "Eclipse version" FORCE)
|
||||
endif()
|
||||
|
||||
PROJECT(RawTherapee)
|
||||
project(RawTherapee)
|
||||
|
||||
# The default target is Debug:
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "")
|
||||
set (CMAKE_BUILD_TYPE Debug CACHE STRING "One of: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
|
||||
set(CMAKE_BUILD_TYPE Debug CACHE STRING "One of: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
|
||||
endif()
|
||||
|
||||
string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
|
||||
|
||||
# Set required C and C++ standards and check GCC version:
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
|
||||
message(FATAL_ERROR "Building RawTherapee requires using GCC version 4.9 or higher!")
|
||||
@@ -32,14 +32,14 @@ endif()
|
||||
|
||||
# We might want to build using the old C++ ABI, even when using a new GCC version:
|
||||
if(USE_OLD_CXX_ABI)
|
||||
add_definitions (-D_GLIBCXX_USE_CXX11_ABI=0)
|
||||
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
|
||||
endif()
|
||||
|
||||
if(UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
|
||||
add_definitions (-D_DEBUG)
|
||||
add_definitions(-D_DEBUG)
|
||||
else()
|
||||
add_definitions (-DNDEBUG)
|
||||
add_definitions (-D_DNDEBUG)
|
||||
add_definitions(-DNDEBUG)
|
||||
add_definitions(-D_DNDEBUG)
|
||||
endif()
|
||||
|
||||
message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
|
||||
@@ -141,7 +141,7 @@ if(WIN32 OR APPLE)
|
||||
if(BUILD_BUNDLE)
|
||||
message(STATUS "You have set BUILD_BUNDLE=ON but this is not necessary - the option is forced to ON for Windows and macOS.")
|
||||
endif()
|
||||
set (BUILD_BUNDLE ON FORCE)
|
||||
set(BUILD_BUNDLE ON FORCE)
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR)
|
||||
@@ -262,7 +262,7 @@ endif()
|
||||
if(NOT BUILD_BUNDLE)
|
||||
foreach(path BINDIR DATADIR LIBDIR DOCDIR CREDITSDIR LICENCEDIR)
|
||||
if(NOT (IS_ABSOLUTE "${${path}}"))
|
||||
message (FATAL_ERROR "The ${path} path has to be absolute when using -DBUILD_BUNDLE=OFF")
|
||||
message(FATAL_ERROR "The ${path} path has to be absolute when using -DBUILD_BUNDLE=OFF")
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
@@ -342,35 +342,35 @@ endif()
|
||||
|
||||
if(WITH_LTO)
|
||||
# Using LTO with older versions of binutils requires setting extra flags
|
||||
SET(BINUTILS_VERSION_MININUM "2.29")
|
||||
set(BINUTILS_VERSION_MININUM "2.29")
|
||||
execute_process(COMMAND ar --version OUTPUT_VARIABLE BINUTILS_VERSION_DETECTED)
|
||||
string(REGEX REPLACE ".* ([0-9.]+)\n.*" "\\1" BINUTILS_VERSION_DETECTED "${BINUTILS_VERSION_DETECTED}")
|
||||
if("${BINUTILS_VERSION_DETECTED}" VERSION_LESS "${BINUTILS_VERSION_MININUM}")
|
||||
if(APPLE)
|
||||
SET(CMAKE_AR "/opt/local/bin/ar")
|
||||
SET(CMAKE_RANLIB "/opt/local/bin/ranlib")
|
||||
set(CMAKE_AR "/opt/local/bin/ar")
|
||||
set(CMAKE_RANLIB "/opt/local/bin/ranlib")
|
||||
else()
|
||||
SET(CMAKE_AR "/usr/bin/gcc-ar")
|
||||
SET(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
|
||||
set(CMAKE_AR "/usr/bin/gcc-ar")
|
||||
set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
|
||||
endif()
|
||||
message(STATUS "Binutils version detected as less than " ${BINUTILS_VERSION_MININUM} " - setting CMake parameters to enable LTO linking:\n CMAKE_AR=\"" ${CMAKE_AR} "\"\n CMAKE_RANLIB=\"" ${CMAKE_RANLIB} "\"")
|
||||
endif()
|
||||
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
|
||||
endif()
|
||||
|
||||
if(WITH_SAN)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
endif()
|
||||
|
||||
if(WITH_PROF)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
|
||||
endif()
|
||||
|
||||
if(OPTION_OMP)
|
||||
|
||||
@@ -2,25 +2,25 @@
|
||||
|
||||
# If we find ReleaseInfo.cmake we use the info from there and don't need Git to be installed
|
||||
find_file(REL_INFO_FILE ReleaseInfo.cmake PATHS "${PROJECT_SOURCE_DIR}" NO_DEFAULT_PATH)
|
||||
if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
# we look for the git command in this paths by order of preference
|
||||
if (WIN32)
|
||||
if(WIN32)
|
||||
find_program(GIT_CMD git.exe HINTS ENV Path PATH_SUFFIXES ../)
|
||||
elseif (APPLE)
|
||||
elseif(APPLE)
|
||||
find_program(GIT_CMD git PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
|
||||
find_program(GIT_CMD git)
|
||||
set (SHELL "/bin/bash")
|
||||
else (WIN32) # Linux
|
||||
set(SHELL "/bin/bash")
|
||||
else(WIN32) # Linux
|
||||
find_program(GIT_CMD git)
|
||||
set (SHELL "/bin/bash")
|
||||
endif (WIN32)
|
||||
set(SHELL "/bin/bash")
|
||||
endif(WIN32)
|
||||
|
||||
# Fail if Git is not installed
|
||||
if (GIT_CMD STREQUAL GIT_CMD-NOTFOUND)
|
||||
if(GIT_CMD STREQUAL GIT_CMD-NOTFOUND)
|
||||
message(FATAL_ERROR "git command not found!")
|
||||
else ()
|
||||
else()
|
||||
message(STATUS "git command found: ${GIT_CMD}")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
# Get version description.
|
||||
# Depending on whether you checked out a branch (dev) or a tag (release),
|
||||
@@ -50,19 +50,19 @@ if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
execute_process(COMMAND ${GIT_CMD} rev-list --count HEAD --not --tags OUTPUT_VARIABLE GIT_COMMITS_SINCE_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}")
|
||||
|
||||
# If user checked-out something which is not a branch, use the description as branch name.
|
||||
if (GIT_BRANCH STREQUAL "")
|
||||
set (GIT_BRANCH "${GIT_DESCRIBE}")
|
||||
if(GIT_BRANCH STREQUAL "")
|
||||
set(GIT_BRANCH "${GIT_DESCRIBE}")
|
||||
endif()
|
||||
|
||||
# Create numeric version.
|
||||
# This version is nonsense, either don't use it at all or use it only where you have no other choice, e.g. Inno Setup's VersionInfoVersion.
|
||||
# Strip everything after hyphen, e.g. "5.0-gtk2" -> "5.0", "5.1-rc1" -> "5.1" (ergo BS).
|
||||
if (GIT_COMMITS_SINCE_TAG STREQUAL "")
|
||||
set (GIT_NUMERIC_VERSION_BS "0.0.0")
|
||||
else ()
|
||||
if(GIT_COMMITS_SINCE_TAG STREQUAL "")
|
||||
set(GIT_NUMERIC_VERSION_BS "0.0.0")
|
||||
else()
|
||||
string(REGEX REPLACE "-.*" "" GIT_NUMERIC_VERSION_BS ${GIT_DESCRIBE})
|
||||
set(GIT_NUMERIC_VERSION_BS "${GIT_NUMERIC_VERSION_BS}.${GIT_COMMITS_SINCE_TAG}")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
message(STATUS "Git checkout information:")
|
||||
message(STATUS " Commit description: ${GIT_DESCRIBE}")
|
||||
@@ -73,38 +73,38 @@ if (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
message(STATUS " Commits since branch: ${GIT_COMMITS_SINCE_BRANCH}")
|
||||
message(STATUS " Version (unreliable): ${GIT_NUMERIC_VERSION_BS}")
|
||||
|
||||
if (NOT DEFINED CACHE_NAME_SUFFIX)
|
||||
if(NOT DEFINED CACHE_NAME_SUFFIX)
|
||||
set(CACHE_NAME_SUFFIX "${GIT_DESCRIBE}")
|
||||
message(STATUS "CACHE_NAME_SUFFIX was not defined, it is now \"${CACHE_NAME_SUFFIX}\"")
|
||||
else ()
|
||||
else()
|
||||
message(STATUS "CACHE_NAME_SUFFIX is \"${CACHE_NAME_SUFFIX}\"")
|
||||
endif ()
|
||||
endif()
|
||||
|
||||
else (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
else(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
include("${PROJECT_SOURCE_DIR}/ReleaseInfo.cmake")
|
||||
endif (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
endif(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
|
||||
|
||||
if (WIN32)
|
||||
if (BIT_DEPTH EQUAL 4)
|
||||
if(WIN32)
|
||||
if(BIT_DEPTH EQUAL 4)
|
||||
set(BUILD_BIT_DEPTH 32)
|
||||
# 32 bits builds has to be installable on 64 bits system, to support WinXP/64.
|
||||
set(ARCHITECTURE_ALLOWED "x86 x64 ia64")
|
||||
# installing in 32 bits mode even on 64 bits OS and architecture
|
||||
set(INSTALL_MODE "")
|
||||
elseif (BIT_DEPTH EQUAL 8)
|
||||
elseif(BIT_DEPTH EQUAL 8)
|
||||
set(BUILD_BIT_DEPTH 64)
|
||||
# Restricting the 64 bits builds to 64 bits systems only
|
||||
set(ARCHITECTURE_ALLOWED "x64 ia64")
|
||||
# installing in 64 bits mode for all 64 bits processors, even for itanium architecture
|
||||
set(INSTALL_MODE "x64 ia64")
|
||||
endif (BIT_DEPTH EQUAL 4)
|
||||
endif(BIT_DEPTH EQUAL 4)
|
||||
# set part of the output archive name
|
||||
set(SYSTEM_NAME "WinVista")
|
||||
|
||||
configure_file ("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss")
|
||||
endif (WIN32)
|
||||
configure_file("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss")
|
||||
endif(WIN32)
|
||||
|
||||
# build version.h from template
|
||||
configure_file ("${PROJECT_SOURCE_DIR}/rtgui/version.h.in" "${CMAKE_BINARY_DIR}/rtgui/version.h")
|
||||
configure_file("${PROJECT_SOURCE_DIR}/rtgui/version.h.in" "${CMAKE_BINARY_DIR}/rtgui/version.h")
|
||||
# build AboutThisBuild.txt from template
|
||||
configure_file ("${PROJECT_SOURCE_DIR}/AboutThisBuild.txt.in" "${CMAKE_BINARY_DIR}/AboutThisBuild.txt")
|
||||
configure_file("${PROJECT_SOURCE_DIR}/AboutThisBuild.txt.in" "${CMAKE_BINARY_DIR}/AboutThisBuild.txt")
|
||||
|
||||
@@ -296,6 +296,7 @@ GENERAL_AUTO;Automatisch
|
||||
GENERAL_BEFORE;Vorher
|
||||
GENERAL_CANCEL;Abbrechen
|
||||
GENERAL_CLOSE;Schließen
|
||||
GENERAL_CURRENT;Aktuell
|
||||
GENERAL_DISABLE;Deaktivieren
|
||||
GENERAL_DISABLED;Deaktiviert
|
||||
GENERAL_ENABLE;Aktivieren
|
||||
@@ -2406,8 +2407,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen.\nTaste: <b>Alt</b> + <b>f</b>
|
||||
ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: <b>+</b>
|
||||
ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
|
||||
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
! Untranslated keys follow; remove the ! prefix after an entry is translated.
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
!GENERAL_CURRENT;Aktuell
|
||||
|
||||
@@ -221,6 +221,7 @@ GENERAL_AUTO;Automatique
|
||||
GENERAL_BEFORE;Avant
|
||||
GENERAL_CANCEL;Annuler
|
||||
GENERAL_CLOSE;Fermer
|
||||
GENERAL_CURRENT;Actuel
|
||||
GENERAL_DISABLE;Désactiver
|
||||
GENERAL_DISABLED;Désactivé
|
||||
GENERAL_ENABLE;Activer
|
||||
@@ -509,33 +510,33 @@ HISTORY_MSG_254;CpND - Teinte chair
|
||||
HISTORY_MSG_255;Réd. de bruit - Filtre médian
|
||||
HISTORY_MSG_256;Réd. de bruit - Médian - Type
|
||||
HISTORY_MSG_257;Virage Partiel
|
||||
HISTORY_MSG_258;Virage Partiel - Couleur
|
||||
HISTORY_MSG_259;Virage Partiel - Opacité
|
||||
HISTORY_MSG_260;Virage Partiel - Opacité 'a[b]'
|
||||
HISTORY_MSG_261;Virage Partiel - Méthode
|
||||
HISTORY_MSG_262;Virage Partiel - Opacité 'b'
|
||||
HISTORY_MSG_263;Virage Partiel - Ombres - Rouge
|
||||
HISTORY_MSG_264;Virage Partiel - Ombres - Vert
|
||||
HISTORY_MSG_265;Virage Partiel - Ombres - Bleu
|
||||
HISTORY_MSG_266;Virage Partiel - Moyen - Rouge
|
||||
HISTORY_MSG_267;Virage Partiel - Moyen - Vert
|
||||
HISTORY_MSG_268;Virage Partiel - Moyen - Bleu
|
||||
HISTORY_MSG_269;Virage Partiel - HL - Rouge
|
||||
HISTORY_MSG_270;Virage Partiel - HL - Vert
|
||||
HISTORY_MSG_271;Virage Partiel - HL - Bleu
|
||||
HISTORY_MSG_272;Virage Partiel - Balance
|
||||
HISTORY_MSG_273;Virage Partiel - Balance Couleur O/TM/HL
|
||||
HISTORY_MSG_274;Virage Partiel - Saturation des ombres
|
||||
HISTORY_MSG_275;Virage Partiel - Saturation des HL
|
||||
HISTORY_MSG_276;Virage Partiel - Opacité
|
||||
HISTORY_MSG_258;VP - Couleur
|
||||
HISTORY_MSG_259;VP - Opacité
|
||||
HISTORY_MSG_260;VP - Opacité 'a[b]'
|
||||
HISTORY_MSG_261;VP - Méthode
|
||||
HISTORY_MSG_262;VP - Opacité 'b'
|
||||
HISTORY_MSG_263;VP - Ombres - Rouge
|
||||
HISTORY_MSG_264;VP - Ombres - Vert
|
||||
HISTORY_MSG_265;VP - Ombres - Bleu
|
||||
HISTORY_MSG_266;VP - Moyen - Rouge
|
||||
HISTORY_MSG_267;VP - Moyen - Vert
|
||||
HISTORY_MSG_268;VP - Moyen - Bleu
|
||||
HISTORY_MSG_269;VP - HL - Rouge
|
||||
HISTORY_MSG_270;VP - HL - Vert
|
||||
HISTORY_MSG_271;VP - HL - Bleu
|
||||
HISTORY_MSG_272;VP - Balance
|
||||
HISTORY_MSG_273;VP - Balance Couleur O/TM/HL
|
||||
HISTORY_MSG_274;VP - Saturation des ombres
|
||||
HISTORY_MSG_275;VP - Saturation des HL
|
||||
HISTORY_MSG_276;VP - Opacité
|
||||
HISTORY_MSG_277;--inutilisé--
|
||||
HISTORY_MSG_278;Virage Partiel - Préserver luminance
|
||||
HISTORY_MSG_279;Virage partiel - Ombres
|
||||
HISTORY_MSG_280;Virage partiel - Hautes lumières
|
||||
HISTORY_MSG_281;Virage partiel - Protect. Saturé
|
||||
HISTORY_MSG_282;Virage partiel - Seuil de protection
|
||||
HISTORY_MSG_283;Virage partiel - Force
|
||||
HISTORY_MSG_284;Virage partiel - Protect. saturé auto
|
||||
HISTORY_MSG_278;VP - Préserver luminance
|
||||
HISTORY_MSG_279;VP - Ombres
|
||||
HISTORY_MSG_280;VP - Hautes lumières
|
||||
HISTORY_MSG_281;VP - Protect. Saturé
|
||||
HISTORY_MSG_282;VP - Seuil de protection
|
||||
HISTORY_MSG_283;VP - Force
|
||||
HISTORY_MSG_284;VP - Protect. saturé auto
|
||||
HISTORY_MSG_285;Réd. de bruit - Médiane - Méthode
|
||||
HISTORY_MSG_286;Réd. de bruit - Médiane - Type
|
||||
HISTORY_MSG_287;Réd. de bruit - Médiane - Itérations
|
||||
@@ -730,15 +731,20 @@ HISTORY_MSG_491;Balances des Blancs
|
||||
HISTORY_MSG_492;Courbes RVB
|
||||
HISTORY_MSG_493;Ajustements L*a*b*
|
||||
HISTORY_MSG_CLAMPOOG;Tronquer les couleurs hors gamut
|
||||
HISTORY_MSG_COLORTONING_LABGRID_VALUE;Virage Partiel - Correction couleur
|
||||
HISTORY_MSG_COLORTONING_LABREGION_AB;Virage Partiel - Correction couleur
|
||||
HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;Virage Partiel - Masque C
|
||||
HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;Virage Partiel - Masque T
|
||||
HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;Virage Partiel - Luminosité
|
||||
HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;Virage Partiel - Masque L
|
||||
HISTORY_MSG_COLORTONING_LABREGION_LIST;Virage Partiel - Liste
|
||||
HISTORY_MSG_COLORTONING_LABREGION_SATURATION;Virage Partiel - Saturation
|
||||
HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;Virage Partiel - Montrer le masque
|
||||
HISTORY_MSG_COLORTONING_LABGRID_VALUE;VP - Correction couleur
|
||||
HISTORY_MSG_COLORTONING_LABREGION_AB;VP - Correction couleur
|
||||
HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;VP - Canal
|
||||
HISTORY_MSG_COLORTONING_LABREGION_CHROMATICITYMASK;VP - Masque C
|
||||
HISTORY_MSG_COLORTONING_LABREGION_HUEMASK;VP - Masque T
|
||||
HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESS;VP - Luminosité
|
||||
HISTORY_MSG_COLORTONING_LABREGION_LIGHTNESSMASK;VP - Masque L
|
||||
HISTORY_MSG_COLORTONING_LABREGION_LIST;VP - Liste
|
||||
HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;VP - Masque flou local
|
||||
HISTORY_MSG_COLORTONING_LABREGION_OFFSET;VP - Offset local
|
||||
HISTORY_MSG_COLORTONING_LABREGION_POWER;VP - Puissance locale
|
||||
HISTORY_MSG_COLORTONING_LABREGION_SATURATION;VP - Saturation
|
||||
HISTORY_MSG_COLORTONING_LABREGION_SHOWMASK;VP - Montrer le masque
|
||||
HISTORY_MSG_COLORTONING_LABREGION_SLOPE;VP - Pente locale
|
||||
HISTORY_MSG_DEHAZE_DEPTH;EB - Profondeur
|
||||
HISTORY_MSG_DEHAZE_ENABLED;Élimination de la Brume
|
||||
HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP;EB - Montrer carte de profondeur
|
||||
@@ -1036,9 +1042,15 @@ PARTIALPASTE_VIGNETTING;Correction du vignettage
|
||||
PARTIALPASTE_WAVELETGROUP;Niveaux d'ondelette
|
||||
PARTIALPASTE_WHITEBALANCE;Balance des blancs
|
||||
PREFERENCES_ADD;Ajoute
|
||||
PREFERENCES_APPEARANCE;Apparence
|
||||
PREFERENCES_APPEARANCE_COLORPICKERFONT;Police des ancres de vérification couleur
|
||||
PREFERENCES_APPEARANCE_CROPMASKCOLOR;Couleur du masque de recadrage
|
||||
PREFERENCES_APPEARANCE_MAINFONT;Police principale
|
||||
PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Couleur du cadre dans le Navigateur
|
||||
PREFERENCES_APPEARANCE_THEME;Thème
|
||||
PREFERENCES_APPLNEXTSTARTUP;appliqué au prochain lancement
|
||||
PREFERENCES_AUTOMONPROFILE;Utiliser automatiquement le profil de l'écran principal
|
||||
PREFERENCES_AUTOSAVE_TP_OPEN;Sauvegarder l'état ouvert/fermé des outils en quittant
|
||||
PREFERENCES_BATCH_PROCESSING;Traitement par lot
|
||||
PREFERENCES_BEHADDALL;Tout à 'Ajoute'
|
||||
PREFERENCES_BEHADDALLHINT;Règle tous les paramètres sur le mode <b>Ajoute</b>.\nLa modification des paramètres dans le panneau d'édition en par lot sera des <b>deltas</b> par-rapport aux valeurs existantes
|
||||
@@ -1097,6 +1109,7 @@ PREFERENCES_EDITORCMDLINE;Ligne de commande personnelle
|
||||
PREFERENCES_EDITORLAYOUT;Disposition de l'éditeur
|
||||
PREFERENCES_EXTERNALEDITOR;Éditeur externe
|
||||
PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes
|
||||
PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre d'outil compact dans le Navigateur de Fichiers
|
||||
PREFERENCES_FILEFORMAT;Format du fichier
|
||||
PREFERENCES_FLATFIELDFOUND;Trouvé
|
||||
PREFERENCES_FLATFIELDSDIR;Dossier des images de Champ Uniforme
|
||||
@@ -1379,6 +1392,7 @@ TP_COARSETRAF_TOOLTIP_HFLIP;Symétriser / axe vertical
|
||||
TP_COARSETRAF_TOOLTIP_ROTLEFT;Rotation vers la gauche\nRaccourci: <b>[</b>\n\nRaccourci en mode Éditeur unique: <b>Alt-[</b>
|
||||
TP_COARSETRAF_TOOLTIP_ROTRIGHT;Rotation vers la droite\nRaccourci: <b>]</b>\n\nRaccourci en mode Éditeur unique: <b>Alt-]</b>
|
||||
TP_COARSETRAF_TOOLTIP_VFLIP;Symétriser / axe horizontal
|
||||
TP_COLORAPP_ABSOLUTELUMINANCE;Luminance absolue
|
||||
TP_COLORAPP_ALGO;Algorithme
|
||||
TP_COLORAPP_ALGO_ALL;Tout
|
||||
TP_COLORAPP_ALGO_JC;Luminosité + Chroma (JC)
|
||||
@@ -1389,6 +1403,7 @@ TP_COLORAPP_BADPIXSL;Filtrer les pixels chauds/morts
|
||||
TP_COLORAPP_BADPIXSL_TOOLTIP;Suppression des pixels chauds/morts (colorés de manière intense).\n0=Aucun effet 1=Médian 2=Gaussien.\n\nCes artefacts sont dus aux limitations de CIECAM02. Vous pouvez également adjuster l'image afin d'éviter les ombres très sombres.
|
||||
TP_COLORAPP_BRIGHT;Brillance (Q)
|
||||
TP_COLORAPP_BRIGHT_TOOLTIP;Brillance dans CIECAM02 est différent de Lab et RVB, prend en compte la luminosité du blanc
|
||||
TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;Lorsque réglé manuellement, les valeurs au-dessus de 65 sont recommandées.
|
||||
TP_COLORAPP_CHROMA;Chroma (C)
|
||||
TP_COLORAPP_CHROMA_M;Niveau de couleurs (M)
|
||||
TP_COLORAPP_CHROMA_M_TOOLTIP;Niveau de couleurs dans CIECAM02 est différent de Lab et RVB
|
||||
@@ -1419,6 +1434,7 @@ TP_COLORAPP_LABEL_SCENE;Conditions de la scène
|
||||
TP_COLORAPP_LABEL_VIEWING;Conditions de visionnage
|
||||
TP_COLORAPP_LIGHT;Luminosité (J)
|
||||
TP_COLORAPP_LIGHT_TOOLTIP;Luminosité dans CIECAM02 est différent de celui de Lab et RVB
|
||||
TP_COLORAPP_MEANLUMINANCE;Luminance moyenne (Yb%)
|
||||
TP_COLORAPP_MODEL;Modèle de Point Blanc
|
||||
TP_COLORAPP_MODEL_TOOLTIP;Modèle de Point Blanc\n\n<b>BB [RT] + [sortie]:</b>\nLa BB de RT est utilisée pour la scène, CIECAM est réglé sur D50, le blanc du périphérique de sortie utilise la valeur réglée dans Préférences\n\n<b>BB [RT+CAT02] + [sortie]:</b>\nLes réglages de BB de RT sont utilisés par CAT02 et le blanc du périphérique de sortie utilise la valeur réglée dans Préférences
|
||||
TP_COLORAPP_NEUTRAL;Résinitialiser
|
||||
@@ -1462,14 +1478,23 @@ TP_COLORTONING_LABGRID;Grille de correction L*a*b*
|
||||
TP_COLORTONING_LABGRID_VALUES;HL: a=%1 b=%2\nO: a=%3 b=%4
|
||||
TP_COLORTONING_LABREGIONS;Régions de correction L*a*b*
|
||||
TP_COLORTONING_LABREGION_ABVALUES;a=%1 b=%2
|
||||
TP_COLORTONING_LABREGION_CHANNEL;Canal
|
||||
TP_COLORTONING_LABREGION_CHANNEL_ALL;Tous
|
||||
TP_COLORTONING_LABREGION_CHANNEL_B;Bleu
|
||||
TP_COLORTONING_LABREGION_CHANNEL_G;Vert
|
||||
TP_COLORTONING_LABREGION_CHANNEL_R;Rouge
|
||||
TP_COLORTONING_LABREGION_CHROMATICITYMASK;C
|
||||
TP_COLORTONING_LABREGION_HUEMASK;T
|
||||
TP_COLORTONING_LABREGION_LIGHTNESS;Luminosité
|
||||
TP_COLORTONING_LABREGION_LIGHTNESSMASK;L
|
||||
TP_COLORTONING_LABREGION_LIST_TITLE;Correction
|
||||
TP_COLORTONING_LABREGION_MASK;Masque
|
||||
TP_COLORTONING_LABREGION_MASKBLUR;Masque Flou
|
||||
TP_COLORTONING_LABREGION_OFFSET;Décalage
|
||||
TP_COLORTONING_LABREGION_POWER;Puissance
|
||||
TP_COLORTONING_LABREGION_SATURATION;Saturation
|
||||
TP_COLORTONING_LABREGION_SHOWMASK;Montrer le masque
|
||||
TP_COLORTONING_LABREGION_SLOPE;Pente
|
||||
TP_COLORTONING_LUMA;Luminance
|
||||
TP_COLORTONING_LUMAMODE;Préserver la luminance
|
||||
TP_COLORTONING_LUMAMODE_TOOLTIP;Si activé, lorsque vous changez la couleur (rouge, vert, cyan, bleu, etc.), la luminance de chaque pixel est préservé
|
||||
@@ -1509,6 +1534,8 @@ TP_CROP_GUIDETYPE;Type de guide:
|
||||
TP_CROP_H;H
|
||||
TP_CROP_LABEL;Recadrage
|
||||
TP_CROP_PPI;PPI=
|
||||
TP_CROP_RESETCROP;Réinitialiser
|
||||
TP_CROP_SELECTCROP;Sélectionner
|
||||
TP_CROP_W;L
|
||||
TP_CROP_X;X
|
||||
TP_CROP_Y;Y
|
||||
@@ -1760,7 +1787,16 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Peut être utilisé avec le curseur Chromaticité et
|
||||
TP_LENSGEOM_AUTOCROP;Recadrage auto
|
||||
TP_LENSGEOM_FILL;Remplir
|
||||
TP_LENSGEOM_LABEL;Objectif / Géométrie
|
||||
TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatiquement
|
||||
TP_LENSPROFILE_CORRECTION_LCPFILE;Fichier LCP
|
||||
TP_LENSPROFILE_CORRECTION_MANUAL;Manuellement
|
||||
TP_LENSPROFILE_LABEL;Profil de correction d'objectif
|
||||
TP_LENSPROFILE_LENS_WARNING;Attention: le facteur de recadrage utilisé pour la caractérisation d'un objectif est plus grand que le facteur de recadrage de l'appareil photo, les résultats pourraient être faux.
|
||||
TP_LENSPROFILE_MODE_HEADER;Sélectionner le profil d'objectif:
|
||||
TP_LENSPROFILE_USE_CA;Aberration chromatique
|
||||
TP_LENSPROFILE_USE_GEOMETRIC;Géometrique
|
||||
TP_LENSPROFILE_USE_HEADER;Sélectionner les distortions à corriger:
|
||||
TP_LENSPROFILE_USE_VIGNETTING;Vignetage
|
||||
TP_LOCALCONTRAST_AMOUNT;Quantité
|
||||
TP_LOCALCONTRAST_DARKNESS;Niveau des ombres
|
||||
TP_LOCALCONTRAST_LABEL;Contraste Local
|
||||
@@ -1803,6 +1839,7 @@ TP_PRSHARPENING_LABEL;Netteté post-redimensionnement
|
||||
TP_PRSHARPENING_TOOLTIP;Augmente la netteté de l'image après le redimentionnement. Ne fonctionne que si la méthode de redimensionnement "Lanczos" est utilisé. Il est impossible de prévisualiser les effets de cet outil. Cf. RawPedia pour les instructions d'utilisation.
|
||||
TP_RAWCACORR_AUTO;Correction automatique
|
||||
TP_RAWCACORR_AUTOIT;Itérations
|
||||
TP_RAWCACORR_AUTOIT_TOOLTIP;Ce réglage est disponible si "Correction-auto" est activé.\nCorrection-auto est conservatif, signifiant qu'il ne corrige souvent pas toute l'aberration chromatique.\nPour corriger l'aberration restante, vous pouvez uttiliser jusqu'à cinq itérations de de la correction automatique de l'aberration chromatique.\nChaque itération réduira l'aberration restante de l'itération précédente avec un prix d'un temps de traitement plus long.
|
||||
TP_RAWCACORR_AVOIDCOLORSHIFT;Éviter les dérives couleurs
|
||||
TP_RAWCACORR_CABLUE;Bleu
|
||||
TP_RAWCACORR_CARED;Rouge
|
||||
@@ -1926,6 +1963,7 @@ TP_RESIZE_WIDTH;Largeur
|
||||
TP_RETINEX_CONTEDIT_HSL;Égaliseur d'histogramme TSV
|
||||
TP_RETINEX_CONTEDIT_LAB;Égaliseur d'histogramme L*a*b*
|
||||
TP_RETINEX_CONTEDIT_LH;Égaliseur de teinte
|
||||
TP_RETINEX_CONTEDIT_MAP;Égaliseur
|
||||
TP_RETINEX_CURVEEDITOR_CD;L=f(L)
|
||||
TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance en fonction de la luminance L=f(L)\nCorrige les données raw pour réduire halos et artéfacts.
|
||||
TP_RETINEX_CURVEEDITOR_LH;Force=f(T)
|
||||
@@ -1963,6 +2001,7 @@ TP_RETINEX_LABEL;Retinex
|
||||
TP_RETINEX_LABEL_MASK;Masque
|
||||
TP_RETINEX_LABSPACE;L*a*b*
|
||||
TP_RETINEX_LOW;Bas
|
||||
TP_RETINEX_MAP;Méthode
|
||||
TP_RETINEX_MAP_GAUS;Masque gaussien
|
||||
TP_RETINEX_MAP_MAPP;Masque pointu (ondelettes partielles)
|
||||
TP_RETINEX_MAP_MAPT;Masque pointu (ondelettes totales)
|
||||
@@ -2272,6 +2311,7 @@ TP_WBALANCE_LED_CRS;CRS SP12 WWMR16
|
||||
TP_WBALANCE_LED_HEADER;LED
|
||||
TP_WBALANCE_LED_LSI;LSI Lumelex 2040
|
||||
TP_WBALANCE_METHOD;Méthode
|
||||
TP_WBALANCE_PICKER;Sélectionner
|
||||
TP_WBALANCE_SHADE;Ombre
|
||||
TP_WBALANCE_SIZE;Taille:
|
||||
TP_WBALANCE_SOLUX35;Solux 3500K
|
||||
@@ -2294,47 +2334,3 @@ ZOOMPANEL_ZOOMFITSCREEN;Affiche l'image entière\nRaccourci: <b>Alt</b>-<b>f</b>
|
||||
ZOOMPANEL_ZOOMIN;Zoom Avant\nRaccourci: <b>+</b>
|
||||
ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
|
||||
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
! Untranslated keys follow; remove the ! prefix after an entry is translated.
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
!GENERAL_CURRENT;Current
|
||||
!HISTORY_MSG_COLORTONING_LABREGION_CHANNEL;CT - Channel
|
||||
!HISTORY_MSG_COLORTONING_LABREGION_MASKBLUR;CT - region mask blur
|
||||
!HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset
|
||||
!HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - region power
|
||||
!HISTORY_MSG_COLORTONING_LABREGION_SLOPE;CT - region slope
|
||||
!PREFERENCES_APPEARANCE;Appearance
|
||||
!PREFERENCES_APPEARANCE_COLORPICKERFONT;Color picker font
|
||||
!PREFERENCES_APPEARANCE_CROPMASKCOLOR;Crop mask color
|
||||
!PREFERENCES_APPEARANCE_MAINFONT;Main font
|
||||
!PREFERENCES_APPEARANCE_THEME;Theme
|
||||
!PREFERENCES_AUTOSAVE_TP_OPEN;Save tool collapsed/expanded state on exit
|
||||
!PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Compact toolbars in File Browser
|
||||
!TP_COLORAPP_ABSOLUTELUMINANCE;Absolute luminance
|
||||
!TP_COLORAPP_CAT02ADAPTATION_TOOLTIP;When setting manually, values above 65 are recommended.
|
||||
!TP_COLORAPP_MEANLUMINANCE;Mean luminance (Yb%)
|
||||
!TP_COLORTONING_LABREGION_CHANNEL;Channel
|
||||
!TP_COLORTONING_LABREGION_CHANNEL_ALL;All
|
||||
!TP_COLORTONING_LABREGION_CHANNEL_B;Blue
|
||||
!TP_COLORTONING_LABREGION_CHANNEL_G;Green
|
||||
!TP_COLORTONING_LABREGION_CHANNEL_R;Red
|
||||
!TP_COLORTONING_LABREGION_MASKBLUR;Mask Blur
|
||||
!TP_COLORTONING_LABREGION_OFFSET;Offset
|
||||
!TP_COLORTONING_LABREGION_POWER;Power
|
||||
!TP_COLORTONING_LABREGION_SLOPE;Slope
|
||||
!TP_CROP_RESETCROP;Reset
|
||||
!TP_CROP_SELECTCROP;Select
|
||||
!TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically
|
||||
!TP_LENSPROFILE_CORRECTION_LCPFILE;LCP file
|
||||
!TP_LENSPROFILE_CORRECTION_MANUAL;Manually
|
||||
!TP_LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
|
||||
!TP_LENSPROFILE_MODE_HEADER;Select the lens profile:
|
||||
!TP_LENSPROFILE_USE_CA;Chromatic aberration
|
||||
!TP_LENSPROFILE_USE_GEOMETRIC;Geometric
|
||||
!TP_LENSPROFILE_USE_HEADER;Select distortions to correct:
|
||||
!TP_LENSPROFILE_USE_VIGNETTING;Vignetting
|
||||
!TP_RAWCACORR_AUTOIT_TOOLTIP;This setting is available if "Auto-correction" is checked.\nAuto-correction is conservative, meaning that it often does not correct all chromatic aberration.\nTo correct the remaining chromatic aberration, you can use up to five iterations of automatic chromatic aberration correction.\nEach iteration will reduce the remaining chromatic aberration from the last iteration at the cost of additional processing time.
|
||||
!TP_RETINEX_CONTEDIT_MAP;Equalizer
|
||||
!TP_RETINEX_MAP;Method
|
||||
!TP_WBALANCE_PICKER;Pick
|
||||
|
||||
@@ -164,7 +164,7 @@ add_dependencies(rtengine UpdateInfo)
|
||||
|
||||
# It may be nice to store library version too
|
||||
if(BUILD_SHARED_LIBS)
|
||||
install (TARGETS rtengine DESTINATION ${LIBDIR})
|
||||
install(TARGETS rtengine DESTINATION ${LIBDIR})
|
||||
endif()
|
||||
|
||||
set_target_properties(rtengine PROPERTIES COMPILE_FLAGS "${RTENGINE_CXX_FLAGS}")
|
||||
|
||||
@@ -640,7 +640,7 @@ void ColorToning::read (const ProcParams* pp, const ParamsEdited* pedited)
|
||||
labgrid->setParams(pp->colorToning.labgridALow / ColorToningParams::LABGRID_CORR_MAX, pp->colorToning.labgridBLow / ColorToningParams::LABGRID_CORR_MAX, pp->colorToning.labgridAHigh / ColorToningParams::LABGRID_CORR_MAX, pp->colorToning.labgridBHigh / ColorToningParams::LABGRID_CORR_MAX, false);
|
||||
|
||||
if (pedited && !pedited->colorToning.method) {
|
||||
method->set_active (5);
|
||||
method->set_active (7);
|
||||
} else if (pp->colorToning.method == "Lab") {
|
||||
method->set_active (0);
|
||||
} else if (pp->colorToning.method == "RGBSliders") {
|
||||
|
||||
@@ -268,17 +268,17 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
|
||||
|
||||
mi = behModel->append ();
|
||||
mi->set_value (behavColumns.label, M ("TP_COLORAPP_LABEL"));
|
||||
appendBehavList (mi, M ("TP_COLORAPP_ADAPTSCENE"), ADDSET_CAT_ADAPTSCENE, true);
|
||||
appendBehavList (mi, M("TP_COLORAPP_LABEL_SCENE") + " - " + M("TP_COLORAPP_ABSOLUTELUMINANCE"), ADDSET_CAT_ADAPTSCENE, true);
|
||||
appendBehavList (mi, M("TP_COLORAPP_LABEL_VIEWING") + " - " + M("TP_COLORAPP_ABSOLUTELUMINANCE"), ADDSET_CAT_ADAPTVIEWING, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_LIGHT"), ADDSET_CAT_LIGHT, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_BRIGHT"), ADDSET_CAT_BRIGHT, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CHROMA"), ADDSET_CAT_CHROMA, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CHROMA_S"), ADDSET_CAT_CHROMA_S, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CHROMA_M"), ADDSET_CAT_CHROMA_M, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_RSTPRO"), ADDSET_CAT_RSTPRO, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CONTRAST"), ADDSET_CAT_CONTRAST, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CONTRAST_Q"), ADDSET_CAT_CONTRAST_Q, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CHROMA_S"), ADDSET_CAT_CHROMA_S, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_CHROMA_M"), ADDSET_CAT_CHROMA_M, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_HUE"), ADDSET_CAT_HUE, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_ADAPTVIEWING"), ADDSET_CAT_ADAPTVIEWING, true);
|
||||
appendBehavList (mi, M ("TP_COLORAPP_BADPIXSL"), ADDSET_CAT_BADPIX, true);
|
||||
|
||||
mi = behModel->append ();
|
||||
|
||||
@@ -24,7 +24,7 @@ set(PROC_TARGET_NUMBER 0 CACHE STRING "Target Processor")
|
||||
|
||||
# If you want to force the target processor name when PROC_TARGET_NUMBER = 0 or 2,
|
||||
# uncomment the next line and replace labelWithoutQuotes by its value
|
||||
#set (PROC_LABEL labelWithoutQuotes CACHE STRING "Target Processor label")
|
||||
#set(PROC_LABEL labelWithoutQuotes CACHE STRING "Target Processor label")
|
||||
|
||||
# Important: MinGW-w64 user may need to specify the -m32 or -m64 flag in CMAKE_CXX_FLAGS,
|
||||
# CMAKE_C_FLAGS and CMAKE_EXE_LINKER_FLAGS to select between 32/64bit build
|
||||
|
||||
Reference in New Issue
Block a user