Merge pull request #524 from thoughtbox/master

Merge Allow for "Enable Enter key" translation

res/values/strings.xml

@@ -420,6 +420,8 @@
     <string name="preferences__pref_all_mms_title">Use for all MMS</string> 
     <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Use TextSecure for viewing and storing all incoming text messages</string>
     <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Use TextSecure for viewing and storing all incoming multimedia messages</string>
+    <string name="preferences__enable_enter_key_title">Enable Enter key</string>
+    <string name="preferences__replace_smiley_with_enter_key">Replace the smiley key with an enter key</string>
     <string name="preferences__pref_enter_sends_title">Enter sends</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the enter key will send text messages</string>
     <string name="preferences__display_settings">Display Settings</string>

res/xml/preferences.xml

@@ -72,8 +72,8 @@
   <PreferenceCategory android:title="Input Settings">
       <CheckBoxPreference android:defaultValue="false"
                           android:key="pref_enter_key"
-                          android:title="Enable enter key"
-                          android:summary="Replace the smiley key with an enter key"/>
+                          android:title="@string/preferences__enable_enter_key_title"
+                          android:summary="@string/preferences__replace_smiley_with_enter_key"/>
 
       <CheckBoxPreference android:defaultValue="false"
                           android:key="pref_enter_sends"