diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-04 23:47:15 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-04 23:47:15 +0100 |
| commit | f8d5d6b2b58286dd31be2bc8db100d570b58c51f (patch) | |
| tree | 9e4b56af4618bcd05f44780afd69502ccfa7e6ac | |
| parent | 0c948048130165a9511c2ffd24848231f68661e6 (diff) | |
reformated license a bit
| -rw-r--r-- | src/main/res/layout/activity_about.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 32 |
2 files changed, 16 insertions, 22 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 06a4992a..bd76457f 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,7 +1,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context="eu.siacs.conversations.ui.AboutActivity" - android:background="@color/secondarybackground" + android:background="@color/primarybackground" android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" @@ -16,6 +16,6 @@ android:layout_height="wrap_content" android:linksClickable="true" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" /> - + android:textSize="?attr/TextSizeBody" + android:typeface="monospace"/> </ScrollView> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 547659b4..28a1e326 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -256,26 +256,20 @@ <string name="pref_expert_options_summary">Please be careful with these</string> <string name="title_activity_about">About Conversations</string> <string name="pref_about_conversations_summary">Build and licensing information</string> - <string name="pref_about_message"> - This program is free software; you can redistribute it and/or modify it + <string name="pref_about_message">Conversations © 2014 Daniel Gultsch\n + \nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as published - by the Free Software Foundation.\n - \n - https://www.gnu.org/licenses/gpl-3.0.html\n - \n - OpenPGP API is licensed under the Apache License, Version 2.0; You may - obtain a copy of the License at:\n - \n - https://www.apache.org/licenses/LICENSE-2.0\n - \n - Minidns © 2014 Rene Treffer and is provided under the WTFPL\n - \n - http://wtfpl.org\n - \n - MemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT - License\n - \n - http://opensource.org/licenses/MIT\n + by the Free Software Foundation. + \nhttps://www.gnu.org/licenses/gpl-3.0.html\n + \nOpenPGP API is licensed under the Apache License, Version 2.0 + \nhttps://www.apache.org/licenses/LICENSE-2.0\n + \nMinidns © 2014 Rene Treffer and is provided under the WTFPL + \nhttp://wtfpl.org\n + \nMemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT + License + \nhttp://opensource.org/licenses/MIT\n + \nDownload the full source code at + \nhttps://github.com/siacs/Conversations </string> <string name="pref_use_larger_font">Increase font size</string> <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string> |