From b25e236a2eb4c308b8c4e45c7372b5a0742564b3 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 23 Jul 2018 13:34:26 -0400
Subject: [PATCH 01/14] Slight change to wording of forward keypress help text

---
 src/fenrirscreenreader/commands/commands/forward_keypress.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fenrirscreenreader/commands/commands/forward_keypress.py b/src/fenrirscreenreader/commands/commands/forward_keypress.py
index 79d0d367..59eb438a 100644
--- a/src/fenrirscreenreader/commands/commands/forward_keypress.py
+++ b/src/fenrirscreenreader/commands/commands/forward_keypress.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('sends the following keypress to the terminal')        
+        return _('sends the following keypress to the terminal or application')        
     
     def run(self):
         self.env['input']['keyForeward'] = 3

From 6dcf4348ee5ff98a72dfc88b41c42aac65702d24 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 23 Jul 2018 14:03:50 -0400
Subject: [PATCH 02/14] More help wording tweaks.

---
 .../commands/commands/export_clipboard_to_x.py                  | 2 +-
 .../commands/commands/import_clipboard_from_x.py                | 2 +-
 .../commands/commands/review_line_first_char.py                 | 2 +-
 .../commands/commands/review_line_last_char.py                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py
index ce4844cf..868efd75 100644
--- a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py
+++ b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py
@@ -18,7 +18,7 @@ class command():
     def shutdown(self):
         pass
     def getDescription(self):
-        return _('export the current fenrir clipboard to X clipboard')
+        return _('export the current fenrir clipboard to the graphical clipboard')
     def run(self):                       
        _thread.start_new_thread(self._threadRun , ())
 
diff --git a/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py b/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py
index 5c27254e..c7fea60b 100644
--- a/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py
+++ b/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py
@@ -18,7 +18,7 @@ class command():
     def shutdown(self):
         pass
     def getDescription(self):
-        return _("imports the current X clipboard to Fenrir's clipboard")
+        return _("imports the graphical clipboard to Fenrir's clipboard")
     def run(self):                       
        _thread.start_new_thread(self._threadRun , ())
 
diff --git a/src/fenrirscreenreader/commands/commands/review_line_first_char.py b/src/fenrirscreenreader/commands/commands/review_line_first_char.py
index 7d18692c..f6a616e1 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_first_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_first_char.py
@@ -16,7 +16,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('set review cursor to end of current line and display the content')        
+        return _('Move the review cursor to the first character on the current line')
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_line_last_char.py b/src/fenrirscreenreader/commands/commands/review_line_last_char.py
index 54854b39..8b4bad07 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_last_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_last_char.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('set review cursor to end of current line and display the content')        
+        return _('Move the review cursor to the last character on the current line')
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()

From ad95e9ae8ccc2015deced912ea52458f72507fb5 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Mon, 23 Jul 2018 14:20:55 -0400
Subject: [PATCH 03/14] Changed the welcome and exit messages for tutorial
 mode.

---
 .../commands/commands/toggle_tutorial_mode.py                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py b/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py
index f09f70f1..1ac2eb31 100644
--- a/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py
+++ b/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py
@@ -16,9 +16,9 @@ class command():
     def getDescription(self):
         self.env['runtime']['helpManager'].toggleTutorialMode()            
         #self.env['runtime']['outputManager'].presentText(,  interrupt=True)       
-        return _('You are leaving the tutorial mode. Press that shortcut again to enter the tutorial mode again.')
+        return _('Exiting tutorial mode. To enter tutorial mode again press Fenrir+f1')
     def run(self):
         self.env['runtime']['helpManager'].toggleTutorialMode()            
-        self.env['runtime']['outputManager'].presentText( _('you entered the tutorial mode. In that mode the commands are not executed. but you get a description of what the shortcut does. To leave the tutorial mode, press that shortcut again.'),  interrupt=True)                             
+        self.env['runtime']['outputManager'].presentText( _('Entering tutorial mode. In this mode commands are described but not executed. You can move through the list of commands with the up and down arrow keys. To Exit tutorial mode press Fenrir+f1.'),  interrupt=True)                             
     def setCallback(self, callback):
         pass

From 073babc7598a67fde8f006d264f69f5b84035a11 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sat, 28 Jul 2018 11:09:49 -0400
Subject: [PATCH 04/14] Help text changes

