Merge branch 'release-1.4'

1 files changed, 8 insertions, 0 deletions

diff --git a/src/corelib/lang_en.inc b/src/corelib/lang_en.inc
index 6a681932..aec26b22 100644
--- a/src/corelib/lang_en.inc
+++ b/src/corelib/lang_en.inc
@@ -19,17 +19,21 @@ rsfileattributes  =  'Attributes';
 rsshortaug  =  'Aug';
 rslongaug  =  'August';
 rskeybksp  =  'BkSp';
+rscolorblue  =  'Blue';
 rsbold  =  'Bold';
 rscancel  =  'Cancel';
 rscannotcreatedir  =  'Cannot create directory';
 rschange  =  'Change';
 rschangetitle  =  'Change Title';
 rscharactermap  =  'Character Map';
+rscolorpickerhint  =  'Click on Picker and maintain click => release to get the color';
 rsclose  =  'Close';
 rscollection  =  'Collection';
+rstabsheetcolorwheel  =  'Color Wheel';
 rsconfigurebookmarks  =  'Configure Bookmarks';
 rsconfirm  =  'Confirm';
 rsconfirmation  =  'Confirmation';
+rscontinuous  =  'Continuous';
 rscopy  =  'Copy';
 rserrcouldnotopendir  =  'Could not open the directory <%s>';
 rscreate  =  'Create';
@@ -70,8 +74,10 @@ rscollectionfontaliases  =  'Font Aliases';
 rserrreportfontfilemissing  =  'Font file <%s.fnt> not found';
 rsshortfri  =  'Fri';
 rslongfri  =  'Friday';
+rscolorgreen  =  'Green';
 rsfilegroup  =  'Group';
 rshelp  =  'Help';
+rshexadecimal  =  'Hexadecimal';
 rskeyhome  =  'Home';
 rsignore  =  'Ignore';
 rserrreportimagefilemissing  =  'Image <%s> is missing';
@@ -117,8 +123,10 @@ rspassword  =  'Password';
 rspaste  =  'Paste';
 rskeypgdn  =  'PgDn';
 rskeypgup  =  'PgUp';
+rstabpredefined  =  'Predefined';
 rsreportpreview  =  'Preview';
 rscollectionrecentlyused  =  'Recently Used';
+rscolorred  =  'Red';
 rsreplace  =  'Replace';
 rsretry  =  'Retry';
 rskeyright  =  'Right';