merge with dev

This commit is contained in:
Desmis 2019-07-12 18:39:07 +02:00
commit a2bfcd7690
42 changed files with 870 additions and 857 deletions

View File

@ -84,8 +84,6 @@ FILEBROWSER_COPYPROFILE;Copia
FILEBROWSER_CURRENT_NAME;Nom actual:
FILEBROWSER_DARKFRAME;Marc fosc
FILEBROWSER_DELETEDIALOG_HEADER;Confirmació d'esborrar fitxer
FILEBROWSER_DELETEDIALOG_SELECTED;Segur que voleu esborrar els <b>%1</b> fitxers?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Segur que voleu suprimir els fitxers <b>%1</b> seleccionats <b>incloent</b> la versió processada a la cua?
FILEBROWSER_EMPTYTRASH;Buida paperera
FILEBROWSER_EXTPROGMENU;Obre amb
FILEBROWSER_FLATFIELD;Camp pla
@ -108,8 +106,6 @@ FILEBROWSER_POPUPPROCESS;Posa a la cua
FILEBROWSER_POPUPPROCESSFAST;Posa a la cua (export. ràpida)
FILEBROWSER_POPUPPROFILEOPERATIONS;Processant operacions de perfil
FILEBROWSER_POPUPRANK;Rang
FILEBROWSER_POPUPREMOVE;Esborra el fitxer
FILEBROWSER_POPUPREMOVEINCLPROC;Esborra amb sortida de la cua
FILEBROWSER_POPUPRENAME;Reanomena
FILEBROWSER_POPUPSELECTALL;Selec. tot
FILEBROWSER_POPUPTRASH;Llença a la paperera
@ -942,8 +938,10 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\n<b>Shift-Ctrl-0</b> No Color\n<b>Shift-Ctrl-1</b> Red\n<b>Shift-Ctrl-2</b> Yellow\n<b>Shift-Ctrl-3</b> Green\n<b>Shift-Ctrl-4</b> Blue\n<b>Shift-Ctrl-5</b> Purple
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPCOLORLABEL0;Label: None
!FILEBROWSER_POPUPCOLORLABEL1;Label: Red
!FILEBROWSER_POPUPCOLORLABEL2;Label: Yellow
@ -956,13 +954,15 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!FILEBROWSER_POPUPRANK3;Rank 3 ***
!FILEBROWSER_POPUPRANK4;Rank 4 ****
!FILEBROWSER_POPUPRANK5;Rank 5 *****
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>Shift-1</b>
!FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>Shift-2</b>
!FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>Shift-3</b>
!FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>Shift-4</b>
!FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>Shift-5</b>
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b>
!FILECHOOSER_FILTER_ANY;All files
@ -1703,7 +1703,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!TP_COLORAPP_SURROUND_DARK;Dark
!TP_COLORAPP_SURROUND_DIM;Dim
!TP_COLORAPP_SURROUND_EXDARK;Extremly Dark (Cutsheet)
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slighty dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slightly dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_TCMODE_BRIGHTNESS;Brightness
!TP_COLORAPP_TCMODE_CHROMA;Chroma
!TP_COLORAPP_TCMODE_COLORF;Colorfulness

View File

@ -96,8 +96,6 @@ FILEBROWSER_COPYPROFILE;复制配置
FILEBROWSER_CURRENT_NAME;当前名称:
FILEBROWSER_DARKFRAME;暗场
FILEBROWSER_DELETEDIALOG_HEADER;确认删除
FILEBROWSER_DELETEDIALOG_SELECTED;确定删除所选的%1个文件
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;你确认要删除选择的 <b>%1</b> 文件 <b>包括</b> 一个处理队列中的版本?
FILEBROWSER_EMPTYTRASH;清空垃圾箱
FILEBROWSER_EXTPROGMENU;调用程序...
FILEBROWSER_FLATFIELD;平场
@ -132,8 +130,6 @@ FILEBROWSER_POPUPRANK2;评 2 星
FILEBROWSER_POPUPRANK3;评 3 星
FILEBROWSER_POPUPRANK4;评 4 星
FILEBROWSER_POPUPRANK5;评 5 星
FILEBROWSER_POPUPREMOVE;从文件系统中移除
FILEBROWSER_POPUPREMOVEINCLPROC;删除序列输出
FILEBROWSER_POPUPRENAME;重命名
FILEBROWSER_POPUPSELECTALL;全部选中
FILEBROWSER_POPUPTRASH;移动到垃圾箱
@ -957,8 +953,12 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\n<b>Shift-Ctrl-0</b> No Color\n<b>Shift-Ctrl-1</b> Red\n<b>Shift-Ctrl-2</b> Yellow\n<b>Shift-Ctrl-3</b> Green\n<b>Shift-Ctrl-4</b> Blue\n<b>Shift-Ctrl-5</b> Purple
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box.
!FILEBROWSER_SHOWCOLORLABEL1HINT;Show images labeled Red.\nShortcut: <b>Alt-1</b>
!FILEBROWSER_SHOWCOLORLABEL2HINT;Show images labeled Yellow.\nShortcut: <b>Alt-2</b>
@ -967,7 +967,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b>
!FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
!FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b>
!FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: <b>Alt-0</b>
@ -1654,7 +1654,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!TP_COLORAPP_RSTPRO_TOOLTIP;Red &amp; skin-tones protection affects both sliders and curves.
!TP_COLORAPP_SURROUND;Surround
!TP_COLORAPP_SURROUND_EXDARK;Extremly Dark (Cutsheet)
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slighty dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slightly dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_TCMODE_CHROMA;Chroma
!TP_COLORAPP_TCMODE_COLORF;Colorfulness
!TP_COLORAPP_TCMODE_LABEL1;Curve mode 1

View File

@ -164,8 +164,6 @@ FILEBROWSER_COPYPROFILE;Kopírovat
FILEBROWSER_CURRENT_NAME;Současné jméno:
FILEBROWSER_DARKFRAME;Tmavý snímek
FILEBROWSER_DELETEDIALOG_HEADER;Potvrzení smazání souboru
FILEBROWSER_DELETEDIALOG_SELECTED;Jste si jisti, že chcete vymazat <b>%1</b> vybraných souborů?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Jste si jisti, že chcete vymazat <b>%1</b> vybraných souborů <b>včetně</b> výstupů dávkového zpracování?
FILEBROWSER_EMPTYTRASH;Vysypat koš
FILEBROWSER_EXTPROGMENU;Otevřít pomocí
FILEBROWSER_FLATFIELD;Flat Field
@ -200,8 +198,6 @@ FILEBROWSER_POPUPRANK2;Hodnocení 2 **
FILEBROWSER_POPUPRANK3;Hodnocení 3 ***
FILEBROWSER_POPUPRANK4;Hodnocení 4 ****
FILEBROWSER_POPUPRANK5;Hodnocení 5 *****
FILEBROWSER_POPUPREMOVE;Smazat
FILEBROWSER_POPUPREMOVEINCLPROC;Smazat včetně výstupů z fronty
FILEBROWSER_POPUPRENAME;Přejmenovat
FILEBROWSER_POPUPSELECTALL;Vybrat vše
FILEBROWSER_POPUPTRASH;Přesunout do koše
@ -228,7 +224,6 @@ FILEBROWSER_SHOWDIRHINT;Smazat všechny filtry.\nZkratka: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Ukázat upravené obrázky.\nZkratka: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Ukázat neupravené obrázky.\nZkratka: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Zobrazit Exif informace.\n\nZkratky:\n<b>i</b> - režim více karet editoru,\n<b>Alt-i</b> - režim jedné karty editoru.
FILEBROWSER_SHOWNOTTRASHHINT;Zobrazit pouze nesmazané obrázky.
FILEBROWSER_SHOWORIGINALHINT;Zobrazí pouze originální obrázky.\n\nPokud existuje několik obrázků se stejným názvem, ale rozdílnými příponami, bude jako originál vybrán ten, jehož přípona je nejvýše v seznamu přípon veVolby > Prohlížeč souborů > Analyzované přípony.
FILEBROWSER_SHOWRANK1HINT;Ukázat obrázky hodnocené jednou hvězdičkou.\nZkratka: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Ukázat obrázky hodnocené dvěma hvězdičkami.\nZkratka: <b>2</b>
@ -2321,6 +2316,11 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode

View File

