moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-15 13:35:04 -05:00
Code Issues Releases Wiki Activity

reformated license a bit

Browse Source
This commit is contained in:
iNPUTmice 2014-11-04 23:47:15 +01:00
parent 0c94804813
commit f8d5d6b2b5
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/res/layout/activity_about.xml
View File

@ -1,7 +1,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context="eu.siacs.conversations.ui.AboutActivity" tools:context="eu.siacs.conversations.ui.AboutActivity"
android:background="@color/secondarybackground" android:background="@color/primarybackground"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
@ -16,6 +16,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:linksClickable="true" android:linksClickable="true"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody"
android:typeface="monospace"/>
</ScrollView> </ScrollView>

32
src/main/res/values/strings.xml
View File

@ -256,26 +256,20 @@
<string name="pref_expert_options_summary">Please be careful with these</string> <string name="pref_expert_options_summary">Please be careful with these</string>
<string name="title_activity_about">About Conversations</string> <string name="title_activity_about">About Conversations</string>
<string name="pref_about_conversations_summary">Build and licensing information</string> <string name="pref_about_conversations_summary">Build and licensing information</string>
<string name="pref_about_message"> <string name="pref_about_message">Conversations © 2014 Daniel Gultsch\n
This program is free software; you can redistribute it and/or modify it \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 under the terms of the GNU General Public License version 3 as published
by the Free Software Foundation.\n by the Free Software Foundation.
\n \nhttps://www.gnu.org/licenses/gpl-3.0.html\n
https://www.gnu.org/licenses/gpl-3.0.html\n \nOpenPGP API is licensed under the Apache License, Version 2.0
\n \nhttps://www.apache.org/licenses/LICENSE-2.0\n
OpenPGP API is licensed under the Apache License, Version 2.0; You may \nMinidns © 2014 Rene Treffer and is provided under the WTFPL
obtain a copy of the License at:\n \nhttp://wtfpl.org\n
\n \nMemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT
https://www.apache.org/licenses/LICENSE-2.0\n License
\n \nhttp://opensource.org/licenses/MIT\n
Minidns © 2014 Rene Treffer and is provided under the WTFPL\n \nDownload the full source code at
\n \nhttps://github.com/siacs/Conversations
http://wtfpl.org\n
\n
MemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT
License\n
\n
http://opensource.org/licenses/MIT\n
</string> </string>
<string name="pref_use_larger_font">Increase font size</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> <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>