aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-08-13 21:56:52 +0200
committerChristian Schneppe <christian@pix-art.de>2016-08-13 21:56:52 +0200
commitf382943d696f0c05d3a73436bfbd735263d22fda (patch)
tree89d40c09967a47a6c76f34d87ae0fc254f90b433 /src/main/res
parent44bf3cfb2d8e05d27ab1060a9f39333c97b15221 (diff)
make human readable logs export optional and false as default
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml2
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml16
3 files changed, 15 insertions, 5 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d8d800007..8fd2fe175 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -638,5 +638,7 @@
<string name="import_canceled">Import abgebrochen</string>
<string name="databaseimport_started">Backup wird importiert, dies wird eine Weile dauern.</string>
<string name="please_wait">Bitte warten…</string>
+ <string name="pref_export_plain_text_logs">Exportiere Chats als lesbare Text-Dateien</string>
+ <string name="pref_export_plain_text_logs_summary">Aktiviere den Export von Chats als lesbare Text-Dateien</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 11dc0a58b..b2aaaf2c9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -683,4 +683,6 @@
<string name="enter_account_password">Please enter your account password to import your backup.</string>
<string name="please_wait">Please wait…</string>
<string name="databaseimport_started">Backup will be imported, this may take awhile.</string>
+ <string name="pref_export_plain_text_logs_summary">Enable an export of chat logs as human readable text files</string>
+ <string name="pref_export_plain_text_logs">Export human readable chat logs</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 20259f8ce..8c0ca30cd 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -172,7 +172,17 @@
android:key="crashreport"
android:summary="@string/pref_send_crash_summary"
android:title="@string/pref_send_crash" />
-
+ <PreferenceCategory android:title="@string/pref_export_logs">
+ <de.pixart.messenger.ui.ExportLogsPreference
+ android:key="export_logs"
+ android:summary="@string/pref_export_logs_summary"
+ android:title="@string/pref_export_logs" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="export_plain_text_logs"
+ android:summary="@string/pref_export_plain_text_logs_summary"
+ android:title="@string/pref_export_plain_text_logs" />
+ </PreferenceCategory>
</PreferenceScreen>
<!--Expert-->
<PreferenceScreen
@@ -229,10 +239,6 @@
android:key="autojoin"
android:summary="@string/pref_autojoin_summary"
android:title="@string/pref_autojoin" />
- <de.pixart.messenger.ui.ExportLogsPreference
- android:key="export_logs"
- android:summary="@string/pref_export_logs_summary"
- android:title="@string/pref_export_logs" />
</PreferenceCategory>
</PreferenceScreen>
<!--About-->