---
 .../commands/commands/add_word_to_spell_check.py              | 4 ++--
 src/fenrirscreenreader/commands/commands/braille_flush.py     | 2 +-
 .../commands/commands/copy_marked_to_clipboard.py             | 2 +-
 src/fenrirscreenreader/commands/commands/dec_speech_pitch.py  | 2 +-
 src/fenrirscreenreader/commands/commands/dec_speech_rate.py   | 2 +-
 src/fenrirscreenreader/commands/commands/dec_speech_volume.py | 2 +-
 src/fenrirscreenreader/commands/commands/exit_review.py       | 4 ++--
 .../commands/commands/export_clipboard_to_x.py                | 2 +-
 src/fenrirscreenreader/commands/commands/inc_speech_pitch.py  | 2 +-
 src/fenrirscreenreader/commands/commands/inc_speech_rate.py   | 2 +-
 src/fenrirscreenreader/commands/commands/inc_speech_volume.py | 2 +-
 src/fenrirscreenreader/commands/commands/indent_curr_line.py  | 2 +-
 src/fenrirscreenreader/commands/commands/last_incoming.py     | 2 +-
 src/fenrirscreenreader/commands/commands/marked_text.py       | 2 +-
 src/fenrirscreenreader/commands/commands/remove_marks.py      | 2 +-
 .../commands/commands/remove_word_from_spell_check.py         | 2 +-
 src/fenrirscreenreader/commands/commands/review_bottom.py     | 2 +-
 .../commands/commands/review_curr_word_phonetic.py            | 2 +-
 .../commands/commands/review_next_word_phonetic.py            | 2 +-
 .../commands/commands/review_prev_word_phonetic.py            | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py b/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py
index 24c24cd9..d0dd515b 100644
--- a/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py
+++ b/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py
@@ -46,10 +46,10 @@ class command():
 
         if currWord != '':
             if self.spellChecker.is_added(currWord):
-                self.env['runtime']['outputManager'].presentText(_('{0} is already in dict').format(currWord,), soundIcon='Cancel', interrupt=True)                
+                self.env['runtime']['outputManager'].presentText(_('{0} is already in dictionary').format(currWord,), soundIcon='Cancel', interrupt=True)                
             else:
                 self.spellChecker.add(currWord)             
-                self.env['runtime']['outputManager'].presentText(_('{0} added').format(currWord,), soundIcon='Accept', interrupt=True)               
+                self.env['runtime']['outputManager'].presentText(_('{0} added to dictionary').format(currWord,), soundIcon='Accept', interrupt=True)               
 
     def setCallback(self, callback):
         pass
diff --git a/src/fenrirscreenreader/commands/commands/braille_flush.py b/src/fenrirscreenreader/commands/commands/braille_flush.py
index 5a6bb6ba..72d2092b 100644
--- a/src/fenrirscreenreader/commands/commands/braille_flush.py
+++ b/src/fenrirscreenreader/commands/commands/braille_flush.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('flush the braille device if a message is written on')
+        return _('Clear the Braille device if it is displaying a message')
     def run(self):
         self.env['runtime']['outputManager'].clearFlushTime()
     def setCallback(self, callback):
diff --git a/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py b/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py
index 8d6c8c4e..0d9e6360 100644
--- a/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py
+++ b/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("one or two marks needed"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("One or two marks are needed"), interrupt=True)
             return
         if not self.env['commandBuffer']['Marks']['2']:
             self.env['runtime']['cursorManager'].setMark()
diff --git a/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py b/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py
index e7e6fe06..6dfcf186 100644
--- a/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py
+++ b/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('decreases the pitch of the speech')        
+        return _('Decreases the pitch of the speech')        
     
     def run(self):
         value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
diff --git a/src/fenrirscreenreader/commands/commands/dec_speech_rate.py b/src/fenrirscreenreader/commands/commands/dec_speech_rate.py
index f42d4e95..7241a51f 100644
--- a/src/fenrirscreenreader/commands/commands/dec_speech_rate.py
+++ b/src/fenrirscreenreader/commands/commands/dec_speech_rate.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('decreases the rate of the speech')        
+        return _('Decreases the rate of the speech')        
     
     def run(self):
         value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'rate')
diff --git a/src/fenrirscreenreader/commands/commands/dec_speech_volume.py b/src/fenrirscreenreader/commands/commands/dec_speech_volume.py
index 5c5f60c5..764856b3 100644
--- a/src/fenrirscreenreader/commands/commands/dec_speech_volume.py
+++ b/src/fenrirscreenreader/commands/commands/dec_speech_volume.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('decreases the volume of the speech')        
+        return _('Decreases the volume of the speech')        
     
     def run(self):
         value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'volume')
diff --git a/src/fenrirscreenreader/commands/commands/exit_review.py b/src/fenrirscreenreader/commands/commands/exit_review.py
index 0ac3854b..4a00904e 100644
--- a/src/fenrirscreenreader/commands/commands/exit_review.py
+++ b/src/fenrirscreenreader/commands/commands/exit_review.py
@@ -18,11 +18,11 @@ class command():
     
     def run(self):
         if not self.env['runtime']['cursorManager'].isReviewMode():
