diff options
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 53 |
3 files changed, 39 insertions, 19 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index ca63a0f12..0f2dbb1a4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -5,7 +5,7 @@ <item>Mobile</item> <item>Phone</item> <item>Tablet</item> - <item>Conversations</item> + <item>Pix-Art Messenger</item> <item>Android</item> </string-array> <string-array name="filesizes"> @@ -17,7 +17,7 @@ <item>10 MiB</item> </string-array> <string-array name="filesizes_values"> - <item>0</item> + <item>1</item> <item>262144</item> <item>524288</item> <item>1048576</item> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index b3567b44c..35f72d9aa 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -10,6 +10,7 @@ <color name="white">#ffffffff</color> <color name="white70">#b2ffffff</color> <color name="grey50">#fffafafa</color> + <color name="lightyellow">#ffF7F2E0</color> <color name="grey200">#ffeeeeee</color> <color name="grey500">#ff9e9e9e</color> <color name="grey800">#ff424242</color> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4949fba3c..ceddf390f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">Conversations</string> + <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> @@ -60,8 +60,8 @@ <string name="unblock">Unblock</string> <string name="save">Save</string> <string name="ok">OK</string> - <string name="crash_report_title">Conversations has crashed</string> - <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Conversations\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string> + <string name="crash_report_title">Pix-Art Messenger has crashed</string> + <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string> <string name="send_now">Send now</string> <string name="send_never">Never ask again</string> <string name="problem_connecting_to_account">Unable to connect to account</string> @@ -88,16 +88,16 @@ <string name="send_unencrypted">Send unencrypted</string> <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string> <string name="openkeychain_required">OpenKeychain</string> - <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string> + <string name="openkeychain_required_long">Pix-Art Messenger utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Pix-Art Messenger afterwards.)</small></string> <string name="restart">Restart</string> <string name="install">Install</string> <string name="openkeychain_not_installed">Please install OpenKeychain</string> <string name="offering">offering…</string> <string name="waiting">waiting…</string> <string name="no_pgp_key">No OpenPGP Key found</string> - <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string> + <string name="contact_has_no_pgp_key">Pix-Art Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string> <string name="no_pgp_keys">No OpenPGP Keys found</string> - <string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string> + <string name="contacts_have_no_pgp_keys">Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string> <string name="encrypted_message_received"><i>Encrypted message received. Touch to decrypt.</i></string> <string name="pref_general">General</string> <string name="pref_xmpp_resource">XMPP resource</string> @@ -115,7 +115,7 @@ <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string> <string name="pref_advanced_options">Advanced Options</string> <string name="pref_never_send_crash">Never send crash reports</string> - <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string> + <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string> <string name="pref_confirm_messages">Confirm Messages</string> <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> <string name="pref_ui_options">UI Options</string> @@ -283,10 +283,10 @@ <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> <string name="pref_expert_options">Expert options</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 Pix-Art Messenger</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. + <string name="pref_about_message" translatable="false">Pix-Art Messenger is a fork of Conversations. + \n\nConversations • the very last word in instant messaging. \n\nCopyright © 2014-2016 Daniel Gultsch \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 @@ -298,7 +298,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\nDownload the full original source code at https://github.com/siacs/Conversations + \n\nDownload the forked and modified source code at https://github.com/kriztan/Conversations \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) @@ -368,7 +369,7 @@ <string name="verified">Verified!</string> <string name="smp_requested">Contact requested SMP verification</string> <string name="no_otr_session_found">No valid OTR session has been found!</string> - <string name="conversations_foreground_service">Conversations</string> + <string name="conversations_foreground_service">Pix-Art Messenger</string> <string name="pref_keep_foreground_service">Keep service in foreground</string> <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string> <string name="pref_export_logs">Export Logs</string> @@ -473,13 +474,14 @@ <string name="vcard">Contact</string> <string name="received_x_file">Received %s</string> <string name="disable_foreground_service">Disable foreground service</string> - <string name="touch_to_open_conversations">Touch to open Conversations</string> + <string name="touch_to_open_conversations">Touch to open Pix-Art Messenger</string> <string name="avatar_has_been_published">Avatar has been published!</string> <string name="sending_x_file">Sending %s</string> <string name="offering_x_file">Offering %s</string> <string name="hide_offline">Hide offline</string> <string name="disable_account">Disable Account</string> <string name="contact_is_typing">%s is typing…</string> + <string name="is_typing">is typing…</string> <string name="contact_has_stopped_typing">%s has stopped typing</string> <string name="pref_chat_states">Typing notifications</string> <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string> @@ -520,14 +522,26 @@ <string name="download_failed_server_not_found">Download failed: Server not found</string> <string name="download_failed_file_not_found">Download failed: File not found</string> <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> + <string name="elv_undo">undo</string> <string name="pref_use_white_background">Use white background</string> <string name="pref_use_white_background_summary">Show received messages as black text on a white background</string> + <string name="action_check_update">Check for Updates</string> + <string name="title_activity_updater">Update Service</string> + <string name="update_available">Pix-Art Messenger %1$s with the following changes is available:\n\n%2$s\n\nUpdate Pix-Art Messenger %3$s to Pix-Art Messenger %1$s now?</string> + <string name="checking_for_updates">Checking for Pix-Art Messenger updates</string> + <string name="remind_later">later</string> + <string name="update">update</string> + <string name="new_version">New version:</string> + <string name="current_version">installed version:</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="server_info_broken">Broken</string> <string name="pref_presence_settings">Presence settings</string> <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_xa_on_silent_mode">Not available in silent mode</string> + <string name="update_info">Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.</string> <string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when device is in silent mode</string> <string name="action_add_account_with_certificate">Add account with certificate</string> <string name="unable_to_parse_certificate">Unable to parse certificate</string> @@ -541,6 +555,11 @@ <string name="error_fetching_omemo_key">Error fetching OMEMO key!</string> <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string> <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> + <string name="changelog">Changes</string> + <string name="pref_plugins">Plugins</string> + <string name="pref_plugins_summary">Download plugins for Pix-Art Messenger</string> + <string name="pref_plugin_location">Share-Location</string> + <string name="pref_plugin_location_summary">Send and receive locations</string> <string name="pref_connection_options">Connection options</string> <string name="pref_use_tor">Connect via Tor</string> <string name="pref_use_tor_summary">Tunnel all connections through the Tor network. Requires Orbot</string> @@ -556,15 +575,15 @@ </plurals> <string name="shared_file_with_x">Shared file with %s</string> <string name="shared_image_with_x">Shared image with %s</string> - <string name="no_storage_permission">Conversations need access to external storage</string> + <string name="no_storage_permission">Pix-Art Messenger needs access to external storage</string> <string name="sync_with_contacts">Synchronize with contacts</string> - <string name="sync_with_contacts_long">Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string> + <string name="sync_with_contacts_long">Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string> <string name="certificate_information">Certificate Information</string> <string name="certificate_subject">Subject</string> <string name="certificate_issuer">Issuer</string> <string name="certificate_cn">Common Name</string> <string name="certificate_o">Organization</string> - <string name="certificate_sha1">SHA1</string> + <string name="certificate_sha1" translatable="false">SHA1</string> <string name="certicate_info_not_available">(Not available)</string> <string name="certificate_not_found">No certificate found</string> <string name="notify_on_all_messages">Notify on all messages</string> |