diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-24 13:11:24 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-24 13:11:24 +0100 |
| commit | 2803cbda260b54397edf34befaf8a29e55ffde30 (patch) | |
| tree | c95322c0b408aa91ec15e3d34ad9423388878816 | |
| parent | 8b0ffd048e39b928d4bdbd964e1a89735c358e80 (diff) | |
Fixes FS#89 after merge conflict
| -rw-r--r-- | src/main/res/values/strings.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index daffdbf4..ef2249bc 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -300,8 +300,8 @@ <string name="title_activity_about">About Conversations</string> <string name="pref_about_conversations_summary">Build and licensing information</string> <string name="pref_about_message" translatable="false"> - Conversations • the very last word in instant messaging. - \n\nCopyright © 2014-2016 Daniel Gultsch + Conversations+ is the improved version of Conversations. + \n\nThe extensions are designed and developed by thedevstack.de \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -312,7 +312,8 @@ GNU General Public License for more details. \n\nYou should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses - \n\nDownload the full source code at https://github.com/siacs/Conversations + \n\nBased on + \n\nhttps://github.com/siacs/Conversations\n(GPL, Version 3.0) \n\n\nLibraries \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0) @@ -329,6 +330,8 @@ \n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3) \n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0) \n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0) + \n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0) + \n\nhttps://github.com/yukuku/ambilwarna\n(Apache License, Version 2.0) </string> <string name="title_pref_quiet_hours">Quiet Hours</string> <string name="title_pref_quiet_hours_start_time">Start time</string> |