-            self.env['runtime']['outputManager'].presentText(_("Not in review mode"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("Not in Review Mode"), interrupt=True)
             return  
 
         self.env['runtime']['cursorManager'].clearReviewCursor()
-        self.env['runtime']['outputManager'].presentText(_("leave review mode"), interrupt=True)
+        self.env['runtime']['outputManager'].presentText(_("Exiting Review Mode"), interrupt=True)
    
     def setCallback(self, callback):
         pass
diff --git a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py
index 868efd75..9c542e73 100644
--- a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py
+++ b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py
@@ -18,7 +18,7 @@ class command():
     def shutdown(self):
         pass
     def getDescription(self):
-        return _('export the current fenrir clipboard to the graphical clipboard')
+        return _('Export current fenrir clipboard to X or GUI clipboard')
     def run(self):                       
        _thread.start_new_thread(self._threadRun , ())
 
diff --git a/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py b/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py
index db213648..eaf1e673 100644
--- a/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py
+++ b/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('increases the pitch of the speech')        
+        return _('Increases the pitch of the speech')        
     
     def run(self):
         value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
diff --git a/src/fenrirscreenreader/commands/commands/inc_speech_rate.py b/src/fenrirscreenreader/commands/commands/inc_speech_rate.py
index a65666b2..aff3d908 100644
--- a/src/fenrirscreenreader/commands/commands/inc_speech_rate.py
+++ b/src/fenrirscreenreader/commands/commands/inc_speech_rate.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('increase the speech rate')        
+        return _('Increase the speech rate')        
     
     def run(self):
         value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'rate')
diff --git a/src/fenrirscreenreader/commands/commands/inc_speech_volume.py b/src/fenrirscreenreader/commands/commands/inc_speech_volume.py
index 490dfc88..e27603e5 100644
--- a/src/fenrirscreenreader/commands/commands/inc_speech_volume.py
+++ b/src/fenrirscreenreader/commands/commands/inc_speech_volume.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('increase the speech volume')        
+        return _('Increase the speech volume')        
     
     def run(self):
         value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'volume')
diff --git a/src/fenrirscreenreader/commands/commands/indent_curr_line.py b/src/fenrirscreenreader/commands/commands/indent_curr_line.py
index ece9c6e0..8d1fade5 100644
--- a/src/fenrirscreenreader/commands/commands/indent_curr_line.py
+++ b/src/fenrirscreenreader/commands/commands/indent_curr_line.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('shows the indention level for the current line')        
+        return _('Presents the indentation level for the current line')        
 
     def run(self):
         # Prefer review cursor over text cursor
diff --git a/src/fenrirscreenreader/commands/commands/last_incoming.py b/src/fenrirscreenreader/commands/commands/last_incoming.py
index 907144c0..b38e3b29 100644
--- a/src/fenrirscreenreader/commands/commands/last_incoming.py
+++ b/src/fenrirscreenreader/commands/commands/last_incoming.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('displays the last received text')        
+        return _('Presents the text which was last received')        
     
     def run(self):
         self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=True)
