Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9
(note: color.cc is still in the source tree and CMakeLists.txt)
This commit is contained in:
@@ -203,6 +203,7 @@ GENERAL_PORTRAIT;Portrait
|
||||
GENERAL_SAVE;Save
|
||||
GENERAL_UNCHANGED;(Unchanged)
|
||||
GENERAL_YES;Yes
|
||||
GENERAL_WARNING;Warning
|
||||
HISTOGRAM_BUTTON_BAR;RGB
|
||||
HISTOGRAM_BUTTON_B;B
|
||||
HISTOGRAM_BUTTON_G;G
|
||||
@@ -805,6 +806,7 @@ SAVEDLG_SAVEIMMEDIATELY;Save immediately
|
||||
SAVEDLG_SAVESPP;Save processing parameters with image
|
||||
SAVEDLG_TIFFFILTER;TIFF files
|
||||
SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
|
||||
SAVEDLG_WARNFILENAME;File will be named
|
||||
THRESHOLDSELECTOR_B;Bottom
|
||||
THRESHOLDSELECTOR_BL;Bottom-left
|
||||
THRESHOLDSELECTOR_BR;Bottom-right
|
||||
|
Reference in New Issue
Block a user