diff --git a/config/language/de.msg b/config/language/de.msg
index 46ca6a859..02f90bd79 100644
--- a/config/language/de.msg
+++ b/config/language/de.msg
@@ -319,9 +319,14 @@ fr;Français
 #
 # Strings still needing translation
 #
+Add Exception;Add Exception
 Display Name;Display Name
+Exception;Exception
+Exception Edit;Exception Edit
 FileIsAvailable;FileIsAvailable
+Intro;Intro
 Scrape Fanart;Scrape Fanart
+Scrape Videos (MAME only);Scrape Videos (MAME only)
 _help_control_custom3;Set the "Custom3" control(s)
 _help_control_custom4;Set the "Custom4" control(s)
 _help_control_custom5;Set the "Custom5" control(s)
diff --git a/config/language/es.msg b/config/language/es.msg
index 76dac3019..3fc9b7673 100644
--- a/config/language/es.msg
+++ b/config/language/es.msg
@@ -320,9 +320,14 @@ fr;Français
 #
 # Strings still needing translation
 #
+Add Exception;Add Exception
 Display Name;Display Name
+Exception;Exception
+Exception Edit;Exception Edit
 FileIsAvailable;FileIsAvailable
+Intro;Intro
 Scrape Fanart;Scrape Fanart
+Scrape Videos (MAME only);Scrape Videos (MAME only)
 _help_control_custom3;Set the "Custom3" control(s)
 _help_control_custom4;Set the "Custom4" control(s)
 _help_control_custom5;Set the "Custom5" control(s)
diff --git a/config/language/fr.msg b/config/language/fr.msg
index 4558a67c5..2bbd5d39f 100644
--- a/config/language/fr.msg
+++ b/config/language/fr.msg
@@ -324,9 +324,14 @@ kr;Coréen
 # Strings still needing translation
 #
 $1 Rule(s);$1 Rule(s)
+Add Exception;Add Exception
 Empty;Empty
+Exception;Exception
+Exception Edit;Exception Edit
 FileIsAvailable;FileIsAvailable
+Intro;Intro
 Play Sound;Play Sound
+Scrape Videos (MAME only);Scrape Videos (MAME only)
 _help_art;An artwork resource available for use by layouts
 _help_back;Exit menu
 _help_filter_add_exception;Add an exception to this filter.  If a game matches an exception (and wasn't filtered out by an earlier rule) it will be listed in the filter
diff --git a/config/language/jp.msg b/config/language/jp.msg
index cf9d11c3e..aba390889 100644
--- a/config/language/jp.msg
+++ b/config/language/jp.msg
@@ -314,9 +314,14 @@ _help_emu_listxml;
 # Strings still needing translation
 #
 $1 Rule(s);$1 Rule(s)
+Add Exception;Add Exception
 Empty;Empty
+Exception;Exception
+Exception Edit;Exception Edit
+Intro;Intro
 Play Sound;Play Sound
 Scrape Fanart;Scrape Fanart
+Scrape Videos (MAME only);Scrape Videos (MAME only)
 _help_art;An artwork resource available for use by layouts
 _help_back;Exit menu
 _help_control_custom3;Set the "Custom3" control(s)
diff --git a/config/language/kr.msg b/config/language/kr.msg
index 9f125a580..f8f52957f 100644
--- a/config/language/kr.msg
+++ b/config/language/kr.msg
@@ -314,9 +314,14 @@ _help_emu_listxml;
 # Strings still needing translation
 #
 $1 Rule(s);$1 Rule(s)
+Add Exception;Add Exception
 Empty;Empty
+Exception;Exception
+Exception Edit;Exception Edit
+Intro;Intro
 Play Sound;Play Sound
 Scrape Fanart;Scrape Fanart
+Scrape Videos (MAME only);Scrape Videos (MAME only)
 _help_art;An artwork resource available for use by layouts
 _help_back;Exit menu
 _help_control_custom3;Set the "Custom3" control(s)
diff --git a/config/language/msg_template.txt b/config/language/msg_template.txt
index d0aac3f7c..421a80013 100644
--- a/config/language/msg_template.txt
+++ b/config/language/msg_template.txt
@@ -1,10 +1,11 @@
-#
-# Interface strings
+# This file is the template for Attract-Mode translations.
+# Translate the string to the right of the semicolon on each line.  thanks!
 #
 $1 Rule(s);$1 Rule(s)
 Action;Action
 Add Artwork;Add Artwork
 Add Emulator;Add Emulator
+Add Exception;Add Exception
 Add Filter;Add Filter
 Add Input;Add Input
 Add New Display;Add New Display
@@ -77,6 +78,8 @@ Enabled;Enabled
 Enter Display Name;Enter Display Name
 Enter Emulator Name;Enter Emulator Name
 Enter Filter Name;Enter Filter Name
+Exception;Exception
+Exception Edit;Exception Edit
 Executable;Executable
 Exit (Confirm);Exit (Confirm)
 Exit Attract-Mode;Exit Attract-Mode
@@ -103,6 +106,7 @@ Generating Rom List: $1%;Generating Rom List: $1%
 Global Filter;Global Filter
 Hide Brackets in Game Title;Hide Brackets in Game Title
 Info Source/Scraper;Info Source/Scraper
+Intro;Intro
 Joystick Threshold;Joystick Threshold
 Jump to Next Display;Jump to Next Display
 Language;Language
@@ -154,6 +158,7 @@ Scrape Flyers/Boxart;Scrape Flyers/Boxart
 Scrape Game Logos (Wheel Art);Scrape Game Logos (Wheel Art)
 Scrape Marquees;Scrape Marquees
 Scrape Snaps;Scrape Snaps
+Scrape Videos (MAME only);Scrape Videos (MAME only)
 Scraper;Scraper
 Scraping Artwork: $1%;Scraping Artwork: $1%
 Screen Saver;Screen Saver
diff --git a/config/plugins/KonamiCode.nut b/config/plugins/KonamiCode.nut
index e4120d63a..c89be70e9 100644
--- a/config/plugins/KonamiCode.nut
+++ b/config/plugins/KonamiCode.nut
@@ -86,12 +86,11 @@ class KonamiCode
 				m_last_time = ttime;
 				m_pressed = false;
 			}
-			else
+			else if ( m_current > 0 )
 			{
 				// Check for whether we need to cancel the sequence
 				//
-				if (( m_current > 0 )
-					&& ( ttime > m_last_time + RESET_TIME ))
+				if ( ttime > m_last_time + RESET_TIME )
 				{
 					// timeout
 					m_current = 0;