merge with dev

This commit is contained in:
Desmis
2017-12-30 16:30:21 +01:00
41 changed files with 468 additions and 566 deletions

View File

@@ -1130,7 +1130,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