@ -81,6 +81,7 @@
#80 25.03.2019 Erweiterung (TooWaBoo) RT 5.6
#81 15.04.2019 Erweiterung (TooWaBoo) RT 5.6
#82 25.05.2019 Erweiterung (TooWaBoo) RT 5.6
#83 06.07.2019 Erweiterung (TooWaBoo) RT 5.6
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@ -231,7 +232,7 @@ FILEBROWSER_POPUPMOVETO;Verschieben nach...
FILEBROWSER_POPUPOPEN;Öffnen
FILEBROWSER_POPUPOPENINEDITOR;Im Editor öffnen
FILEBROWSER_POPUPPROCESS;Zur Warteschlange hinzufügen
FILEBROWSER_POPUPPROCESSFAST;Zur Warteschlange hinzufügen (Schnelles Exportieren)
FILEBROWSER_POPUPPROCESSFAST;Zur Warteschlange hinzufügen\n(Schnell-Export)
FILEBROWSER_POPUPPROFILEOPERATIONS;Profiloperationen
FILEBROWSER_POPUPRANK;Bewertung
FILEBROWSER_POPUPRANK0;Nicht bewertet
@ -240,8 +241,6 @@ FILEBROWSER_POPUPRANK2;Bewertung 2 **
FILEBROWSER_POPUPRANK3;Bewertung 3 ***
FILEBROWSER_POPUPRANK4;Bewertung 4 ****
FILEBROWSER_POPUPRANK5;Bewertung 5 *****
FILEBROWSER_POPUPREMOVE;Löschen
FILEBROWSER_POPUPREMOVEINCLPROC;Löschen (auch Resultate der Stapelverarbeitung)
FILEBROWSER_POPUPRENAME;Umbenennen
FILEBROWSER_POPUPSELECTALL;Alle auswählen
FILEBROWSER_POPUPTRASH;In den Papierkorb verschieben
@ -268,7 +267,6 @@ FILEBROWSER_SHOWDIRHINT;Alle Filter zurücksetzen.\nTaste: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Nur bearbeitete Bilder anzeigen.\nTaste: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Nur unbearbeitete Bilder anzeigen.\nTaste: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Bildinformationen ein-/ausblenden.\n\nIm Multi-Reitermodus:\nTaste: <b>i</b>\nIm Ein-Reitermodus:\nTaste: <b>Alt</b> + <b>i</b>
FILEBROWSER_SHOWNOTTRASHHINT;Nur nicht gelöschte Bilder anzeigen.
FILEBROWSER_SHOWORIGINALHINT;Zeige nur das Originalbild.\n\nWenn mehrere Bilder mit dem gleichen Dateinamen und unterschiedlichen Dateitypen existieren, ist das Originalbild das Bild, welches in der Liste "Dateitypen anzeigen" unter Einstellungen > Dateiverwaltung als erstes gefunden wird.
FILEBROWSER_SHOWRANK1HINT;Nur mit 1 Stern bewertete Bilder anzeigen.\nTaste: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Nur mit 2 Sternen bewertete Bilder anzeigen.\nTaste: <b>2</b>
@ -987,7 +985,7 @@ MAIN_TAB_DETAIL;Details
MAIN_TAB_DETAIL_TOOLTIP;Taste: <b>Alt</b> + <b>d</b>
MAIN_TAB_DEVELOP; Batchbearbeitung
MAIN_TAB_EXIF;Exif
MAIN_TAB_EXPORT; Exportieren
MAIN_TAB_EXPORT; Schnell-Export
MAIN_TAB_EXPOSURE;Belichtung
MAIN_TAB_EXPOSURE_TOOLTIP;Taste: <b>Alt</b> + <b>e</b>
MAIN_TAB_FAVORITES;Favoriten
@ -2360,3 +2358,10 @@ 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.
!!!!!!!!!!!!!!!!!!!!!!!!!
FILEBROWSER_POPUPREMOVE;Unwiderruflich löschen
FILEBROWSER_POPUPREMOVEINCLPROC;Unwiderruflich löschen\n(einschl. aller Dateien der Stabelverarbeitung)
FILEBROWSER_SHOWNOTTRASHHINT;Nur Bilder außerhalb des Papierkorbs anzeigen.

View File

@ -68,7 +68,7 @@ TP_COLORAPP_CHROMA_M_TOOLTIP;Colourfulness in CIECAM02 differs from L*a*b* and R
TP_COLORAPP_CURVEEDITOR3;Colour curve
TP_COLORAPP_CURVEEDITOR3_TOOLTIP;Adjust either chroma, saturation or colourfulness.\n\nShows the histogram of chromaticity (L*a*b*) before CIECAM02.\nIf the "Show CIECAM02 output histograms in curves" checkbox is enabled, shows the histogram of C, s or M after CIECAM02.\n\nC, s and M are not shown in the main histogram panel.\nFor final output refer to the main histogram panel.
TP_COLORAPP_LABEL;CIE Colour Appearance Model 2002
TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colours to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slighty dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colours to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slightly dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
TP_COLORAPP_TCMODE_COLORF;Colourfulness
TP_COLORTONING_COLOR;Colour
TP_COLORTONING_LABEL;Colour Toning
@ -239,12 +239,12 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!FILEBROWSER_COPYPROFILE;Copy
!FILEBROWSER_CURRENT_NAME;Current name:
!FILEBROWSER_DARKFRAME;Dark-frame
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation:
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected <b>%1</b> files <b>including</b> a queue-processed version?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASH;Empty trash
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_EXTPROGMENU;Open with
!FILEBROWSER_FLATFIELD;Flat-Field
!FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory
@ -277,8 +277,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!FILEBROWSER_POPUPRANK3;Rank 3 ***
!FILEBROWSER_POPUPRANK4;Rank 4 ****
!FILEBROWSER_POPUPRANK5;Rank 5 *****
!FILEBROWSER_POPUPREMOVE;Delete
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete with output from queue
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_POPUPRENAME;Rename
!FILEBROWSER_POPUPSELECTALL;Select all
!FILEBROWSER_POPUPTRASH;Move to trash
@ -305,7 +305,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
!FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
!FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b>
!FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b>

View File

@ -122,12 +122,12 @@
!FILEBROWSER_COPYPROFILE;Copy
!FILEBROWSER_CURRENT_NAME;Current name:
!FILEBROWSER_DARKFRAME;Dark-frame
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation:
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected <b>%1</b> files <b>including</b> a queue-processed version?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASH;Empty trash
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_EXTPROGMENU;Open with
!FILEBROWSER_FLATFIELD;Flat-Field
!FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory
@ -161,8 +161,8 @@
!FILEBROWSER_POPUPRANK3;Rank 3 ***
!FILEBROWSER_POPUPRANK4;Rank 4 ****
!FILEBROWSER_POPUPRANK5;Rank 5 *****
!FILEBROWSER_POPUPREMOVE;Delete
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete with output from queue
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_POPUPRENAME;Rename
!FILEBROWSER_POPUPSELECTALL;Select all
!FILEBROWSER_POPUPTRASH;Move to trash
@ -189,7 +189,7 @@
!FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
!FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
!FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b>
!FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b>
@ -1430,7 +1430,7 @@
!TP_COLORAPP_SURROUND_DARK;Dark
!TP_COLORAPP_SURROUND_DIM;Dim
!TP_COLORAPP_SURROUND_EXDARK;Extremly Dark (Cutsheet)
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slighty dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slightly dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_TCMODE_BRIGHTNESS;Brightness
!TP_COLORAPP_TCMODE_CHROMA;Chroma
!TP_COLORAPP_TCMODE_COLORF;Colorfulness

View File

@ -180,8 +180,6 @@ FILEBROWSER_COPYPROFILE;Copiar perfil
FILEBROWSER_CURRENT_NAME;Nombre actual:
FILEBROWSER_DARKFRAME;Toma Negra
FILEBROWSER_DELETEDIALOG_HEADER;Confirmación de borrar archivos
FILEBROWSER_DELETEDIALOG_SELECTED;¿Seguro que quiere borrar los <b>%1</b> archivos seleccionados?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;¿Seguro que quiere borrar los <b>%1</b> archivos seleccionados <b>incluyendo</b> la versión procesada en la cola?
FILEBROWSER_EMPTYTRASH;Vaciar papelera
FILEBROWSER_EXTPROGMENU;Abrir con
FILEBROWSER_FLATFIELD;Campo plano
@ -216,8 +214,6 @@ FILEBROWSER_POPUPRANK2;Rango 2 **
FILEBROWSER_POPUPRANK3;Rango 3 ***
FILEBROWSER_POPUPRANK4;Rango 4 ****
FILEBROWSER_POPUPRANK5;Rango 5 *****
FILEBROWSER_POPUPREMOVE;Borrar
FILEBROWSER_POPUPREMOVEINCLPROC;Borrar con salida de la cola
FILEBROWSER_POPUPRENAME;Renombrar
FILEBROWSER_POPUPSELECTALL;Seleccionar todo
FILEBROWSER_POPUPTRASH;Mover a la papelera
@ -244,7 +240,6 @@ FILEBROWSER_SHOWDIRHINT;Quitar todos los filtros.\nTecla de Atajo: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostrar imágenes editadas.\nTecla de Atajo: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imágenes no editadas.\nTecla de Atajo: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Mostrar datos Exif.\nTecla de Atajo: <b>i</b>\n\nTecla de Atajo en modo editor simple: <b>Alt-I</b>
FILEBROWSER_SHOWNOTTRASHHINT;Mostrar solo las imágenes no borradas.
FILEBROWSER_SHOWORIGINALHINT;Muestre solo imágenes originales. \nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias> Explorador de archivos> Extensiones analizadas.
FILEBROWSER_SHOWRANK1HINT;Mostrar imágenes con 1 estrella.\nTecla de Atajo: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Mostrar imágenes con 2 estrellas.\nTecla de Atajo: <b>2</b>
@ -2319,8 +2314,13 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nTecla de Atajo: <b>-</b>
!CURVEEDITOR_CATMULLROM;Flexible
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!HISTORY_MSG_SHARPENING_BLUR;Sharpening - Blur radius
!MAIN_FRAME_PLACES_DEL;Remove
!MAIN_TAB_FAVORITES;Favorites