diff --git a/src/fenrirscreenreader/commands/commands/marked_text.py b/src/fenrirscreenreader/commands/commands/marked_text.py
index 63a34861..6c01c0e2 100644
--- a/src/fenrirscreenreader/commands/commands/marked_text.py
+++ b/src/fenrirscreenreader/commands/commands/marked_text.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('speaks the currently selected text that will be copied to the clipboard')        
+        return _('Presents the currently selected text that will be copied to the clipboard')        
     
     def run(self):
         if not (self.env['commandBuffer']['Marks']['1'] and \
diff --git a/src/fenrirscreenreader/commands/commands/remove_marks.py b/src/fenrirscreenreader/commands/commands/remove_marks.py
index 7c351415..abea6633 100644
--- a/src/fenrirscreenreader/commands/commands/remove_marks.py
+++ b/src/fenrirscreenreader/commands/commands/remove_marks.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('removes marks from selected text')        
+        return _('Removes marks from selected text')        
     
     def run(self):
         self.env['runtime']['cursorManager'].clearMarks()
diff --git a/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py b/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py
index 01cf863f..c6b998e2 100644
--- a/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py
+++ b/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py
@@ -47,7 +47,7 @@ class command():
         currWord = currWord.strip(string.whitespace + '!"#$%&\()*+,-./:;<=§>?@[\\]^_{|}~')
         if not currWord.isspace():
             if self.spellChecker.is_removed(currWord):
-                self.env['runtime']['outputManager'].presentText(_('{0} is already removed from dict').format(currWord,), soundIcon='Cancel', interrupt=True)                
+                self.env['runtime']['outputManager'].presentText(_('{0} is not in the dictionary').format(currWord,), soundIcon='Cancel', interrupt=True)                
             else:
                 self.spellChecker.remove(currWord)             
                 self.env['runtime']['outputManager'].presentText(_('{0} removed').format(currWord,), soundIcon='Accept', interrupt=True)                    
diff --git a/src/fenrirscreenreader/commands/commands/review_bottom.py b/src/fenrirscreenreader/commands/commands/review_bottom.py
index 5e5271b3..1d2f3c1b 100644
--- a/src/fenrirscreenreader/commands/commands/review_bottom.py
+++ b/src/fenrirscreenreader/commands/commands/review_bottom.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('move review to bottom of screen')         
+        return _('Move review to the bottom of the screen')         
 
     def run(self):
         self.env['screen']['newCursorReview'] = { 'x': 0, 'y':self.env['screen']['lines'] -1}
diff --git a/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py
index 7321023f..9d9ebd35 100644
--- a/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py
+++ b/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py
@@ -16,7 +16,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('phonetically spells the current word and set review to it')        
+        return _('Phonetically spells the current word')        
     
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py
index d558b403..97914ef0 100644
--- a/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py
+++ b/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py
@@ -16,7 +16,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('phonetically spells the current word and set review to it')        
+        return _('Phonetically spells the next word and moves review to it')        
     
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py
index 3076e9d3..d8c8883d 100644
--- a/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py
+++ b/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py
@@ -16,7 +16,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('phonetically spells the current word and set review to it')        
+        return _('Phonetically spells the previous word and moves review to it')        
     
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()

From 1e5ff1d6ed0bd5484f980ead537a456115731910 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 31 Jul 2018 08:38:40 -0400
Subject: [PATCH 05/14] More help text changes.

---
 src/fenrirscreenreader/commands/commands/review_line_end.py     | 2 +-
 .../commands/commands/review_line_first_char.py                 | 2 +-
 .../commands/commands/review_line_last_char.py                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/review_line_end.py b/src/fenrirscreenreader/commands/commands/review_line_end.py
index cc446543..4b3e0349 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_end.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_end.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('set review cursor to end of current line and display the content')        
+        return _('Move Review to the end of current line and display the content')        
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_line_first_char.py b/src/fenrirscreenreader/commands/commands/review_line_first_char.py
index f6a616e1..e3d2a709 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_first_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_first_char.py
@@ -16,7 +16,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('Move the review cursor to the first character on the current line')
+        return _('Move Review to the first character on the line')
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_line_last_char.py b/src/fenrirscreenreader/commands/commands/review_line_last_char.py
index 8b4bad07..b4b95f0d 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_last_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_last_char.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('Move the review cursor to the last character on the current line')
+        return _('Move Review to the last character on the line')
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()

From 1f7d0969fd758f0c3154622479390c345369ac2e Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 31 Jul 2018 08:46:22 -0400
Subject: [PATCH 06/14] Finished first batch of text changes.

---
 .../commands/commands/review_line_first_char.py                 | 2 +-
 .../commands/commands/review_line_last_char.py                  | 2 +-
 src/fenrirscreenreader/commands/commands/review_next_char.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/review_line_first_char.py b/src/fenrirscreenreader/commands/commands/review_line_first_char.py
index e3d2a709..9bcf554d 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_first_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_first_char.py
@@ -30,7 +30,7 @@ class command():
           char_utils.getCurrentChar(self.env['screen']['newCursorReview']['x'], self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])       
 
         self.env['runtime']['outputManager'].presentText(currChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)        
-        self.env['runtime']['outputManager'].presentText(_("first char in line indent {0}").format(str(len(currLine) - len(currLine.lstrip()))), interrupt=False)
+        self.env['runtime']['outputManager'].presentText(_("first character in line indent {0}").format(str(len(currLine) - len(currLine.lstrip()))), interrupt=False)
    
     def setCallback(self, callback):
         pass
diff --git a/src/fenrirscreenreader/commands/commands/review_line_last_char.py b/src/fenrirscreenreader/commands/commands/review_line_last_char.py
index b4b95f0d..bb1fccbe 100644
--- a/src/fenrirscreenreader/commands/commands/review_line_last_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_line_last_char.py
@@ -24,7 +24,7 @@ class command():
           char_utils.getLastCharInLine(self.env['screen']['newCursorReview']['y'], self.env['screen']['newContentText'])
         
         self.env['runtime']['outputManager'].presentText(lastChar ,interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False)        
