Merge branch 'dev' into procparams-metadata-mode

This commit is contained in:
Morgan Hardwood
2017-12-31 01:00:31 +01:00
31 changed files with 5 additions and 36 deletions

View File

@@ -1006,7 +1006,7 @@ PREFERENCES_DIRLAST;Last visited directory
PREFERENCES_DIROTHER;Other
PREFERENCES_DIRSELECTDLG;Select Image Directory at Startup...
PREFERENCES_DIRSOFTWARE;Installation directory
PREFERENCES_EDITORCMDLINE;Other command line
PREFERENCES_EDITORCMDLINE;Custom command line
PREFERENCES_EDITORLAYOUT;Editor Layout
PREFERENCES_EXPAUT;Expert
PREFERENCES_EXTERNALEDITOR;External Editor