View File

@ -119,8 +119,6 @@ FILEBROWSER_COPYPROFILE;Copier le profil
FILEBROWSER_CURRENT_NAME;Nom courant:
FILEBROWSER_DARKFRAME;Trame Noire
FILEBROWSER_DELETEDIALOG_HEADER;Confirmation de la suppression de fichier
FILEBROWSER_DELETEDIALOG_SELECTED;Êtes-vous sûr de vouloir supprimer les %1 fichiers selectionnés?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Êtes-vous sûr de vouloir supprimer les %1 fichiers sélectionnés, INCLUANT une version déjà traitée?
FILEBROWSER_EMPTYTRASH;Vider la corbeille
FILEBROWSER_EXTPROGMENU;Ouvrir avec
FILEBROWSER_FLATFIELD;Champ Uniforme
@ -155,8 +153,6 @@ FILEBROWSER_POPUPRANK2;Rang 2 **
FILEBROWSER_POPUPRANK3;Rang 3 ***
FILEBROWSER_POPUPRANK4;Rang 4 ****
FILEBROWSER_POPUPRANK5;Rang 5 *****
FILEBROWSER_POPUPREMOVE;Retirer du système de fichier
FILEBROWSER_POPUPREMOVEINCLPROC;Supprimer (y compris les sorties de la file de traitement)
FILEBROWSER_POPUPRENAME;Renommer
FILEBROWSER_POPUPSELECTALL;Sélectionner tout
FILEBROWSER_POPUPTRASH;Déplacer dans la corbeille
@ -183,7 +179,6 @@ FILEBROWSER_SHOWDIRHINT;Voir toutes les images du dossier\nRaccourci: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Afficher les images éditées\nRaccourci: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Afficher les images non éditées\nRaccourci: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Montrer les infos EXIF.\nRaccourci: <b>i</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt-i</b>
FILEBROWSER_SHOWNOTTRASHHINT;Voir uniquement les images non supprimées
FILEBROWSER_SHOWORIGINALHINT;Voir seulement les images originales.\n\nQuand plusieurs images éxistent avec le même nom de fichier mais des extensions différentes, celle considéré originale est celle dont l'extention est au plus dans la liste des extensions dans Préférences > Navigateur de fichiers > Extensions considérées.
FILEBROWSER_SHOWRANK1HINT;Voir les images 1 étoile\nRaccourci: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Voir les images 2 étoiles\nRaccourci: <b>2</b>
@ -2264,8 +2259,13 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
!!!!!!!!!!!!!!!!!!!!!!!!!
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!MAIN_FRAME_PLACES_DEL;Remove
!PROGRESSBAR_DECODING;Decoding...
!PROGRESSBAR_GREENEQUIL;Green equilibration...

View File

@ -92,8 +92,6 @@ FILEBROWSER_COPYPROFILE;Copia
FILEBROWSER_CURRENT_NAME;Nome corrente:
FILEBROWSER_DARKFRAME;Dark Frame
FILEBROWSER_DELETEDIALOG_HEADER;Conferma eliminazione del file
FILEBROWSER_DELETEDIALOG_SELECTED;Vuoi eliminare i <b>%1</b> file selezionati?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Vuoi eliminare i <b>%1</b> file <b>inclusa</b> la versione sviluppata nella coda?
FILEBROWSER_EMPTYTRASH;Svuota cestino
FILEBROWSER_EXTPROGMENU;Apri con
FILEBROWSER_FLATFIELD;Flat Field
@ -128,8 +126,6 @@ FILEBROWSER_POPUPRANK2;Punteggio 2 **
FILEBROWSER_POPUPRANK3;Punteggio 3 ***
FILEBROWSER_POPUPRANK4;Punteggio 4 ****
FILEBROWSER_POPUPRANK5;Punteggio 5 *****
FILEBROWSER_POPUPREMOVE;Elimina
FILEBROWSER_POPUPREMOVEINCLPROC;Elimina insieme a quanto sviluppato nella coda
FILEBROWSER_POPUPRENAME;Rinomina
FILEBROWSER_POPUPSELECTALL;Seleziona tutto
FILEBROWSER_POPUPTRASH;Sposta nel cestino
@ -1270,10 +1266,14 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILECHOOSER_FILTER_ANY;All files
!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)

View File

@ -153,8 +153,6 @@ FILEBROWSER_COPYPROFILE;プロファイルをコピー
FILEBROWSER_CURRENT_NAME;現在の名前:
FILEBROWSER_DARKFRAME;ダークフレーム
FILEBROWSER_DELETEDIALOG_HEADER;ファイル削除確認
FILEBROWSER_DELETEDIALOG_SELECTED;選択済みのファイル <b>%1</b> を削除してもいいですか?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;バッチ処理に<b>組み込まれている</b>選択済みのファイル <b>%1</b> を削除してもいいですか?
FILEBROWSER_EMPTYTRASH;ゴミ箱を空にする
FILEBROWSER_EXTPROGMENU;..で開く
FILEBROWSER_FLATFIELD;フラットフィールド
@ -189,8 +187,6 @@ FILEBROWSER_POPUPRANK2;ランク 2 **
FILEBROWSER_POPUPRANK3;ランク 3 ***
FILEBROWSER_POPUPRANK4;ランク 4 ****
FILEBROWSER_POPUPRANK5;ランク 5 *****
FILEBROWSER_POPUPREMOVE;ファイルシステムから削除
FILEBROWSER_POPUPREMOVEINCLPROC;ファイルシステムとバッチの結果から削除
FILEBROWSER_POPUPRENAME;名前変更
FILEBROWSER_POPUPSELECTALL;全選択
FILEBROWSER_POPUPTRASH;ゴミ箱へ移動
@ -217,7 +213,6 @@ FILEBROWSER_SHOWDIRHINT;全ての絞り込みをクリア\nショートカット
FILEBROWSER_SHOWEDITEDHINT;編集済み画像を表示\nショートカット: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;未編集画像を表示\nショートカット: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;EXIF情報を表示\nショートカット: <b>i</b>\n\nシングル・エディタ・タブのショートカット: <b>Alt-i</b>
FILEBROWSER_SHOWNOTTRASHHINT;削除されていない画像だけ表示
FILEBROWSER_SHOWORIGINALHINT;元画像だけを表示\n\nファイル名は同じだが拡張子が異なる画像がある場合は、環境設定の中のファイルブラウザタブにある拡張子リストの上位に位置する拡張子を持った画像を元画像とする。
FILEBROWSER_SHOWRANK1HINT;1つ星ランクを表示\nショートカット: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;2つ星ランクを表示\nショートカット: <b>2</b>
@ -2310,7 +2305,12 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode
!QUEUE_LOCATION_TITLE;Output Location

View File