-        self.env['runtime']['outputManager'].presentText(_("last char in line"), interrupt=False)
+        self.env['runtime']['outputManager'].presentText(_("last character in line"), interrupt=False)
    
     def setCallback(self, callback):
         pass
diff --git a/src/fenrirscreenreader/commands/commands/review_next_char.py b/src/fenrirscreenreader/commands/commands/review_next_char.py
index 93909310..f6e2cecf 100644
--- a/src/fenrirscreenreader/commands/commands/review_next_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_next_char.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('moves review to the next character and presents it')        
+        return _('Moves review to the next character and presents it')        
     
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()

From e28096b1c7dd736b076299ff1ef341318803d678 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Wed, 1 Aug 2018 21:03:04 -0400
Subject: [PATCH 07/14] removed "and presents it" from help strings.

---
 src/fenrirscreenreader/commands/commands/review_next_char.py | 2 +-
 src/fenrirscreenreader/commands/commands/review_next_line.py | 2 +-
 src/fenrirscreenreader/commands/commands/review_next_word.py | 2 +-
 src/fenrirscreenreader/commands/commands/review_prev_char.py | 2 +-
 src/fenrirscreenreader/commands/commands/review_prev_line.py | 2 +-
 src/fenrirscreenreader/commands/commands/review_prev_word.py | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/review_next_char.py b/src/fenrirscreenreader/commands/commands/review_next_char.py
index f6e2cecf..643199a8 100644
--- a/src/fenrirscreenreader/commands/commands/review_next_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_next_char.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('Moves review to the next character and presents it')        
+        return _('Moves review to the next character ')        
     
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_next_line.py b/src/fenrirscreenreader/commands/commands/review_next_line.py
index 8cf4a4c3..e6977e4b 100644
--- a/src/fenrirscreenreader/commands/commands/review_next_line.py
+++ b/src/fenrirscreenreader/commands/commands/review_next_line.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('moves review to the next line and presents it')        
+        return _('moves review to the next line ')        
     
     def run(self):
         self.env['screen']['oldCursorReview'] = self.env['screen']['newCursorReview']
diff --git a/src/fenrirscreenreader/commands/commands/review_next_word.py b/src/fenrirscreenreader/commands/commands/review_next_word.py
index a37a5e06..ec4c3170 100644
--- a/src/fenrirscreenreader/commands/commands/review_next_word.py
+++ b/src/fenrirscreenreader/commands/commands/review_next_word.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('moves review to the next word and presents it')        
+        return _('moves review to the next word ')        
     
     def run(self):
         self.env['screen']['oldCursorReview'] = self.env['screen']['newCursorReview']
diff --git a/src/fenrirscreenreader/commands/commands/review_prev_char.py b/src/fenrirscreenreader/commands/commands/review_prev_char.py
index e5f935cf..c49ad47f 100644
--- a/src/fenrirscreenreader/commands/commands/review_prev_char.py
+++ b/src/fenrirscreenreader/commands/commands/review_prev_char.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('moves review to the previous character and presents it')        
+        return _('moves review to the previous character ')        
     
     def run(self):
         self.env['screen']['oldCursorReview'] = self.env['screen']['newCursorReview']
diff --git a/src/fenrirscreenreader/commands/commands/review_prev_line.py b/src/fenrirscreenreader/commands/commands/review_prev_line.py
index 480e4bae..07722e1f 100644
--- a/src/fenrirscreenreader/commands/commands/review_prev_line.py
+++ b/src/fenrirscreenreader/commands/commands/review_prev_line.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('moves review to the previous line and presents it')        
+        return _('moves review to the previous line ')        
 
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_prev_word.py b/src/fenrirscreenreader/commands/commands/review_prev_word.py
index 10ea680b..e4d97565 100644
--- a/src/fenrirscreenreader/commands/commands/review_prev_word.py
+++ b/src/fenrirscreenreader/commands/commands/review_prev_word.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('moves review focus to the previous word and presents it')        
+        return _('moves review focus to the previous word ')        
 
     def run(self):
         self.env['runtime']['cursorManager'].enterReviewModeCurrTextCursor()

From 933cf962f08c75ae6c21d4fbe5cb9c44fca1e1f3 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Thu, 2 Aug 2018 21:22:07 -0400
Subject: [PATCH 08/14] more updates to help rewording.

---
 src/fenrirscreenreader/commands/commands/set_bookmark_1.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_10.py | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_2.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_3.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_4.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_5.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_6.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_7.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_8.py  | 2 +-
 src/fenrirscreenreader/commands/commands/set_bookmark_9.py  | 2 +-
 src/fenrirscreenreader/commands/commands/shut_up.py         | 2 +-
 src/fenrirscreenreader/commands/commands/subprocess.py      | 6 +++---
 .../commands/commands/toggle_auto_time.py                   | 6 +++---
 src/fenrirscreenreader/commands/commands/toggle_braille.py  | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_1.py b/src/fenrirscreenreader/commands/commands/set_bookmark_1.py
