aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <kriztan@users.noreply.github.com>2017-10-16 13:09:51 +0200
committerGitHub <noreply@github.com>2017-10-16 13:09:51 +0200
commit03b7c4b2b74c191b9a274062e94b49d68b41ab9d (patch)
tree3a6ea8f28061e8253e74144cfa14727daf918b12 /src/main/res
parent7832a9db10d7b6bff841281e9461bd66ee5f0439 (diff)
Update strings.xml
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml48
1 files changed, 0 insertions, 48 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 854593908..eb3dc08a7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
- <string name="app_name" translatable="false">Pix-Art Messenger</string>
<string name="action_settings">Settings</string>
<string name="action_add">New conversation</string>
<string name="action_accounts">Manage accounts</string>
@@ -273,53 +272,6 @@
<string name="pref_expert_options">Expert settings</string>
<string name="title_activity_about">About</string>
<string name="pref_about_conversations_summary">Build and licensing information</string>
- <string name="pref_about_message" translatable="false"><b>Pix-Art Messenger</b>
- \n\nCopyright © 2014-2017 Christian Schneppe
- \n\nhttp://jabber.pix-art.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
- (at your option) any later version.
- \n\nThis program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- 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 original source code at https://github.com/siacs/Conversations (Copyright © 2014-2016 Daniel Gultsch)
- \n\nDownload the modified source code at https://github.com/kriztan/Pix-Art-Messenger
- \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)
- \n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT))
- \n\nhttps://github.com/rtreffer/minidns\n(WTFPL)
- \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0)
- \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
- \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
- \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/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
- \n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0)
- \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/jaydeepw/audio-wife\n(The MIT License (MIT))
- \n\nhttps://github.com/google/gson\n(Apache License, Version 2.0)
- \n\nhttps://github.com/google/gcm\n(Apache License, Version 2.0)
- \n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0)
- \n\nhttp://hc.apache.org/httpcomponents-core\n(Apache License, Version 2.0)
- \n\nhttps://github.com/bumptech/glide\n(BSD, The MIT License (MIT) and Apache License, Version 2.0)
- \n\nhttps://github.com/chrisbanes/PhotoView\n(Apache License, Version 2.0)
- \n\nhttps://github.com/rtoshiro/FullscreenVideoView\n(Apache License, Version 2.0)
- \n\nhttps://github.com/mangstadt/ez-vcard\n(FreeBSD)
- \n\nhttps://github.com/googlesamples/easypermissions\n(Apache License, Version 2.0)
- \n\nhttps://github.com/blazsolar/FlowLayout\n(Apache License, Version 2.0)
- \n\nhttps://github.com/vanniktech/Emoji\n(Apache License, Version 2.0)
- \n\nhttps://github.com/ypresto/android-transcoder\n(Apache License, Version 2.0)
- \n\nhttp://www.eclipse.org/jetty/\n(Apache License, Version 2.0 and Eclipse Public License 1.0)
- \n\nhttps://github.com/vdurmont/emoji-java\n(The MIT License)
- </string>
<string name="title_pref_quiet_hours">Quiet Hours</string>
<string name="title_pref_quiet_hours_start_time">Start time</string>
<string name="title_pref_quiet_hours_end_time">End time</string>