@ -82,8 +82,6 @@ FILEBROWSER_COPYPROFILE;Feldolgozási paraméterek másolása
FILEBROWSER_CURRENT_NAME;Aktuális név:
FILEBROWSER_DARKFRAME;Referencia feketekép (dark frame)
FILEBROWSER_DELETEDIALOG_HEADER;Állománytörlés megerősítése
FILEBROWSER_DELETEDIALOG_SELECTED;Biztosan törölni kívánja a kijelölt %1 képet?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Biztos vagy benne, hogy törölni szeredné a kiválasztott %1 állományt, beleértve a feldolgozási sorba helyezett változatát IS?
FILEBROWSER_EMPTYTRASH;Kuka ürítése
FILEBROWSER_FLATFIELD;Flat Field
FILEBROWSER_MOVETODARKFDIR;Mozgatás a 'dark frame' könyvtárba
@ -103,8 +101,6 @@ FILEBROWSER_POPUPOPENINEDITOR;Open in Szerkesztő
FILEBROWSER_POPUPPROCESS;Feldolgozási sorba helyezés
FILEBROWSER_POPUPPROCESSFAST;Feldolgozási sorba helyez (expressz export)
FILEBROWSER_POPUPPROFILEOPERATIONS;Profilműveletek
FILEBROWSER_POPUPREMOVE;Törlés (végleges)
FILEBROWSER_POPUPREMOVEINCLPROC;Törlés (feldolgozási sorból is)
FILEBROWSER_POPUPRENAME;Átnevezés
FILEBROWSER_POPUPSELECTALL;Mindent kijelöl
FILEBROWSER_POPUPTRASH;Kukába dobás
@ -870,8 +866,10 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\n<b>Shift-Ctrl-0</b> No Color\n<b>Shift-Ctrl-1</b> Red\n<b>Shift-Ctrl-2</b> Yellow\n<b>Shift-Ctrl-3</b> Green\n<b>Shift-Ctrl-4</b> Blue\n<b>Shift-Ctrl-5</b> Purple
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_EXTPROGMENU;Open with
!FILEBROWSER_OPENDEFAULTVIEWER;Windows default viewer (queue-processed)
!FILEBROWSER_POPUPCOLORLABEL0;Label: None
@ -887,13 +885,15 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!FILEBROWSER_POPUPRANK3;Rank 3 ***
!FILEBROWSER_POPUPRANK4;Rank 4 ****
!FILEBROWSER_POPUPRANK5;Rank 5 *****
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>Shift-1</b>
!FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>Shift-2</b>
!FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>Shift-3</b>
!FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>Shift-4</b>
!FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>Shift-5</b>
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b>
!FILECHOOSER_FILTER_ANY;All files
@ -1657,7 +1657,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!TP_COLORAPP_SURROUND_DARK;Dark
!TP_COLORAPP_SURROUND_DIM;Dim
!TP_COLORAPP_SURROUND_EXDARK;Extremly Dark (Cutsheet)
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slighty dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slightly dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_TCMODE_BRIGHTNESS;Brightness
!TP_COLORAPP_TCMODE_CHROMA;Chroma
!TP_COLORAPP_TCMODE_COLORF;Colorfulness

View File

@ -123,8 +123,6 @@ FILEBROWSER_COPYPROFILE;Kopieer profiel
FILEBROWSER_CURRENT_NAME;Huidige naam:
FILEBROWSER_DARKFRAME;Donkerframe
FILEBROWSER_DELETEDIALOG_HEADER;Bevestiging bestand verwijderen
FILEBROWSER_DELETEDIALOG_SELECTED;Weet u zeker dat u de geselecteerde %1 bestanden wilt verwijderen?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Weet u zeker dat u de %1 geselecteerde bestanden wilt verwijderen *inclusief* de versies van de verwerkingsrij?
FILEBROWSER_EMPTYTRASH;Leeg prullenbak
FILEBROWSER_EXTPROGMENU;Open met
FILEBROWSER_FLATFIELD;Vlakveld
@ -159,8 +157,6 @@ FILEBROWSER_POPUPRANK2;Waardering 2 **
FILEBROWSER_POPUPRANK3;Waardering 3 ***
FILEBROWSER_POPUPRANK4;Waardering 4 ****
FILEBROWSER_POPUPRANK5;Waardering 5 *****
FILEBROWSER_POPUPREMOVE;Verwijder van bestandssysteem
FILEBROWSER_POPUPREMOVEINCLPROC;Verwijder (met bestand in verwerkingsrij)
FILEBROWSER_POPUPRENAME;Hernoem
FILEBROWSER_POPUPSELECTALL;Alles selecteren
FILEBROWSER_POPUPTRASH;Verplaats naar prullenbak
@ -187,7 +183,6 @@ FILEBROWSER_SHOWDIRHINT;Verwijder alle filters.\nSneltoets: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Toon bewerkte foto's\nSneltoets: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Toon niet-bewerkte foto's\nSneltoets: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Toon EXIF-info
FILEBROWSER_SHOWNOTTRASHHINT;Toon alleen niet-verwijderde foto's.
FILEBROWSER_SHOWORIGINALHINT;Toon alleen originele afbeelding.\n\nAls er meerdere afbeeldingen zijn met dezelfde naam maar verschillende extensies, dan wordt de afbeelding waarvan de extensie het hoogst staat in de lijst met extensies in Voorkeuren > Bestandsnavigator > Extensies
FILEBROWSER_SHOWRANK1HINT;Toon foto's met 1 ster.\nSneltoets: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Toon foto's met 2 sterren.\nSneltoets: <b>2</b>
@ -1979,8 +1974,13 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!GENERAL_CURRENT;Current
!GENERAL_RESET;Reset
!GENERAL_SAVE_AS;Save as...

View File

@ -96,8 +96,6 @@ FILEBROWSER_COPYPROFILE;Kopiuj profil
FILEBROWSER_CURRENT_NAME;Obecna nazwa:
FILEBROWSER_DARKFRAME;Czarna klatka
FILEBROWSER_DELETEDIALOG_HEADER;Potwierdzenie usunięcia pliku
FILEBROWSER_DELETEDIALOG_SELECTED;Na pewno usunąć zaznaczone %1 plików?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Na pewno usunąć wybrany plik %1 WŁĄCZNIE z wersją utworzoną przez kolejkę przetwarzania?
FILEBROWSER_EMPTYTRASH;Wyczyść kosz
FILEBROWSER_EXTPROGMENU;Otwórz za pomocą
FILEBROWSER_FLATFIELD;Puste pole
@ -132,8 +130,6 @@ FILEBROWSER_POPUPRANK2;Ocena 2 **
FILEBROWSER_POPUPRANK3;Ocena 3 ***
FILEBROWSER_POPUPRANK4;Ocena 4 ****
FILEBROWSER_POPUPRANK5;Ocena 5 *****
FILEBROWSER_POPUPREMOVE;Usuń z dysku
FILEBROWSER_POPUPREMOVEINCLPROC;Usuń z dysku wraz z wynikiem przetwarzania
FILEBROWSER_POPUPRENAME;Zmień nazwę
FILEBROWSER_POPUPSELECTALL;Zaznacz wszystkie
FILEBROWSER_POPUPTRASH;Przenieś do kosza
@ -1392,10 +1388,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILECHOOSER_FILTER_ANY;All files
!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)

View File

@ -120,8 +120,6 @@ FILEBROWSER_COPYPROFILE;Copiar
FILEBROWSER_CURRENT_NAME;Nome atual:
FILEBROWSER_DARKFRAME;Fotograma escuro
FILEBROWSER_DELETEDIALOG_HEADER;Confirmação de eliminação de ficheiro
FILEBROWSER_DELETEDIALOG_SELECTED;Tem a certeza que quer eliminar os <b>%1</b> ficheiros selecionados?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Tem a certeza que quer eliminar os <b>%1</b> ficheiros selecionados <b>incluindo</b> uma versão processada na fila?
FILEBROWSER_EMPTYTRASH;Esvaziar o caixote do lixo
FILEBROWSER_EXTPROGMENU;Abrir com
FILEBROWSER_FLATFIELD;Campo plano
@ -156,8 +154,6 @@ FILEBROWSER_POPUPRANK2;Classificação 2 estrelas
FILEBROWSER_POPUPRANK3;Classificação 3 estrelas
FILEBROWSER_POPUPRANK4;Classificação 4 estrelas
FILEBROWSER_POPUPRANK5;Classificação 5 estrelas
FILEBROWSER_POPUPREMOVE;Eliminar
FILEBROWSER_POPUPREMOVEINCLPROC;Eliminar com saída da fila
FILEBROWSER_POPUPRENAME;Renomear
FILEBROWSER_POPUPSELECTALL;Selecionar tudo
FILEBROWSER_POPUPTRASH;Mover para o caixote do lixo
@ -184,7 +180,6 @@ FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de editor em várias abas,\n<b>Alt-i</b> - Modo de editor numa só aba.
FILEBROWSER_SHOWNOTTRASHHINT;Mostrar apenas imagens não eliminadas.
FILEBROWSER_SHOWORIGINALHINT;Mostrar apenas imagens originais.\n\nQuando existem várias imagens com o mesmo nome de ficheiro mas com extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de ficheiros > Extensões analisadas.
FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>2</b>
@ -2262,8 +2257,13 @@ ZOOMPANEL_ZOOMOUT;Afastar\nAtalho: <b>-</b>
!!!!!!!!!!!!!!!!!!!!!!!!!
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!MAIN_FRAME_PLACES_DEL;Remove
!PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode
!PROGRESSBAR_DECODING;Decoding...

