diff options
| author | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 01:09:46 +0100 |
|---|---|---|
| committer | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 01:40:25 +0100 |
| commit | 5a860416b502833b445f10cea004735910ef0986 (patch) | |
| tree | 1334b3767a292cdbd0483160a52d74978e106585 /src/main/res | |
| parent | 0464a6a3fad6b6976fa924ae4307a5bf93e563c8 (diff) | |
Setting added for parsing emoticons or not
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 9e8e3b3d..72352e7d 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -121,6 +121,8 @@ <string name="pref_confirm_messages">Lesebestätigung senden</string> <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfängst oder liest</string> <string name="pref_ui_options">Benutzeroberfläche</string> + <string name="pref_parse_emoticons">Smilies ersetzen</string> + <string name="pref_parse_emoticons_summary">Zeige Smilie-Bilder anstelle von Emoticons.</string> <string name="openpgp_error">Fehler mit OpenKeychain</string> <string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string> <string name="accept">Annehmen</string> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 45174cd8..bc3c4ece 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -123,6 +123,8 @@ <string name="pref_confirm_messages">Confirm Messages</string> <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> <string name="pref_ui_options">UI Options</string> + <string name="pref_parse_emoticons">Parse Emoticons</string> + <string name="pref_parse_emoticons_summary">Replace emoticons with smilies.</string> <string name="openpgp_error">OpenKeychain reported an error</string> <string name="error_decrypting_file">I/O Error decrypting file</string> <string name="accept">Accept</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 9974f14d..97874738 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -28,6 +28,11 @@ android:key="confirm_messages" android:summary="@string/pref_confirm_messages_summary" android:title="@string/pref_confirm_messages" /> + <CheckBoxPreference + android:defaultValue="true" + android:key="parse_emoticons" + android:summary="@string/pref_parse_emoticons_summary" + android:title="Parse Emoticons"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_notification_settings" > <CheckBoxPreference |