Merge branch 'master' into inputHandlingRework

2016-09-05 19:48:52 +02:00
parent 96011d0f77 f65332ad2d
commit a4b6e867c4
5 changed files with 68 additions and 0 deletions
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@ -85,6 +85,8 @@ numberOfClipboards=10
 # define the current fenrir key
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
+autoSpellCheck=True
+spellCheckLanguage=en_US

 [promote]
 enabled=True
--- a/config/settings/settings.conf.chrys
+++ b/config/settings/settings.conf.chrys
@ -44,6 +44,8 @@ numberOfClipboards=10
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
 dateFormat="%A, %B %d, %Y"
+autoSpellCheck=True
+spellCheckLanguage=en_US

 [promote]
 enabled=True
--- a/config/settings/settings.conf.orig
+++ b/config/settings/settings.conf.orig
@ -84,6 +84,8 @@ numberOfClipboards=10
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M%P
 dateFormat="%A, %B %d, %Y"
+autoSpellCheck=True
+spellCheckLanguage=en_US

 [promote]
 enabled=True
--- a/config/settings/settings.conf.storm
+++ b/config/settings/settings.conf.storm
@ -44,6 +44,8 @@ numberOfClipboards=10
 fenrirKeys=KEY_KP0
 timeFormat=%H:%M:%P
 dateFormat="%A, %B %d, %Y"
+autoSpellCheck=True
+spellCheckLanguage=en_US

 [promote]
 enabled=True