View File

@ -120,8 +120,6 @@ FILEBROWSER_COPYPROFILE;Copiar perfil
FILEBROWSER_CURRENT_NAME;Nome atual:
FILEBROWSER_DARKFRAME;Quadro escuro
FILEBROWSER_DELETEDIALOG_HEADER;Confirmação de exclusão de arquivo
FILEBROWSER_DELETEDIALOG_SELECTED;Tens certeza de que desejas excluir os <b>%1</b> arquivos selecionados?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Tens certeza de que desejas excluir os <b>%1</b> arquivos selecionados <b>incluindo</b> uma versão processada em fila?
FILEBROWSER_EMPTYTRASH;Esvaziar lixeira
FILEBROWSER_EXTPROGMENU;Abrir com
FILEBROWSER_FLATFIELD;Flat-Field
@ -156,8 +154,6 @@ FILEBROWSER_POPUPRANK2;Classificação 2 **
FILEBROWSER_POPUPRANK3;Classificação 3 ***
FILEBROWSER_POPUPRANK4;Classificação 4 ****
FILEBROWSER_POPUPRANK5;Classificação 5 *****
FILEBROWSER_POPUPREMOVE;Excluir
FILEBROWSER_POPUPREMOVEINCLPROC;Excluir com saída da fila
FILEBROWSER_POPUPRENAME;Renomear
FILEBROWSER_POPUPSELECTALL;Selecionar tudo
FILEBROWSER_POPUPTRASH;Mover para a lixeira
@ -184,7 +180,6 @@ FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt-i</b> - Modo de Guia de Editor Único.
FILEBROWSER_SHOWNOTTRASHHINT;Mostre somente imagens não excluídas.
FILEBROWSER_SHOWORIGINALHINT;Mostre somente imagens originais.\n\nQuando existem várias imagens com o mesmo nome de arquivo, mas extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de Arquivos > Extensões Analisadas.
FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>2</b>
@ -2254,8 +2249,13 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: <b>-</b>
!!!!!!!!!!!!!!!!!!!!!!!!!
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!HISTORY_MSG_COLORTONING_LABREGION_OFFSET;CT - region offset
!HISTORY_MSG_COLORTONING_LABREGION_POWER;CT - region power
!MAIN_FRAME_PLACES_DEL;Remove

View File

@ -113,8 +113,6 @@ FILEBROWSER_COPYPROFILE;Скопировать профиль
FILEBROWSER_CURRENT_NAME;Текущее имя:
FILEBROWSER_DARKFRAME;Темновой кадр
FILEBROWSER_DELETEDIALOG_HEADER;Подтверждение удаления файла
FILEBROWSER_DELETEDIALOG_SELECTED;Вы уверены, что хотите удалить <b>%1</b> выбранный(ых) файл(ов)?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Вы уверены, что хотите удалить <b>%1</b> выделенных файлов, <b>включая</b> обработанные версии?
FILEBROWSER_EMPTYTRASH;Очистить корзину
FILEBROWSER_EXTPROGMENU;Открыть с помощью
FILEBROWSER_FLATFIELD;Плоское поле
@ -149,8 +147,6 @@ FILEBROWSER_POPUPRANK2;Рейтинг 2 **
FILEBROWSER_POPUPRANK3;Рейтинг 3 ***
FILEBROWSER_POPUPRANK4;Рейтинг 4 ****
FILEBROWSER_POPUPRANK5;Рейтинг 5 *****
FILEBROWSER_POPUPREMOVE;Удалить с диска
FILEBROWSER_POPUPREMOVEINCLPROC;Удалить с диска и пакетной обработки
FILEBROWSER_POPUPRENAME;Переименовать
FILEBROWSER_POPUPSELECTALL;Выбрать все
FILEBROWSER_POPUPTRASH;Удалить в корзину
@ -177,7 +173,6 @@ FILEBROWSER_SHOWDIRHINT;Сбросить все фильтры.\nГорячая
FILEBROWSER_SHOWEDITEDHINT;Показать измененные изображения.\nГорячая клавиша: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Показать не измененные изображения.\nГорячая клавиша: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Показать информацию EXIF.\nГорячая клавиша: <b>i</b>\n\nГорячая клавиша в режиме Одиночного редактора: <b>Alt-I</b>
FILEBROWSER_SHOWNOTTRASHHINT;Показать только неудалённые изображения.
FILEBROWSER_SHOWRANK1HINT;Показать изображения с рейтингом 1.\nГорячая клавиша: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Показать изображения с рейтингом 2.\nГорячая клавиша: <b>2</b>
FILEBROWSER_SHOWRANK3HINT;Показать изображения с рейтингом 3.\nГорячая клавиша: <b>3</b>
@ -1470,8 +1465,13 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILECHOOSER_FILTER_PP;Processing profiles
!FILECHOOSER_FILTER_SAME;Same format as current photo
@ -1872,7 +1872,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!TP_COLORAPP_SURROUND_DARK;Dark
!TP_COLORAPP_SURROUND_DIM;Dim
!TP_COLORAPP_SURROUND_EXDARK;Extremly Dark (Cutsheet)
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slighty dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_SURROUND_TOOLTIP;Changes tones and colors to take into account the viewing conditions of the output device.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment (TV). The image will become slightly dark.\n\n<b>Dark</b>: Dark environment (projector). The image will become more dark.\n\n<b>Extremly Dark</b>: Extremly dark environment (cutsheet). The image will become very dark.
!TP_COLORAPP_TCMODE_BRIGHTNESS;Brightness
!TP_COLORAPP_TCMODE_CHROMA;Chroma
!TP_COLORAPP_TCMODE_COLORF;Colorfulness

View File

@ -85,8 +85,6 @@ FILEBROWSER_COPYPROFILE;Умножи профил
FILEBROWSER_CURRENT_NAME;Тренутно име:
FILEBROWSER_DARKFRAME;Тамни кадар
FILEBROWSER_DELETEDIALOG_HEADER;Брисање датотеке
FILEBROWSER_DELETEDIALOG_SELECTED;Да ли сигурно желите да обришете %1 датотека?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Да ли желите да обришете %1 изабраних датотека, укључујући и оне које су заказане?
FILEBROWSER_EMPTYTRASH;Избаци смеће
FILEBROWSER_EXTPROGMENU;Отвори помоћу
FILEBROWSER_FLATFIELD;Равно поље
@ -108,8 +106,6 @@ FILEBROWSER_POPUPPROCESS;Закажи за обраду
FILEBROWSER_POPUPPROCESSFAST;Додај у заказано (брзи извоз)
FILEBROWSER_POPUPPROFILEOPERATIONS;Профил
FILEBROWSER_POPUPRANK;Оцена
FILEBROWSER_POPUPREMOVE;Уклони из система датотека
FILEBROWSER_POPUPREMOVEINCLPROC;Уклони из система датотека и заказаног
FILEBROWSER_POPUPRENAME;Преименуј
FILEBROWSER_POPUPSELECTALL;Изабери све
FILEBROWSER_POPUPTRASH;Премести у смеће
@ -1229,8 +1225,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPCOLORLABEL0;Label: None
!FILEBROWSER_POPUPCOLORLABEL1;Label: Red
!FILEBROWSER_POPUPCOLORLABEL2;Label: Yellow
@ -1244,8 +1242,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!FILEBROWSER_POPUPRANK3;Rank 3 ***
!FILEBROWSER_POPUPRANK4;Rank 4 ****
!FILEBROWSER_POPUPRANK5;Rank 5 *****
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILECHOOSER_FILTER_ANY;All files
!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)

View File

