Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2015-11-22 08:07:05 +01:00
30 changed files with 34 additions and 30 deletions

View File

@@ -1052,7 +1052,7 @@ PREFERENCES_TISTD;Standard
PREFERENCES_TP_LABEL;Tool panel:
PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
PREFERENCES_TUNNELMETADATA;Copy IPTC/XMP unchanged to output file (when tagging with other program)
PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
PREFERENCES_USESYSTEMTHEME;Use system theme
PREFERENCES_VIEW;Output device's white balance (monitor, TV, projector, viewing, etc.)