diff options
author | steckbrief <steckbrief@chefmail.de> | 2019-07-13 20:57:51 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2019-07-13 20:57:51 +0200 |
commit | f23453c0a76219b71094214c95fef674de6ce4e2 (patch) | |
tree | 22de3cd6b7fd83f4e589a210f7c0c97f8cbcc56f /src/main/res/values | |
parent | d288d6bb16164b5dca36e3559fde7220d3878e90 (diff) |
implements FS#276: Remove 'Invite to Pix-Art Messenger'
Diffstat (limited to 'src/main/res/values')
-rw-r--r-- | src/main/res/values/defaults.xml | 18 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 6 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 040f0185e..e1534905b 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -6,9 +6,9 @@ <string name="type_tablet" translatable="false">Tablet</string> <string name="type_web" translatable="false">Web browser</string> <string name="type_console" translatable="false">Console</string> - <string name="pref_about_message" translatable="false"><b>Pix-Art Messenger</b> - \n\nCopyright © 2014-2019 Christian Schneppe - \n\nhttp://jabber.pix-art.de + <string name="pref_about_message" translatable="false"><b>PiratX Messenger</b> + PiratX is a privacy focused and improved version of Pix-Art Messenger which is based on 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 @@ -19,10 +19,6 @@ 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-2019 Daniel Gultsch) - \n\nDownload the modified source code at https://github.com/kriztan/Pix-Art-Messenger - \n\nPix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im - \n\nYou can support me by making a donation in form of a gift in sense of § 516 ff BGB i.e. a gratuitous donation. </string> <string name="pref_about_libraries" translatable="false"><b>Libraries</b> \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) @@ -116,12 +112,12 @@ <bool name="prefer_xmpp_avatar">true</bool> <bool name="show_links_inside">true</bool> <bool name="show_maps_inside">true</bool> - <bool name="use_internal_updater">true</bool> + <bool name="use_internal_updater">false</bool> <bool name="show_own_accounts">true</bool> <string-array name="domains"> - <item>pix-art.de</item> - <item>conversations.im</item> + <item>jabber.thedevstack.de</item> + <item>jabber.thehappy.de</item> <item>jabber.cat</item> <item>jabbers.one</item> <item>jabjab.de</item> @@ -240,6 +236,8 @@ <item>nsa.li</item> <item>blabber.im</item> <item>buzon.uy</item> + <item>pix-art.de</item> + <item>conversations.im</item> </string-array> <string-array name="support_domains"> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ba865ca52..dcc68a415 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -434,10 +434,8 @@ <string name="download_failed_could_not_write_file">Download failed: Could not write file</string> <string name="action_check_update">Check for Updates</string> <string name="title_activity_updater">Update service</string> - <string name="update_available">Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?</string> <string name="remind_later">later</string> <string name="update">update</string> - <string name="no_update_available">No update available</string> <string name="download_started">Download started</string> <string name="account_status_tor_unavailable">Tor network unavailable</string> <string name="account_status_bind_failure">Bind failure</string> @@ -447,7 +445,6 @@ <string name="pref_away_when_screen_off">Away when screen is off</string> <string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string> <string name="pref_dnd_on_silent_mode">\"Do not disturb\" in silent mode</string> - <string name="update_info">Pix-Art Messenger is downloading and installing the new version automatically.\n\nPlease wait…</string> <string name="pref_dnd_on_silent_mode_summary">Marks your resource as \"Do not disturb\" when device is in silent mode</string> <string name="pref_treat_vibrate_as_silent">Treat vibrate as silent mode</string> <string name="pref_treat_vibrate_as_dnd_summary">Marks your resource as \"Do not disturb\" when device is on vibrate</string> @@ -544,11 +541,9 @@ <string name="import_text">If there is a backup available you can import this by pressing the button below.</string> <string name="import_database">Import backup</string> <string name="invite_again">Invite again</string> - <string name="inviteUser_Subject">has invited you via</string> <string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string> <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string> <string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Pix-Art Messenger</string> - <string name="invite_user">Invite to Pix-Art Messenger</string> <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string> <string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string> <string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string> @@ -681,7 +676,6 @@ <string name="server_info_partial">partial</string> <string name="pref_show_foreground_service_summary">Some Android devices will close some apps after a period of time and you won’t be able to receive new messages. If you have such problems, try to activate the foreground service. But keep in mind, that you will have a permanent notification with this option checked.</string> <string name="pref_show_foreground_service">Use foreground service</string> - <string name="update_service">Pix-Art Messenger update service</string> <string name="install_update">Install update?</string> <string name="highlight_in_muc">highlight user</string> <string name="no_application_found_to_open_link">No application found to open link</string> |