diff options
Diffstat (limited to 'src')
66 files changed, 22 insertions, 107 deletions
diff --git a/src/main/res/drawable-hdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-hdpi/ic_announcement_white_24dp.png Binary files differdeleted file mode 100644 index a8e695b48..000000000 --- a/src/main/res/drawable-hdpi/ic_announcement_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_backup_white_24dp.png b/src/main/res/drawable-hdpi/ic_backup_white_24dp.png Binary files differdeleted file mode 100644 index 5e0b464cf..000000000 --- a/src/main/res/drawable-hdpi/ic_backup_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_block_white_24dp.png b/src/main/res/drawable-hdpi/ic_block_white_24dp.png Binary files differdeleted file mode 100644 index 4a61e7a0c..000000000 --- a/src/main/res/drawable-hdpi/ic_block_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-hdpi/ic_bug_report_black_24dp.png Binary files differdeleted file mode 100644 index 1bccb1d11..000000000 --- a/src/main/res/drawable-hdpi/ic_bug_report_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png Binary files differdeleted file mode 100644 index e916e1433..000000000 --- a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png Binary files differdeleted file mode 100644 index 960881383..000000000 --- a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 6b6432cdc..000000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png Binary files differdeleted file mode 100644 index e531d72a5..000000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 62d5a2f2a..000000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_stat_alert_warning.png b/src/main/res/drawable-hdpi/ic_stat_alert_warning.png Binary files differdeleted file mode 100644 index ee3db8080..000000000 --- a/src/main/res/drawable-hdpi/ic_stat_alert_warning.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png Binary files differdeleted file mode 100644 index 233d409dd..000000000 --- a/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-mdpi/ic_announcement_white_24dp.png Binary files differdeleted file mode 100644 index 3bc222e93..000000000 --- a/src/main/res/drawable-mdpi/ic_announcement_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_backup_white_24dp.png b/src/main/res/drawable-mdpi/ic_backup_white_24dp.png Binary files differdeleted file mode 100644 index aa640629a..000000000 --- a/src/main/res/drawable-mdpi/ic_backup_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_block_white_24dp.png b/src/main/res/drawable-mdpi/ic_block_white_24dp.png Binary files differdeleted file mode 100644 index fc2dbd8d7..000000000 --- a/src/main/res/drawable-mdpi/ic_block_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-mdpi/ic_bug_report_black_24dp.png Binary files differdeleted file mode 100644 index 58aef662d..000000000 --- a/src/main/res/drawable-mdpi/ic_bug_report_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png Binary files differdeleted file mode 100644 index 8ab484c80..000000000 --- a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png Binary files differdeleted file mode 100644 index bcaa5d043..000000000 --- a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 7fd1fb8a2..000000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png Binary files differdeleted file mode 100644 index 9efbaae28..000000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 3716466f3..000000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_stat_alert_warning.png b/src/main/res/drawable-mdpi/ic_stat_alert_warning.png Binary files differdeleted file mode 100644 index 4f4400651..000000000 --- a/src/main/res/drawable-mdpi/ic_stat_alert_warning.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png Binary files differdeleted file mode 100644 index f602b630d..000000000 --- a/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-xhdpi/ic_announcement_white_24dp.png Binary files differdeleted file mode 100644 index 27fc191b4..000000000 --- a/src/main/res/drawable-xhdpi/ic_announcement_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_backup_white_24dp.png b/src/main/res/drawable-xhdpi/ic_backup_white_24dp.png Binary files differdeleted file mode 100644 index a9602d11b..000000000 --- a/src/main/res/drawable-xhdpi/ic_backup_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_block_white_24dp.png b/src/main/res/drawable-xhdpi/ic_block_white_24dp.png Binary files differdeleted file mode 100644 index db4aa12a1..000000000 --- a/src/main/res/drawable-xhdpi/ic_block_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.png Binary files differdeleted file mode 100644 index 107f74a20..000000000 --- a/src/main/res/drawable-xhdpi/ic_bug_report_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png Binary files differdeleted file mode 100644 index b0deae04d..000000000 --- a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png Binary files differdeleted file mode 100644 index 5514c9b5e..000000000 --- a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 3afbf6f9d..000000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png Binary files differdeleted file mode 100644 index 87f8de1ca..000000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index d1b6a18c5..000000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_stat_alert_warning.png b/src/main/res/drawable-xhdpi/ic_stat_alert_warning.png Binary files differdeleted file mode 100644 index 083a5ee84..000000000 --- a/src/main/res/drawable-xhdpi/ic_stat_alert_warning.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png Binary files differdeleted file mode 100644 index 1cbd1f45a..000000000 --- a/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_announcement_white_24dp.png Binary files differdeleted file mode 100644 index 4a6b79b24..000000000 --- a/src/main/res/drawable-xxhdpi/ic_announcement_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_backup_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_backup_white_24dp.png Binary files differdeleted file mode 100644 index 3ff57ad3e..000000000 --- a/src/main/res/drawable-xxhdpi/ic_backup_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png Binary files differdeleted file mode 100644 index 23c4c2f4a..000000000 --- a/src/main/res/drawable-xxhdpi/ic_block_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.png Binary files differdeleted file mode 100644 index af8c82e6e..000000000 --- a/src/main/res/drawable-xxhdpi/ic_bug_report_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png Binary files differdeleted file mode 100644 index 39fd447b1..000000000 --- a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png Binary files differdeleted file mode 100644 index 265856880..000000000 --- a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index d9390cedd..000000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png Binary files differdeleted file mode 100644 index 4af4ae634..000000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 83a4093f4..000000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_stat_alert_warning.png b/src/main/res/drawable-xxhdpi/ic_stat_alert_warning.png Binary files differdeleted file mode 100644 index 89a619c98..000000000 --- a/src/main/res/drawable-xxhdpi/ic_stat_alert_warning.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png Binary files differdeleted file mode 100644 index c5adfe791..000000000 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png Binary files differdeleted file mode 100644 index 6b923c95c..000000000 --- a/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_announcement_white_24dp.png Binary files differdeleted file mode 100644 index f46c69894..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_announcement_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_backup_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_backup_white_24dp.png Binary files differdeleted file mode 100644 index 2180f73e8..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_backup_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png Binary files differdeleted file mode 100644 index 6f0ea15bb..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_block_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.png Binary files differdeleted file mode 100644 index 6eb1474e3..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_bug_report_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png Binary files differdeleted file mode 100644 index 69866f053..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png Binary files differdeleted file mode 100644 index 35e5f73d5..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 0c83adda2..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png Binary files differdeleted file mode 100644 index d6761ba16..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 02a34472f..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png Binary files differdeleted file mode 100644 index 267de5f27..000000000 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png +++ /dev/null diff --git a/src/main/res/drawable/account_image_border.xml b/src/main/res/drawable/account_image_border.xml deleted file mode 100644 index e80f50cd5..000000000 --- a/src/main/res/drawable/account_image_border.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <corners android:radius="5dp" /> - - <padding - android:bottom="1.5dp" - android:left="1.5dp" - android:right="1.5dp" - android:top="1.5dp" /> - - <solid android:color="@color/black12" /> - -</shape>
\ No newline at end of file diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 93fe79e05..41cb57aa9 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -95,11 +95,8 @@ <string name="pref_general">Allgemeines</string> <string name="pref_xmpp_resource">XMPP-Ressource</string> <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string> - <string name="pref_accept_files">Dateien annehmen</string> <string name="pref_accept_files_summary_wifi">Im WLAN-Netz Dateien automatisch annehmen, die kleiner sind als …</string> <string name="pref_attachments">Anhänge</string> - <string name="pref_return_to_previous">Schnell-Teilen</string> - <string name="pref_return_to_previous_summary">Nach dem Teilen sofort wieder zur vorherigen App zurückkehren anstatt die Unterhaltung zu öffnen</string> <string name="pref_notification_settings">Benachrichtigung</string> <string name="pref_notifications">Benachrichtigungen</string> <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string> @@ -109,14 +106,12 @@ <string name="pref_led_summary">Blinke bei Erhalt einer neuen Nachricht</string> <string name="pref_sound">Benachrichtigungston</string> <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string> - <string name="pref_advanced_options">Erweitert</string> <string name="pref_send_crash">Absturzberichte senden</string> <string name="pref_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Pix-Art Messenger stetig zu verbessern</string> <string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string> <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</string> <string name="pref_ui_options">Benutzeroberfläche</string> <string name="openpgp_error">Fehler mit OpenKeychain</string> - <string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string> <string name="accept">Annehmen</string> <string name="error">Ein Fehler ist aufgetreten</string> <string name="pref_grant_presence_updates">Online-Status</string> @@ -190,7 +185,6 @@ <string name="last_seen_hours">zul. online vor %d Std.</string> <string name="last_seen_day">zul. online vor 1 Tag</string> <string name="last_seen_days">zul. online vor %d Tagen</string> - <string name="never_seen">noch nie gesehen</string> <string name="install_openkeychain">Verschlüsselte Nachricht. Bitte installiere OpenKeychain zur Entschlüsselung.</string> <string name="unknown_otr_fingerprint">Unbekannter OTR-Fingerabdruck</string> <string name="openpgp_messages_found">Verschlüsselte OpenPGP-Nachricht gefunden</string> @@ -224,7 +218,6 @@ <string name="delete_bookmark">Von Kontaktliste entfernen</string> <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string> <string name="action_edit_subject">Titel dieser Konferenz bearbeiten</string> - <string name="you">Du</string> <string name="leave">Verlassen</string> <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string> <string name="add_back">Auch hinzufügen</string> @@ -262,7 +255,6 @@ <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string> <string name="pref_dont_save_encrypted_summary">Achtung: kann zu Nachrichtenverlust führen</string> <string name="pref_expert_options">Experteneinstellungen</string> - <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string> <string name="title_activity_about">Über Pix-Art Messenger</string> <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string> <string name="title_pref_quiet_hours">Ruhige Stunden</string> @@ -277,8 +269,6 @@ <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häkchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string> <string name="pref_use_send_button_to_indicate_status_summary">\"Senden\"-Schaltfläche einfärben, um den Online-Status des Kontakts anzuzeigen</string> <string name="pref_expert_options_other">Sonstiges</string> - <string name="pref_conference_name">Konferenz-Name</string> - <string name="pref_conference_name_summary">Titel von Konferenzen anstatt JID als Namen verwenden</string> <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string> <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert!</string> <string name="conference_banned">Du wurdest von der Konferenz ausgeschlossen</string> @@ -339,8 +329,6 @@ <string name="no_conference_server_found">Kein Konferenz-Server gefunden</string> <string name="conference_creation_failed">Erstellen der Konferenz fehlgeschlagen!</string> <string name="account_image_description">Profilbild</string> - <string name="secret_accepted">Schlüssel akzeptiert!</string> - <string name="reset">Zurücksetzen</string> <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string> <string name="copy_omemo_clipboard_description">OMEMO-Fingerabdruck in Zwischenablage kopieren</string> <string name="regenerate_omemo_key">OMEMO-Schlüssel erneuern</string> @@ -417,7 +405,6 @@ <string name="sending_x_file">%s wird gesendet</string> <string name="offering_x_file">%s wird angeboten</string> <string name="hide_offline">Offline verstecken</string> - <string name="disable_account">Profil abschalten</string> <string name="is_typing">schreibt…</string> <string name="pref_chat_states">Tipp-Benachrichtigung</string> <string name="pref_chat_states_summary">Informiere deine Kontakte, wenn du eine Nachricht eintippst.</string> @@ -506,9 +493,6 @@ <string name="send_omemo_x509_message">v\\OMEMO-verschlüsselte Nachricht senden</string> <string name="verified_omemo_key_with_certificate">OMEMO Schlüssel mit Zertifikat bestätigt!</string> <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string> - <string name="pref_connection_options">Verbindung</string> - <string name="pref_use_tor">Über TOR verbinden</string> - <string name="pref_use_tor_summary">Alle Verbindungen über das Tor-Netzwerk tunneln. Benötigt Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> <string name="hostname_or_onion">Server- oder .onion-Adresse</string> @@ -549,7 +533,6 @@ <string name="no">Nein</string> <string name="yes">Ja</string> <string name="selection_too_large">Der ausgewählte Bereich ist zu groß</string> - <string name="conference_unknown_error">Unbekannter Fehler</string> <string name="load_more_messages">weitere Nachrichten laden</string> <string name="no_participants">Keine Mitglieder</string> <string name="pref_autojoin">Konferenzen automatisch beitreten</string> @@ -610,7 +593,6 @@ <string name="joining_conference">Konferenz beitreten…</string> <string name="import_database">Backup importieren</string> <string name="import_text">Es wurde ein Backup gefunden, welches importiert werden kann.\nMöglicherweise wirst du gefragt, ob du eine ältere Version oder Conversations deinstallieren möchtest und dein Messenger startet während des Importvorgangs neu. Soll das Backup importiert werden?</string> - <string name="uninstall_app_text">Es ist eine alte Version von Pix-Art Messenger oder Conversations installiert. Falls du einen alten Pix-Art Messenger installiert hast, solltest du diesen deinstallieren. Nach der Deinstallation, solltest du erneut auf \'Backup importieren\' klicken, damit deine Daten in die neue Version importiert werden.</string> <string name="InviteText">Hallo,\n\n%s hat dich zu einem Gespräch mit Pix-Art Messenger eingeladen. Falls du Android Nutzer bist, probiere es aus und klicke folgenden Link…</string> <string name="inviteUser_Subject">hat dich eingeladen über</string> <string name="invite_again">Erneut einladen</string> @@ -620,7 +602,6 @@ <string name="invite_user">In Pix-Art Messenger einladen</string> <string name="request_permissions_message">Pix-Art Messenger wird dich nach ein paar Berechtigungen fragen. Es ist wichtig, dass du alle Berechtigungen erlaubst, um alle Funktionen nutzen zu können. Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string> <string name="request_permissions_message_again">Du hast eine oder alle Berechtigungen, welche für Pix-Art Messenger benötigt werden abgelehnt. Willst du zu den Einstellungen springen, um diese Berechtigungen zu erlauben? Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string> - <string name="request_permissions_title">Pix-Art Messenger Berechtigungen</string> <string name="no_permission">Pix-Art Messenger hat keine Berechtigungen</string> <string name="openpgp_key_id">OpenPGP Schlüssel ID</string> <string name="otr_fingerprint_selected_message">OTR Fingerabdruck der Nachricht</string> @@ -643,7 +624,6 @@ <string name="compressing_video">Video wird komprimiert, bitte warten…</string> <string name="preparing_video">Video wird für die Übertragung vorbereitet. Bitte warten…</string> <string name="shared_video_with_x">Video mit %s geteilt</string> - <string name="unread_messages">Ungelesene Nachrichten:</string> <string name="error_file_corrupt">Die Datei scheint defekt zu sein.</string> <string name="me">Ich</string> <string name="missing_internet_permission">Fehlende Berechtigung für den Zugriff auf das Internet</string> diff --git a/src/main/res/values-w300dp/dimens.xml b/src/main/res/values-w300dp/dimens.xml index 28341a395..7abc06d3b 100644 --- a/src/main/res/values-w300dp/dimens.xml +++ b/src/main/res/values-w300dp/dimens.xml @@ -1,3 +1 @@ -<resources> - <dimen name="conversations_overview_width">276dp</dimen> -</resources> +<resources></resources> diff --git a/src/main/res/values-w360dp/dimens.xml b/src/main/res/values-w360dp/dimens.xml index 7e37ae16e..7abc06d3b 100644 --- a/src/main/res/values-w360dp/dimens.xml +++ b/src/main/res/values-w360dp/dimens.xml @@ -1,3 +1 @@ -<resources> - <dimen name="conversations_overview_width">304dp</dimen> -</resources> +<resources></resources> diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml index 5026848e3..7abc06d3b 100644 --- a/src/main/res/values-w384dp/dimens.xml +++ b/src/main/res/values-w384dp/dimens.xml @@ -1,3 +1 @@ -<resources> - <dimen name="conversations_overview_width">336dp</dimen> -</resources> +<resources></resources> diff --git a/src/main/res/values-w585dp/dimens.xml b/src/main/res/values-w585dp/dimens.xml index df6525e6e..38ca33a11 100644 --- a/src/main/res/values-w585dp/dimens.xml +++ b/src/main/res/values-w585dp/dimens.xml @@ -1,4 +1,3 @@ <resources> - <dimen name="conversations_overview_width">416dp</dimen> <dimen name="activity_horizontal_margin">32dp</dimen> </resources> diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index c30be285b..46a1542eb 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -84,15 +84,4 @@ <item>@string/presence_dnd</item> </string-array> - <string-array name="grace_periods"> - <item>@string/gp_short</item> - <item>@string/gp_medium</item> - <item>@string/gp_long</item> - </string-array> - - <string-array name="grace_periods_values"> - <item>144</item> - <item>610</item> - <item>2584</item> - </string-array> </resources> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 5ecfacaac..4a7f235d9 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -7,15 +7,13 @@ <color name="accent">#ff2e4272</color> <color name="black87">#de000309</color> <color name="black54">#8a000309</color> - <color name="black26">#42000309</color> - <color name="black12">#1f000000</color> + <color name="black12">#1f000000</color> <color name="white">#ffe2e7f1</color> <color name="white70">#b2e2e7f1</color> <color name="grey50">#fafafa</color> <color name="grey200">#ffeeeeee</color> <color name="grey500">#ff9e9e9e</color> <color name="grey800">#ff424242</color> - <color name="red500">#fff44336</color> - <color name="red800">#ffc62828</color> + <color name="red800">#ffc62828</color> <color name="orange500">#ffff9800</color> </resources> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 006d43c2c..da216ef21 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -3,7 +3,6 @@ <dimen name="activity_horizontal_margin">8dp</dimen> <dimen name="activity_vertical_margin">8dp</dimen> <dimen name="infocard_padding">16dp</dimen> - <dimen name="conversations_overview_width">288dp</dimen> - <dimen name="image_button_padding">8dp</dimen> + <dimen name="image_button_padding">8dp</dimen> <dimen name="elv_touch_slop">64dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4b3cd95b6..6dbf53d3f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -107,9 +107,7 @@ <string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string> <string name="pref_accept_files_summary_mobileroaming">When connected with mobile data in roaming automatically accept files smaller than…</string> <string name="pref_attachments">Attachments</string> - <string name="pref_return_to_previous">Quick Sharing</string> - <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> - <string name="pref_notification_settings">Notification</string> + <string name="pref_notification_settings">Notification</string> <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notify when a new message arrives</string> <string name="pref_vibrate">Vibrate</string> @@ -118,17 +116,13 @@ <string name="pref_led_summary">Blink notification light when a new message arrives</string> <string name="pref_sound">Ringtone</string> <string name="pref_sound_summary">Play sound when a new message arrives</string> - <string name="pref_notification_grace_period">Grace Period</string> - <string name="pref_notification_grace_period_summary">The length of time Conversations keeps quiet after seeing activity on another device</string> - <string name="pref_advanced_options">Advanced</string> - <string name="pref_send_crash">Send crash reports</string> + <string name="pref_send_crash">Send crash reports</string> <string name="pref_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</string> <string name="openpgp_error">OpenKeychain reported an error</string> - <string name="error_decrypting_file">I/O Error decrypting file</string> - <string name="accept">Accept</string> + <string name="accept">Accept</string> <string name="error">An error has occurred</string> <string name="pref_grant_presence_updates">Grant presence updates</string> <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string> @@ -203,8 +197,7 @@ <string name="last_seen_hours">%d hours ago</string> <string name="last_seen_day">1 day ago</string> <string name="last_seen_days">%d days ago</string> - <string name="never_seen">never seen</string> - <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string> + <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string> <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string> <string name="openpgp_messages_found">OpenPGP encrypted messages found</string> <string name="your_fingerprint">Your fingerprint</string> @@ -280,8 +273,7 @@ <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string> <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> <string name="pref_expert_options">Expert settings</string> - <string name="pref_expert_options_summary">Please be careful with these</string> - <string name="title_activity_about">About Pix-Art Messenger</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">Pix-Art Messenger \n\nCopyright © 2014-2016 Christian Schneppe @@ -338,9 +330,7 @@ <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string> <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> <string name="pref_expert_options_other">Other</string> - <string name="pref_conference_name">Conference name</string> - <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string> - <string name="pref_autojoin">Automatically join conferences</string> + <string name="pref_autojoin">Automatically join conferences</string> <string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string> <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string> <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string> @@ -348,8 +338,7 @@ <string name="conference_members_only">This conference is members only</string> <string name="conference_kicked">You have been kicked from this conference</string> <string name="conference_shutdown">The conference was shut down</string> - <string name="conference_unknown_error">You are no longer in this conference</string> - <string name="using_account">using account %s</string> + <string name="using_account">using account %s</string> <string name="checking_x">Checking %s on HTTP host</string> <string name="not_connected_try_again">You are not connected. Try again later</string> <string name="check_x_filesize">Check %s size</string> @@ -405,9 +394,7 @@ <string name="enable_notifications">Enable notifications</string> <string name="no_conference_server_found">No conference server found</string> <string name="conference_creation_failed">Conference creation failed!</string>s - <string name="secret_accepted">Secret accepted!</string> - <string name="reset">Reset</string> - <string name="account_image_description">Account avatar</string> + <string name="account_image_description">Account avatar</string> <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string> <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string> <string name="regenerate_omemo_key">Regenerate OMEMO key</string> @@ -484,8 +471,7 @@ <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="is_typing">is typing…</string> + <string name="is_typing">is 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> <string name="send_location">Send location</string> @@ -566,10 +552,7 @@ <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_connection_options">Connection</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> - <string name="account_settings_hostname">Hostname</string> + <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> <string name="hostname_or_onion">Server- or .onion-Address</string> <string name="not_a_valid_port">This is not a valid port number</string> @@ -661,20 +644,13 @@ <string name="creating_conference">Creating conference…</string> <string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string> <string name="import_database">Import backup</string> - <string name="uninstall_app_text">There is an old version of Pix-Art Messenger or Conversations installed. If you have an old Pix-Art Messenger installed, you should uninstall this version. After uninstalled the old versoin, you should choose \'import backup\' again and we will import your data to the new version.</string> - <string name="you">You</string> - <string name="invite_again">Invite again</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="gp_short">Short</string> - <string name="gp_medium">Medium</string> - <string name="gp_long">Long</string> - <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</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="pref_privacy">Privacy</string> - <string name="invite_user">Invite to Pix-Art Messenger</string> - <string name="request_permissions_title">Pix-Art Messenger permissions</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="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> <string name="no_permission">Pix-Art Messenger has no permissions</string> @@ -702,8 +678,7 @@ <string name="preparing_video">Prepare video for transmission. Please wait…</string> <string name="compressing_video">Compressing video, please wait…</string> <string name="shared_video_with_x">Shared video with %s</string> - <string name="unread_messages">Unread messages:</string> - <string name="no_permission_to_access_x">No permission to access %s</string> + <string name="no_permission_to_access_x">No permission to access %s</string> <string name="remote_server_not_found">Remote server not found</string> <string name="error_file_corrupt">This file seems to be corrupt.</string> <string name="unable_to_update_account">Unable to update account</string> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e8572d9d4..5c0808d04 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,9 +1,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="Divider"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">1.5dp</item> - <item name="android:background">@color/black12</item> - </style> + <style name="MD"> <item name="animationVelocity">6</item> <item name="insetBottom">16dp</item> |