@ -94,8 +94,6 @@ FILEBROWSER_COPYPROFILE;Kopiera profil
FILEBROWSER_CURRENT_NAME;Nuvarande namn:
FILEBROWSER_DARKFRAME;Svartbild
FILEBROWSER_DELETEDIALOG_HEADER;Bekräftelse vid borttag
FILEBROWSER_DELETEDIALOG_SELECTED;Är du säker på att du vill ta bort de valda %1 filerna?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Är du säker på att du vill ta bort de valda filerna %1 OCH den behandlade versionen?
FILEBROWSER_EMPTYTRASH;Töm papperskorgen
FILEBROWSER_EXTPROGMENU;Öppna med
FILEBROWSER_FLATFIELD;Plattfält
@ -130,8 +128,6 @@ FILEBROWSER_POPUPRANK2;Betyg 2 **
FILEBROWSER_POPUPRANK3;Betyg 3 ***
FILEBROWSER_POPUPRANK4;Betyg 4 ****
FILEBROWSER_POPUPRANK5;Betyg 5 *****
FILEBROWSER_POPUPREMOVE;Ta bort från filsystemet
FILEBROWSER_POPUPREMOVEINCLPROC;Ta bort från filsystemet inkl. den behandlade
FILEBROWSER_POPUPRENAME;Byt namn
FILEBROWSER_POPUPSELECTALL;Markera allt
FILEBROWSER_POPUPTRASH;Flytta till papperskorgen
@ -157,7 +153,6 @@ FILEBROWSER_SHOWDIRHINT;Återställ alla sökfilter.\nKortkommando: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Visa redigerade bilder.\nKortkommando: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Visa ickeredigerade bilder.\nKortkommando: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Visa EXIF-information.\nKortkommando: <b>i</b>\n\nKortkommando i enkelbildsläget: <b>Alt-i</b>
FILEBROWSER_SHOWNOTTRASHHINT;Visa endast ej borttagna bilder.
FILEBROWSER_SHOWORIGINALHINT;Visa endast ursprungliga bilder.\n\nNär flera bilder finns med samma filnamn men med olika filändelser så anses den bild vara urpsrungsbilden som har sin ändelse närmst toppen i listan över filändelser i Inställningar > Filbläddrare > Hanterade filändelser
FILEBROWSER_SHOWRANK1HINT;Visa bilder med betyg 1.\nKortkommando: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Visa bilder med betyg 2.\nKortkommando: <b>2</b>
@ -1768,9 +1763,14 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
!FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
!FILEBROWSER_CACHECLEARFROMPARTIAL;Clear all except cached profiles
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
!FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
!FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
!FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
!FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
!FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
!FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!GENERAL_CURRENT;Current
!GENERAL_RESET;Reset
!GENERAL_SAVE_AS;Save as...

View File

@ -121,12 +121,12 @@ FILEBROWSER_COLORLABEL_TOOLTIP;Color label.\n\nUse dropdown menu or shortcuts:\n
FILEBROWSER_COPYPROFILE;Copy
FILEBROWSER_CURRENT_NAME;Current name:
FILEBROWSER_DARKFRAME;Dark-frame
FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to delete all <b>%1</b> files in trash?
FILEBROWSER_DELETEDIALOG_ALL;Are you sure you want to <b>permanently</b> delete all <b>%1</b> files in trash?
FILEBROWSER_DELETEDIALOG_HEADER;File delete confirmation:
FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to delete the selected <b>%1</b> files?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to delete the selected <b>%1</b> files <b>including</b> a queue-processed version?
FILEBROWSER_DELETEDIALOG_SELECTED;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files?
FILEBROWSER_DELETEDIALOG_SELECTEDINCLPROC;Are you sure you want to <b>permanently</b> delete the selected <b>%1</b> files, <b>including</b> a queue-processed version?
FILEBROWSER_EMPTYTRASH;Empty trash
FILEBROWSER_EMPTYTRASHHINT;Permanently delete all files in trash.
FILEBROWSER_EMPTYTRASHHINT;<b>Permanently</b> delete all files in trash.
FILEBROWSER_EXTPROGMENU;Open with
FILEBROWSER_FLATFIELD;Flat-Field
FILEBROWSER_MOVETODARKFDIR;Move to dark-frames directory
@ -160,8 +160,8 @@ FILEBROWSER_POPUPRANK2;Rank 2 **
FILEBROWSER_POPUPRANK3;Rank 3 ***
FILEBROWSER_POPUPRANK4;Rank 4 ****
FILEBROWSER_POPUPRANK5;Rank 5 *****
FILEBROWSER_POPUPREMOVE;Delete
FILEBROWSER_POPUPREMOVEINCLPROC;Delete with output from queue
FILEBROWSER_POPUPREMOVE;Delete permanently
FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
FILEBROWSER_POPUPRENAME;Rename
FILEBROWSER_POPUPSELECTALL;Select all
FILEBROWSER_POPUPTRASH;Move to trash
@ -188,7 +188,7 @@ FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b>

View File