index 3a1bdcbe..e17a0bd1 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_1.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_1.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_10.py b/src/fenrirscreenreader/commands/commands/set_bookmark_10.py
index 5dfeea05..fa6d1ffa 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_10.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_10.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_2.py b/src/fenrirscreenreader/commands/commands/set_bookmark_2.py
index 9268e21d..99d0ea66 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_2.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_2.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_3.py b/src/fenrirscreenreader/commands/commands/set_bookmark_3.py
index 5231b3ac..043f7b91 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_3.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_3.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_4.py b/src/fenrirscreenreader/commands/commands/set_bookmark_4.py
index 41a2b825..5e2ee9b4 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_4.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_4.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_5.py b/src/fenrirscreenreader/commands/commands/set_bookmark_5.py
index 7d82fcf7..920fa322 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_5.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_5.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_6.py b/src/fenrirscreenreader/commands/commands/set_bookmark_6.py
index 806664f5..4f0c639a 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_6.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_6.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_7.py b/src/fenrirscreenreader/commands/commands/set_bookmark_7.py
index 6f7c73bc..349be691 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_7.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_7.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_8.py b/src/fenrirscreenreader/commands/commands/set_bookmark_8.py
index df203fac..812cf064 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_8.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_8.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_9.py b/src/fenrirscreenreader/commands/commands/set_bookmark_9.py
index 7dec75ea..2e2e55ae 100644
--- a/src/fenrirscreenreader/commands/commands/set_bookmark_9.py
+++ b/src/fenrirscreenreader/commands/commands/set_bookmark_9.py
@@ -19,7 +19,7 @@ class command():
     
     def run(self):
         if not self.env['commandBuffer']['Marks']['1']:
