diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-04 19:57:46 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-04 19:57:46 +0100 |
| commit | 9265d6718e83e2d8d29809cbec4f8fb1f3a29960 (patch) | |
| tree | bbaba52f2371db74c1dd0893f881a85d18df419e /src/main/res/values | |
| parent | ca0d68224ec804cac739ed955390aa7f6a585856 (diff) | |
| parent | 909dac7ac2bd2e76b2514a7bc6044e918abdf13f (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/values')
| -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 3bba4c9d..40ff6707 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -284,8 +284,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-2015 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 @@ -296,7 +296,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) @@ -308,6 +309,8 @@ \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) \n\nhttps://github.com/timroes/EnhancedListView\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> |