@ -563,7 +563,7 @@ public:
}
}
// compress a LUT<uint32_t> with size y into a LUT<uint32_t> with size x (y>x) by using the passTrough LUT to calculate indexes
// compress a LUT<uint32_t> with size y into a LUT<uint32_t> with size x (y>x) by using the passThrough LUT to calculate indexes
template<typename U = T, typename = typename std::enable_if<std::is_same<U, std::uint32_t>::value>::type>
void compressTo(LUT<T> &dest, unsigned int numVals, const LUT<float> &passThrough) const
{

View File

@ -1672,6 +1672,11 @@ Camera constants:
"ranges": { "white": 4080 } // nominal 4095-4094, spread with some settings as long exposure
},
{ // Quality C, only raw crop for highres mode
"make_model": "OLYMPUS E-M1X",
"raw_crop": [ 0, 0, 10388, 0 ] // Highres mode largest valid, full 80Mp 10400X7792, works also for non highres mode because larger width will be ignored
},
{ // Quality B, crop correction
"make_model": [ "OLYMPUS E-M10", "OLYMPUS E-M10MarkII", "OLYMPUS E-M10 Mark III" ],
"dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
@ -2456,7 +2461,7 @@ Camera constants:
"raw_crop": [ 0, 0, -8, 0 ] // 8 rightmost columns are garbage
},
{ // Quality C
{ // Quality B
"make_model": [ "Sony DSC-R1" ],
"raw_crop": [ 0, 0, 3924, 2608 ],
"ranges": { "white": 16368 }

View File

@ -1509,8 +1509,8 @@ public:
static const float C9 = 8.f, C8 = 15.f, C7 = 12.f, C4 = 7.f, C3 = 5.f, C2 = 5.f, C1 = 5.f;
static const float H9 = 0.05f, H8 = 0.25f, H7 = 0.1f, H4 = 0.02f, H3 = 0.02f, H2 = 0.1f, H1 = 0.1f, H10 = -0.2f, H11 = -0.2f;
// "real" skin color : take into account a slightly usage of contrast and saturation in RT if option "skin" = 1, uses imolicit factor 1.0
// wide area skin color, useful if not accurate colorimetry or if the user has changed hue and saturation, uses explicit facor 0.6
// "real" skin color : take into account a slight usage of contrast and saturation in RT if option "skin" = 1, uses implicit factor 1.0
// wide area skin color, useful if not accurate colorimetry or if the user has changed hue and saturation, uses explicit factor 0.6
// wide area for transition, uses explicit factor 0.4
if (lum >= 85.0f) {
@ -1588,8 +1588,8 @@ public:
static const float C9 = 8.f, C8 = 15.f, C7 = 12.f, C4 = 7.f, C3 = 5.f, C2 = 5.f, C1 = 5.f;
static const float H9 = 0.05f, H8 = 0.25f, H7 = 0.1f, H4 = 0.02f, H3 = 0.02f, H2 = 0.1f, H1 = 0.1f, H10 = -0.2f, H11 = -0.2f;
// "real" skin color : take into account a slightly usage of contrast and saturation in RT if option "skin" = 1, uses imolicit factor 1.0
// wide area skin color, useful if not accurate colorimetry or if the user has changed hue and saturation, uses explicit facor 0.6
// "real" skin color : take into account a slight usage of contrast and saturation in RT if option "skin" = 1, uses implicit factor 1.0
// wide area skin color, useful if not accurate colorimetry or if the user has changed hue and saturation, uses explicit factor 0.6
// wide area for transition, uses explicit factor 0.4
if((b_l > -0.3f && b_r < 2.f) || basc == 0) { //range maxi skin
if (lum >= 85.0f) {
@ -1704,8 +1704,8 @@ public:
hue = HH;
// "real" skin color : take into account a slightly usage of contrast and saturation in RT if option "skin" = 1, uses imolicit factor 1.0
// wide area skin color, useful if not accurate colorimetry or if the user has changed hue and saturation, uses explicit facor 0.6
// "real" skin color : take into account a slight usage of contrast and saturation in RT if option "skin" = 1, uses implicit factor 1.0
// wide area skin color, useful if not accurate colorimetry or if the user has changed hue and saturation, uses explicit factor 0.6
// wide area for transition, uses explicit factor 0.4
if (lum >= 85.0f) {

View File

@ -1833,8 +1833,7 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
&& lastdot <= sname.size() - 4
&& !sname.casefold().compare(lastdot, 4, ".dcp")
) {
const Glib::ustring cam_short_name = sname.substr(0, lastdot).uppercase();
file_std_profiles[cam_short_name] = fname; // They will be loaded and cached on demand
file_std_profiles[sname.substr(0, lastdot).casefold_collate_key()] = fname; // They will be loaded and cached on demand
}
} else {
// Directory
@ -1845,11 +1844,10 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
for (const auto& alias : getAliases(rt_profile_dir)) {
const Glib::ustring alias_name = Glib::ustring(alias.first).uppercase();
const Glib::ustring real_name = Glib::ustring(alias.second).uppercase();
const std::map<Glib::ustring, Glib::ustring>::const_iterator real = file_std_profiles.find(real_name);
const std::map<std::string, Glib::ustring>::const_iterator real = file_std_profiles.find(Glib::ustring(alias.second).casefold_collate_key());
if (real != file_std_profiles.end()) {
file_std_profiles[alias_name] = real->second;
file_std_profiles[alias_name.casefold_collate_key()] = real->second;
}
}
}
@ -1871,19 +1869,19 @@ bool DCPStore::isValidDCPFileName(const Glib::ustring& filename) const
DCPProfile* DCPStore::getProfile(const Glib::ustring& filename) const
{
const auto key = filename.casefold_collate_key();
MyMutex::MyLock lock(mutex);
const std::map<std::string, DCPProfile*>::const_iterator iter = profile_cache.find(key);
const std::map<Glib::ustring, DCPProfile*>::iterator r = profile_cache.find(filename);
if (r != profile_cache.end()) {
return r->second;
if (iter != profile_cache.end()) {
return iter->second;
}
DCPProfile* const res = new DCPProfile(filename);
if (res->isValid()) {
// Add profile
profile_cache[filename] = res;
profile_cache[key] = res;
if (options.rtSettings.verbose) {
printf("DCP profile '%s' loaded from disk\n", filename.c_str());
}
@ -1896,13 +1894,9 @@ DCPProfile* DCPStore::getProfile(const Glib::ustring& filename) const
DCPProfile* DCPStore::getStdProfile(const Glib::ustring& requested_cam_short_name) const
{
const Glib::ustring name = requested_cam_short_name.uppercase();
// Warning: do NOT use map.find(), since it does not seem to work reliably here
for (const auto& file_std_profile : file_std_profiles) {
if (file_std_profile.first == name) {
return getProfile(file_std_profile.second);
}
const std::map<std::string, Glib::ustring>::const_iterator iter = file_std_profiles.find(requested_cam_short_name.casefold_collate_key());
if (iter != file_std_profiles.end()) {
return getProfile(iter->second);
}
// profile not found, looking if we're in loadAll=false mode

View File

@ -169,10 +169,10 @@ private:
std::vector<Glib::ustring> profileDir;
// these contain standard profiles from RT. keys are all in uppercase, file path is value
std::map<Glib::ustring, Glib::ustring> file_std_profiles;
std::map<std::string, Glib::ustring> file_std_profiles;
// Maps file name to profile as cache
mutable std::map<Glib::ustring, DCPProfile*> profile_cache;
mutable std::map<std::string, DCPProfile*> profile_cache;
};
}

View File

@ -833,7 +833,7 @@ void Crop::update(int todo)
DCPProfile *dcpProf = parent->imgsrc->getDCP(params.icm, as);
LUTu histToneCurve;
parent->ipf.rgbProc(workingCrop, laboCrop, this, parent->hltonecurve, parent->shtonecurve, parent->tonecurve,
parent->ipf.rgbProc (workingCrop, laboCrop, this, parent->hltonecurve, parent->shtonecurve, parent->tonecurve,
params.toneCurve.saturation, parent->rCurve, parent->gCurve, parent->bCurve, parent->colourToningSatLimit, parent->colourToningSatLimitOpacity, parent->ctColorCurve, parent->ctOpacityCurve, parent->opautili, parent->clToningcurve, parent->cl2Toningcurve,
parent->customToneCurve1, parent->customToneCurve2, parent->beforeToneCurveBW, parent->afterToneCurveBW, rrm, ggm, bbm,
parent->bwAutoR, parent->bwAutoG, parent->bwAutoB, dcpProf, as, histToneCurve);

View File

@ -235,7 +235,7 @@ void dfInfo::updateBadPixelList( RawImage *df )
df->data[row + 2][col - 2] + df->data[row + 2][col] + df->data[row + 2][col + 2]);
if( df->data[row][col] > m * threshold ) {
badPixelsThread.push_back( badPix(col, row) );
badPixelsThread.emplace_back(col, row);
}
}
@ -257,7 +257,7 @@ void dfInfo::updateBadPixelList( RawImage *df )
}
if( df->data[row][3 * col] > m[0]*threshold || df->data[row][3 * col + 1] > m[1]*threshold || df->data[row][3 * col + 2] > m[2]*threshold) {
badPixels.push_back( badPix(col, row) );
badPixels.emplace_back(col, row);
}
}
}
@ -566,12 +566,12 @@ int DFManager::scanBadPixelsFile( Glib::ustring filename )
if( numparms == 1 ) { // only one number in first line means, that this is the offset.
offset = x;
} else if(numparms == 2) {
bp.push_back( badPix(x + offset, y + offset) );
bp.emplace_back(x + offset, y + offset);
}
while( fgets(line, sizeof(line), file ) ) {
if( sscanf(line, "%d %d", &x, &y) == 2 ) {
bp.push_back( badPix(x + offset, y + offset) );
bp.emplace_back(x + offset, y + offset);
}
}
}
@ -592,7 +592,7 @@ std::vector<badPix> *DFManager::getBadPixels ( const std::string &mak, const std
bool found = false;
if( !serial.empty() ) {
// search with sreial number first
// search with serial number first
std::ostringstream s;
s << mak << " " << mod << " " << serial;
iter = bpList.find( s.str() );

View File

@ -16,10 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>
#include <glibmm/ustring.h>
#include <map>
#pragma once
#include <cmath>
#include <map>
#include <string>
#include <glibmm/ustring.h>
#include "pixelsmap.h"
#include "rawimage.h"

View File

@ -16,10 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>
#include <glibmm/ustring.h>
#include <map>
#pragma once
#include <cmath>
#include <map>
#include <string>
#include <glibmm/ustring.h>
#include "rawimage.h"
namespace rtengine

File diff suppressed because it is too large Load Diff

View File

@ -15,6 +15,7 @@
* with ICC profiles exceeding 64K bytes in size. See iccprofile.c
* for details.
*/
#pragma once
#include <cstdio> /* needed to define "FILE", "NULL" */
#include "jpeglib.h"

View File

@ -575,7 +575,11 @@ int ImageIO::loadJPEG (const Glib::ustring &fname)
my_jpeg_stdio_src (&cinfo, file);
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if ( __builtin_setjmp((reinterpret_cast<rt_jpeg_error_mgr*>(cinfo.src))->error_jmp_buf) == 0 ) {
#else
if ( setjmp((reinterpret_cast<rt_jpeg_error_mgr*>(cinfo.src))->error_jmp_buf) == 0 ) {
#endif
if (pl) {
pl->setProgressStr ("PROGRESSBAR_LOADJPEG");
pl->setProgress (0.0);

View File

@ -245,7 +245,11 @@ my_error_exit (j_common_ptr cinfo)
j_decompress_ptr dinfo = (j_decompress_ptr)cinfo;
// longjmp (((rt_jpeg_error_mgr*)(dinfo->src))->error_jmp_buf, 1);
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
__builtin_longjmp ((reinterpret_cast<rt_jpeg_error_mgr*>(dinfo->src)) ->error_jmp_buf, 1);
#else
longjmp ((reinterpret_cast<rt_jpeg_error_mgr*>(dinfo->src)) ->error_jmp_buf, 1);
#endif
}

View File

@ -18,9 +18,11 @@
*/
#include "pipettebuffer.h"
#include "../rtgui/editcallbacks.h"
#include "imagefloat.h"
#include "../rtgui/editcallbacks.h"
namespace rtengine
{

View File

@ -16,13 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _PIPETTEBUFFER_H_
#define _PIPETTEBUFFER_H_
#pragma once
#include "../rtgui/editbuffer.h"
#include "array2D.h"
#include "iimage.h"
#include "coord.h"
#include "iimage.h"
class EditDataProvider;
class EditSubscriber;
enum EditUniqueID : int;
namespace rtengine
{
@ -90,9 +93,7 @@ public:
bool bufferCreated();
// get the pipette values
void getPipetteData(int x, int y, const int squareSize);
void getPipetteData(int x, int y, int squareSize);
};
}
#endif

View File

@ -20,6 +20,7 @@
*/
#include <cstdint>
#include <cstring>
#include <vector>
#include "noncopyable.h"
@ -75,10 +76,10 @@ public:
}
// set pixels from a list
int set(const std::vector<badPix> &bp)
int set(const std::vector<badPix>& bp)
{
for (std::vector<badPix>::const_iterator iter = bp.begin(); iter != bp.end(); ++iter) {
set(iter->x, iter->y);
for (const auto& bad_pix : bp) {
set(bad_pix.x, bad_pix.y);
}
return bp.size();
@ -86,7 +87,7 @@ public:
void clear()
{
memset(pm, 0, h * w * base_t_size);
std::memset(pm, 0, h * w * base_t_size);
}
// return 0 if at least one pixel in the word(base_t) is set, otherwise return the number of pixels to skip to the next word base_t
int skipIfZero(int x, int y) const

View File

@ -195,8 +195,6 @@ public:
}
static void inverse33 (const double (*coeff)[3], double (*icoeff)[3]);
void boxblur2(float** src, float** dst, float** temp, int H, int W, int box );
void boxblur_resamp(float **src, float **dst, float** temp, int H, int W, int box, int samp );
void MSR(float** luminance, float **originalLuminance, float **exLuminance, LUTf & mapcurve, bool &mapcontlutili, int width, int height, const RetinexParams &deh, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax);
void HLRecovery_inpaint (float** red, float** green, float** blue) override;
static void HLRecovery_Luminance (float* rin, float* gin, float* bin, float* rout, float* gout, float* bout, int width, float maxval);

View File

@ -21,7 +21,7 @@
/// @brief List of pipette editing operation
enum EditUniqueID {
enum EditUniqueID : int {
EUID_None, /// special value (default)
EUID_ToneCurve1,

View File

@ -16,12 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "mydiagonalcurve.h"
#include "../rtengine/curves.h"
#include "editcallbacks.h"
#include <cstring>
#include <gdkmm/types.h>
#include "mydiagonalcurve.h"
#include "editcallbacks.h"
#include "../rtengine/curves.h"
MyDiagonalCurve::MyDiagonalCurve () :
MyCurve(),
closest_point(0),

View File

@ -16,12 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "myflatcurve.h"
#include "../rtengine/curves.h"
#include "editcallbacks.h"
#include <cstring>
#include <gdkmm/types.h>
#include "myflatcurve.h"
#include "editcallbacks.h"
#include "../rtengine/curves.h"
MyFlatCurve::MyFlatCurve () :
MyCurve(),
clampedX(0.0),

View File

@ -19,66 +19,110 @@
#include <iostream>
#include "options.h"
#include "rtsurface.h"
#include "options.h"
namespace
{
std::map<std::string, Cairo::RefPtr<Cairo::ImageSurface>> surfaceCache;
using SurfaceCache = std::map<std::string, Cairo::RefPtr<Cairo::ImageSurface>>;
SurfaceCache surfaceCache;
}
double RTSurface::dpiBack = 0.;
int RTSurface::scaleBack = 0;
RTSurface::RTSurface () : RTScalable()
RTSurface::RTSurface() :
surface(new Cairo::ImageSurface(nullptr, false))
{
Cairo::RefPtr<Cairo::ImageSurface> imgSurf(new Cairo::ImageSurface(nullptr, false));
surface = imgSurf;
}
RTSurface::RTSurface(const RTSurface& other) : RTScalable()
RTSurface::RTSurface(const Glib::ustring& fileName, const Glib::ustring& rtlFileName) :
RTSurface()
{
surface = other.surface;
setImage(fileName, rtlFileName);
}
RTSurface::RTSurface (Glib::ustring fileName, Glib::ustring rtlFileName) : RTScalable()
void RTSurface::setImage(const Glib::ustring& fileName, const Glib::ustring& rtlFileName)
{
Cairo::RefPtr<Cairo::ImageSurface> imgSurf(new Cairo::ImageSurface(nullptr, false));
surface = imgSurf;
setImage (fileName, rtlFileName);
}
void RTSurface::setImage (Glib::ustring fileName, Glib::ustring rtlFileName)
{
Glib::ustring imageName;
if (!rtlFileName.empty() && getDirection() == Gtk::TEXT_DIR_RTL) {
imageName = rtlFileName;
} else {
imageName = fileName;
}
const Glib::ustring& imageName =
!rtlFileName.empty() && getDirection() == Gtk::TEXT_DIR_RTL
? rtlFileName
: fileName;
changeImage (imageName);
}
void RTSurface::setDPInScale (const double newDPI, const int newScale)
int RTSurface::getWidth() const
{
if (getScale() != newScale || (getScale() == 1 && getDPI() != newDPI)) {
RTScalable::setDPInScale(newDPI, newScale);
return
surface
? surface->get_width()
: -1;
}
int RTSurface::getHeight() const
{
return
surface
? surface->get_height()
: -1;
}
bool RTSurface::hasSurface() const
{
return static_cast<bool>(surface);
}
Cairo::RefPtr<const Cairo::ImageSurface> RTSurface::get() const
{
return surface;
}
const Cairo::RefPtr<Cairo::ImageSurface>& RTSurface::get()
{
return surface;
}
void RTSurface::init()
{
dpiBack = getDPI();
scaleBack = getScale();
}
void RTSurface::updateImages()
{
const double tweakedDpi = getTweakedDPI();
for (auto& entry : surfaceCache) {
entry.second = loadImage(entry.first, tweakedDpi);
}
}
void RTSurface::setDPInScale(const double newDPI, const int newScale)
{
if (
getScale() != newScale
|| (
getScale() == 1
&& getDPI() != newDPI
)
) {
setDPInScale(newDPI, newScale);
dpiBack = getDPI();
scaleBack = getScale();
//printf("RTSurface::setDPInScale : New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTSurface\n", scaleBack, dpiBack, newDPI);
updateImages();
}
}
void RTSurface::changeImage (Glib::ustring imageName)
void RTSurface::changeImage(const Glib::ustring& imageName)
{
auto iterator = surfaceCache.find (imageName);
const SurfaceCache::const_iterator iterator = surfaceCache.find(imageName);
if (iterator == surfaceCache.end ()) {
if (iterator != surfaceCache.end()) {
surface = iterator->second;
} else {
surface = loadImage(imageName, getTweakedDPI());
// HOMBRE: As of now, GDK_SCALE is forced to 1, so setting the Cairo::ImageSurface scale is not required
@ -92,48 +136,10 @@ void RTSurface::changeImage (Glib::ustring imageName)
}
*/
iterator = surfaceCache.emplace (imageName, surface).first;
}
surface = iterator->second;
}
int RTSurface::getWidth() const
{
return surface ? surface->get_width() : -1;
}
int RTSurface::getHeight() const
{
return surface ? surface->get_height() : -1;
}
void RTSurface::init()
{
dpiBack = RTScalable::getDPI();
scaleBack = RTScalable::getScale();
}
void RTSurface::updateImages()
{
double res = getTweakedDPI();
for (auto entry : surfaceCache) {
entry.second = loadImage(entry.first, res);
//printf("RTSurface::updateImages : %s\n", entry.first.c_str());
surfaceCache.emplace(imageName, surface);
}
}
void RTSurface::from(Glib::RefPtr<RTSurface> other)
{
surface = other->surface;
}
double RTSurface::dpiBack = 0.;
bool RTSurface::hasSurface() const
{
return surface ? true : false;
}
const Cairo::RefPtr<Cairo::ImageSurface>& RTSurface::get() const
{
return surface;
}
int RTSurface::scaleBack = 0;

View File

@ -19,38 +19,36 @@
#pragma once
#include <gtkmm/image.h>
#include "rtscalable.h"
/**
* @brief A derived class of Gtk::Image in order to handle theme-related icon sets.
*/
class RTSurface : public RTScalable
class RTSurface :
public RTScalable
{
private:
static double dpiBack; // used to keep track of master dpi change
static int scaleBack; // used to keep track of master scale change
Cairo::RefPtr<Cairo::ImageSurface> surface;
void changeImage (Glib::ustring imageName);
public:
RTSurface();
RTSurface(const Glib::ustring& fileName, const Glib::ustring& rtlFileName = {});
RTSurface ();
RTSurface (const RTSurface& other);
RTSurface (Glib::ustring fileName, Glib::ustring rtlFileName = Glib::ustring());
void setImage(const Glib::ustring& fileName, const Glib::ustring& rtlFileName = {});
void setImage (Glib::ustring fileName, Glib::ustring rtlFileName = Glib::ustring());
int getWidth() const;
int getHeight() const;
bool hasSurface() const;
const Cairo::RefPtr<Cairo::ImageSurface>& get() const;
Cairo::RefPtr<const Cairo::ImageSurface> get() const;
const Cairo::RefPtr<Cairo::ImageSurface>& get();
static void init();
static void updateImages ();
static void setDPInScale (const double newDPI, const int newScale);
static void setScale (const int newScale);
static void updateImages();
static void setDPInScale(double newDPI, int newScale);
void from(Glib::RefPtr<RTSurface> other);
private:
void changeImage(const Glib::ustring& imageName);
static double dpiBack; // used to keep track of master dpi change
static int scaleBack; // used to keep track of master scale change
Cairo::RefPtr<Cairo::ImageSurface> surface;
};