TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-30 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #524 from thoughtbox/master

Browse Source 
Merge Allow for "Enable Enter key" translation
This commit is contained in:
Moxie Marlinspike 2014-01-02 15:35:56 -08:00
commit 7bf96ec7d7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -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>

4
res/xml/preferences.xml
View File

@ -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"