-            self.env['runtime']['outputManager'].presentText(_("No Mark found"), interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
             return
         currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
         self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
diff --git a/src/fenrirscreenreader/commands/commands/shut_up.py b/src/fenrirscreenreader/commands/commands/shut_up.py
index 8bdaf78d..6d834c3a 100644
--- a/src/fenrirscreenreader/commands/commands/shut_up.py
+++ b/src/fenrirscreenreader/commands/commands/shut_up.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('interrupts the current presentation')        
+        return _('Interrupts the current presentation')        
     def run(self):
         if len(self.env['input']['prevDeepestInput']) > len(self.env['input']['currInput']):
             return          
diff --git a/src/fenrirscreenreader/commands/commands/subprocess.py b/src/fenrirscreenreader/commands/commands/subprocess.py
index ddb3a952..b96371d0 100644
--- a/src/fenrirscreenreader/commands/commands/subprocess.py
+++ b/src/fenrirscreenreader/commands/commands/subprocess.py
@@ -21,13 +21,13 @@ class command():
         return _('script: {0} fullpath: {1}').format(os.path.basename(self.scriptPath), self.scriptPath)
     def run(self):
         if not os.path.exists(self.scriptPath):
-            self.env['runtime']['outputManager'].presentText(_('scriptfile does not exist'), soundIcon='', interrupt=False)
+            self.env['runtime']['outputManager'].presentText(_('Script file not found'), soundIcon='', interrupt=False)
             return   
         if not os.path.isfile(self.scriptPath):
-            self.env['runtime']['outputManager'].presentText(_('scriptfile is not a file'), soundIcon='', interrupt=False)
+            self.env['runtime']['outputManager'].presentText(_('Script source is not a valid file'), soundIcon='', interrupt=False)
             return      
         if not os.access(self.scriptPath, os.X_OK):
-            self.env['runtime']['outputManager'].presentText(_('scriptfile is not executable'), soundIcon='', interrupt=False)
+            self.env['runtime']['outputManager'].presentText(_('Script file is not executable'), soundIcon='', interrupt=False)
             return                            
         _thread.start_new_thread(self._threadRun , ())
 
diff --git a/src/fenrirscreenreader/commands/commands/toggle_auto_time.py b/src/fenrirscreenreader/commands/commands/toggle_auto_time.py
index bec62b5d..ac89c84a 100644
--- a/src/fenrirscreenreader/commands/commands/toggle_auto_time.py
+++ b/src/fenrirscreenreader/commands/commands/toggle_auto_time.py
@@ -13,14 +13,14 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('enables or disables automatic reading of time after an period')        
+        return _('Enables or disables automatic reading of time after specified intervals')        
     
     def run(self):
         self.env['runtime']['settingsManager'].setSetting('time', 'enabled', str(not self.env['runtime']['settingsManager'].getSettingAsBool('time', 'enabled')))   
         if self.env['runtime']['settingsManager'].getSettingAsBool('time', 'enabled'): 
-            self.env['runtime']['outputManager'].presentText(_("autotime enabled"), soundIcon='', interrupt=True)
+            self.env['runtime']['outputManager'].presentText(_("Automatic time announcement enabled"), soundIcon='', interrupt=True)
         else:
-            self.env['runtime']['outputManager'].presentText(_("autotime disabled"), soundIcon='', interrupt=True)                          
+            self.env['runtime']['outputManager'].presentText(_("Automatic time announcement disabled"), soundIcon='', interrupt=True)                          
     
     def setCallback(self, callback):
         pass
diff --git a/src/fenrirscreenreader/commands/commands/toggle_braille.py b/src/fenrirscreenreader/commands/commands/toggle_braille.py
index 04943655..ed8346d8 100644
--- a/src/fenrirscreenreader/commands/commands/toggle_braille.py
+++ b/src/fenrirscreenreader/commands/commands/toggle_braille.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('enables and disables output in braille')        
+        return _('Enables and disables Braille output')        
 
     def run(self):
         if self.env['runtime']['settingsManager'].getSettingAsBool('braille', 'enabled'): 

From 71a46ab614c7f5ad65e26cef5a718d29e6bb4655 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Thu, 2 Aug 2018 21:45:19 -0400
Subject: [PATCH 09/14] more updates to help rewording.

---
 src/fenrirscreenreader/commands/commands/review_down.py | 2 +-
 src/fenrirscreenreader/commands/commands/review_up.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/review_down.py b/src/fenrirscreenreader/commands/commands/review_down.py
index 58112b43..8bb5e958 100644
--- a/src/fenrirscreenreader/commands/commands/review_down.py
+++ b/src/fenrirscreenreader/commands/commands/review_down.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('set review cursor to char below the current char and present it.')        
+        return _('Move review to the character below the current position')        
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
diff --git a/src/fenrirscreenreader/commands/commands/review_up.py b/src/fenrirscreenreader/commands/commands/review_up.py
index 2affc0da..d8f4cbe6 100644
--- a/src/fenrirscreenreader/commands/commands/review_up.py
+++ b/src/fenrirscreenreader/commands/commands/review_up.py
@@ -15,7 +15,7 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('set review cursor to the char in the line below and present it')        
+        return _('Move review to the character in the line above the current position')        
 
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()

From bf03f510523a3f2c4ad4308b38a6b48bbe0c931f Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Fri, 3 Aug 2018 11:06:50 -0400
Subject: [PATCH 10/14] Change text for cursor column review.

---
 src/fenrirscreenreader/commands/commands/cursor_column.py | 2 +-
 src/fenrirscreenreader/commands/commands/cursor_lineno.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fenrirscreenreader/commands/commands/cursor_column.py b/src/fenrirscreenreader/commands/commands/cursor_column.py
index 9b738626..7afb9e5f 100644
--- a/src/fenrirscreenreader/commands/commands/cursor_column.py
+++ b/src/fenrirscreenreader/commands/commands/cursor_column.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass
     def getDescription(self):
-        return _('presents the current column number for review cursor in review mode or the text cursor if not. Starts with 1')       
+        return _('Column number for cursor')       
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
         self.env['runtime']['outputManager'].presentText(str(cursorPos['x'] + 1) , interrupt=True)
diff --git a/src/fenrirscreenreader/commands/commands/cursor_lineno.py b/src/fenrirscreenreader/commands/commands/cursor_lineno.py
index cf926dd0..80e665a2 100644
--- a/src/fenrirscreenreader/commands/commands/cursor_lineno.py
+++ b/src/fenrirscreenreader/commands/commands/cursor_lineno.py
@@ -14,7 +14,7 @@ class command():
     def shutdown(self):
         pass
     def getDescription(self):
-        return _('presents the current line number for review cursor in review mode or the text cursor if not. Starts with 1')         
+        return _('Line number for cursor')         
     def run(self):
         cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
         self.env['runtime']['outputManager'].presentText(str(cursorPos['y'] + 1), interrupt=True)

From 81ff4c3a99122deef74b707e6519241972a7fd6d Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 7 Aug 2018 23:15:22 -0400
Subject: [PATCH 11/14] Fleshing out laptop keys a bit more.

---
 config/keyboard/laptop.conf | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index fcc16e14..9849130b 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -14,15 +14,15 @@ KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
 KEY_FENRIR,KEY_K=review_curr_word
 KEY_FENRIR,KEY_J=review_prev_word
 KEY_FENRIR,KEY_L=review_next_word
-KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_K=review_curr_word_phonetic
-KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_J=review_prev_word_phonetic
-KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_L=review_next_word_phonetic
+KEY_FENRIR,KEY_ALT,KEY_K=review_curr_word_phonetic
+KEY_FENRIR,KEY_ALT,KEY_J=review_prev_word_phonetic
+KEY_FENRIR,KEY_ALT,KEY_L=review_next_word_phonetic
 KEY_FENRIR,KEY_COMMA=review_curr_char
 KEY_FENRIR,KEY_M=review_prev_char
 KEY_FENRIR,KEY_DOT=review_next_char
-KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_COMMA=curr_char_phonetic
-KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_M=prev_char_phonetic
-KEY_FENRIR,KEY_ALT,KEY_CTRL,KEY_DOT=prev_char_phonetic
+KEY_FENRIR,KEY_ALT,KEY_COMMA=curr_char_phonetic
+KEY_FENRIR,KEY_ALT,KEY_M=prev_char_phonetic
+KEY_FENRIR,KEY_ALT,KEY_DOT=next_char_phonetic
 KEY_FENRIR,KEY_CTRL,KEY_I=review_up
 KEY_FENRIR,KEY_CTRL,KEY_COMMA=review_down
 KEY_FENRIR,KEY_SLASH=exit_review
@@ -116,6 +116,7 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_X=set_mark
 KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 # linux specific
+KEY_FENRIR,KEY_F6=import_clipboard_from_x
 KEY_FENRIR,KEY_F7=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume

From 384414eae54c34a404106b9c08f9f2ef54a32ccc Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 7 Aug 2018 23:17:56 -0400
Subject: [PATCH 12/14] Fleshing out laptop keys a bit more.

---
 config/keyboard/laptop.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
index 9849130b..53626b1d 100644
--- a/config/keyboard/laptop.conf
+++ b/config/keyboard/laptop.conf
@@ -116,7 +116,7 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_X=set_mark
 KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 # linux specific
-KEY_FENRIR,KEY_F6=import_clipboard_from_x
-KEY_FENRIR,KEY_F7=export_clipboard_to_x
+KEY_FENRIR,KEY_F7=import_clipboard_from_x
+KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume

From fbf18ad81f7ca87be4eff45ae0245c7ac6b99cbe Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 9 Sep 2018 10:38:40 -0400
Subject: [PATCH 13/14] Clipboard to and from X bindings added for pty.

---
 config/keyboard/pty.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/keyboard/pty.conf b/config/keyboard/pty.conf
index 989688de..016b3b9b 100644
--- a/config/keyboard/pty.conf
+++ b/config/keyboard/pty.conf
@@ -65,6 +65,10 @@ alt+f12 - quit fenrir
 ^[[19;3~=export_clipboard_to_file
 # control+f8 - import clipboard from file
 ^[[19;5~=import_clipboard_from_file
+# alt+f9 - export clipboard to X
+^[[20;3~=export_clipboard_to_x
+# control+f9 - import clipboard from X
+^[[20;5~=import_clipboard_from_x
 # shift+f5 - remove marks
 ^[[15;2~=remove_marks
 # f5 - set mark

From 954c98f2b0ef915319edf6fc9061e14d3999decf Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Sun, 9 Sep 2018 13:08:04 -0400
Subject: [PATCH 14/14] Moved import and xport file to f9 and from and to x is
 now f8

---
 config/keyboard/pty.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/keyboard/pty.conf b/config/keyboard/pty.conf
index 016b3b9b..ba1a23b4 100644
--- a/config/keyboard/pty.conf
+++ b/config/keyboard/pty.conf
@@ -61,14 +61,14 @@ alt+f12 - quit fenrir
 ^[[17;2~=clear_clipboard
 # f7 - paste clipboard
 ^[[18~=paste_clipboard
-# alt+f8 - export clipboard to file
-^[[19;3~=export_clipboard_to_file
-# control+f8 - import clipboard from file
-^[[19;5~=import_clipboard_from_file
-# alt+f9 - export clipboard to X
-^[[20;3~=export_clipboard_to_x
-# control+f9 - import clipboard from X
-^[[20;5~=import_clipboard_from_x
+# alt+f8 - export clipboard to X
+^[[19;3~=export_clipboard_to_x
+# control+f8 - import clipboard from X
+^[[19;5~=import_clipboard_from_x
+# alt+f9 - export clipboard to file
+^[[20;3~=export_clipboard_to_file
+# control+f9 - import clipboard from file
+^[[20;5~=import_clipboard_from_file
 # shift+f5 - remove marks
 ^[[15;2~=remove_marks
 # f5 - set mark