diff options
Diffstat (limited to 'src/main/res')
35 files changed, 77 insertions, 26 deletions
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 differnew file mode 100644 index 000000000..4c7a7c59f --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png 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 differnew file mode 100644 index 000000000..29e8bfd32 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png 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 differnew file mode 100644 index 000000000..00e7d0743 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png 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 differnew file mode 100644 index 000000000..558f0ea32 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png Binary files differindex 220463fc7..4439d1aec 100644 --- a/src/main/res/drawable-hdpi/ic_secure_indicator.png +++ b/src/main/res/drawable-hdpi/ic_secure_indicator.png diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator_white.png b/src/main/res/drawable-hdpi/ic_secure_indicator_white.png Binary files differdeleted file mode 100644 index 46eb1195b..000000000 --- a/src/main/res/drawable-hdpi/ic_secure_indicator_white.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 differnew file mode 100644 index 000000000..c8b6fe712 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png 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 differnew file mode 100644 index 000000000..1265e98e1 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png 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 differnew file mode 100644 index 000000000..ebd96073b --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png 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 differnew file mode 100644 index 000000000..e23c42db9 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png Binary files differdeleted file mode 100644 index 690d4d03d..000000000 --- a/src/main/res/drawable-mdpi/ic_secure_indicator.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator_white.png b/src/main/res/drawable-mdpi/ic_secure_indicator_white.png Binary files differdeleted file mode 100644 index e2f894ef4..000000000 --- a/src/main/res/drawable-mdpi/ic_secure_indicator_white.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 differnew file mode 100644 index 000000000..0888c6173 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png 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 differnew file mode 100644 index 000000000..b94735ecb --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png 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 differnew file mode 100644 index 000000000..b33c964d2 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png 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 differnew file mode 100644 index 000000000..3ee3e1720 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png Binary files differdeleted file mode 100644 index cd0d1391a..000000000 --- a/src/main/res/drawable-xhdpi/ic_secure_indicator.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png Binary files differdeleted file mode 100644 index b624a8ce6..000000000 --- a/src/main/res/drawable-xhdpi/ic_secure_indicator_white.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 differnew file mode 100644 index 000000000..dbcf3f33d --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png 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 differnew file mode 100644 index 000000000..895aabbfa --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png 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 differnew file mode 100644 index 000000000..66d25296d --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png 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 differnew file mode 100644 index 000000000..9d7f2ff90 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png Binary files differdeleted file mode 100644 index 6a74ccbef..000000000 --- a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png Binary files differdeleted file mode 100644 index 4945c9595..000000000 --- a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.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 differnew file mode 100644 index 000000000..c49d420e0 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png 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 differnew file mode 100644 index 000000000..0dcada814 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png 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 differnew file mode 100644 index 000000000..827b68480 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png 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 differnew file mode 100644 index 000000000..34ec7092f --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 7d4a0993b..f8a8853ab 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -93,7 +93,17 @@ android:layout_marginRight="4sp" android:alpha="0.70" android:gravity="center_vertical" - android:src="@drawable/ic_secure_indicator_white" /> + android:src="@drawable/ic_lock_white_18dp" /> + + <ImageView + android:id="@+id/edit_indicator" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginRight="4sp" + android:alpha="0.70" + android:gravity="center_vertical" + android:src="@drawable/ic_mode_edit_white_18dp" /> <TextView android:id="@+id/message_time" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index c3aa62528..5ffb33114 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -93,7 +93,17 @@ android:layout_marginLeft="4sp" android:alpha="0.54" android:gravity="center_vertical" - android:src="@drawable/ic_secure_indicator" /> + android:src="@drawable/ic_lock_black_18dp" /> + + <ImageView + android:id="@+id/edit_indicator" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4sp" + android:alpha="0.54" + android:gravity="center_vertical" + android:src="@drawable/ic_mode_edit_black_18dp" /> <ImageView android:id="@+id/indicator_received" diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 4e1316d39..0d4e66efc 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -6,6 +6,10 @@ android:title="@string/copy_text" android:visible="false"/> <item + android:id="@+id/correct_message" + android:title="@string/correct_message" + android:visible="false"/> + <item android:id="@+id/share_with" android:title="@string/share_with" android:visible="false"/> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 44c64261f..697ddcdb0 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -101,7 +101,7 @@ <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">Dateien automatisch annehmen, die kleiner sind als …</string> - <string name="pref_notification_settings">Benachrichtigungen</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> <string name="pref_vibrate">Vibrieren</string> @@ -110,7 +110,7 @@ <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string> <string name="pref_notification_grace_period">Gnadenfrist</string> <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string> - <string name="pref_advanced_options">Erweiterte Optionen</string> + <string name="pref_advanced_options">Erweitert</string> <string name="pref_never_send_crash">Niemals Absturzberichte senden</string> <string name="pref_never_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> @@ -190,6 +190,7 @@ <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatare/OMEMO)</string> <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string> + <string name="server_info_push">XEP-0357: Push</string> <string name="server_info_available">ja</string> <string name="server_info_unavailable">nein</string> <string name="missing_public_keys">Öffentlicher Schlüssel fehlt</string> @@ -237,6 +238,7 @@ <string name="you">Du</string> <string name="action_edit_subject">Konferenz-Thema bearbeiten</string> <string name="conference_not_found">Konferenz nicht gefunden</string> + <string name="conference_unknown_error">Unbekannter Fehler</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> @@ -271,12 +273,14 @@ <string name="sure_delete_fingerprint">Soll dieser Fingerabdruck wirklich gelöscht werden?</string> <string name="ignore">Ignorieren</string> <string name="without_mutual_presence_updates"><b>Achtung:</b> Ohne gegenseitige Kenntnis des Online-Status kann es zu unerwarteten Problemen kommen.\n\n<small>Bitte die Einstellungen in den Kontakt-Details prüfen.</small></string> - <string name="pref_encryption_settings">Verschlüsselungs-Einstellungen</string> + <string name="pref_security_settings">Sicherheit</string> <string name="pref_force_encryption">Ende-zu-Ende-Verschlüsselung erzwingen</string> <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string> + <string name="pref_allow_message_correction">Nachrichtenkorrektur erlauben</string> + <string name="pref_allow_message_correction_summary">Erlaube Deinen Kontakten das nachträgliche Korrigieren ihrer Nachrichten</string> <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">Einstellungen für Experten</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> @@ -294,6 +298,8 @@ <string name="pref_expert_options_other">Sonstiges</string> <string name="pref_conference_name">Konferenz-Name</string> <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string> + <string name="pref_autojoin">Unterhaltung automatisch beitreten</string> + <string name="pref_autojoin_summary">Autojoin-Flag in Konferenzlesezeichen beachten</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> @@ -424,7 +430,7 @@ <string name="two_hours">2 Stunden</string> <string name="eight_hours">8 Stunden</string> <string name="until_further_notice">Bis auf Weiteres</string> - <string name="pref_input_options">Eingabe-Optionen</string> + <string name="pref_input_options">Eingabe</string> <string name="pref_enter_is_send">Eingabe-Taste (Enter) sendet Nachricht</string> <string name="pref_enter_is_send_summary">Eingabe-Taste (Enter) zum Versenden einer Nachricht verwenden</string> <string name="pref_display_enter_key">Zeige Eingabe-Taste (Enter)</string> @@ -501,14 +507,21 @@ <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string> <string name="server_info_broken">Fehlerhaft</string> <string name="update_info">Conversation prüft auf eine neuere Version. Wenn ein Update verfügbar ist, wirst du gefragt, ob du deine Version aktualisieren möchtest. Der Update Dienst lädt und installiert die neue Version automatisch.</string> - <string name="pref_presence_settings">Status Einstellungen</string> + <string name="pref_presence_settings">Status</string> <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string> <string name="pref_away_when_screen_off_summary">Setzt deinen Status auf \"abwesend\", solange dein Bildschirm abgeschaltet ist</string> <string name="pref_xa_on_silent_mode">Nicht verfügbar bei Stummschaltung</string> <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Telefon lautlos ist</string> + <string name="pref_show_connection_options">Erweiterte Verbindungs-Optionen</string> + <string name="pref_show_connection_options_summary">Hostname- und Port-Optionen bei Kontoeinrichtung anzeigen</string> + <string name="hostname_example">xmpp.domain.de</string> <string name="action_add_account_with_certificate">Konto mit Zertifikat hinzufügen</string> <string name="unable_to_parse_certificate">Zertifikat kann nicht gelesen werden</string> <string name="authenticate_with_certificate">Leer lassen, um mit Zertifikat anzumelden</string> + <string name="mam_prefs">Archivierungseinstellungen</string> + <string name="server_side_mam_prefs">Archivierungseinstellungen des Servers</string> + <string name="fetching_mam_prefs">Archivierungseinstellungen werden abgerufen. Bitte warten …</string> + <string name="unable_to_fetch_mam_prefs">Archivierungseinstellungen konnten nicht abgerufen werden</string> <string name="captcha_ocr">Captcha Text</string> <string name="captcha_required">Captcha erforderlich</string> <string name="captcha_hint">Text aus Captcha eintragen</string> @@ -531,7 +544,8 @@ <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO-Fingerabdruck der Nachricht</string> <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="pref_connection_options">Verbindungs-Optionen</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> @@ -544,6 +558,7 @@ <item quantity="one">%d Nachricht</item> <item quantity="other">%d Nachrichten</item> </plurals> + <string name="load_more_messages">Weitere Nachrichten laden</string> <string name="shared_file_with_x">Datei mit %s geteilt</string> <string name="shared_image_with_x">Bild mit %s geteilt</string> <string name="no_storage_permission">Pix-Art Messenger benötigt Zugriff auf externen Speicher</string> @@ -552,9 +567,9 @@ <string name="certificate_information">Zertifikatinformationen</string> <string name="certificate_subject">Betreff</string> <string name="certificate_issuer">Aussteller</string> - <string name="certificate_cn">Gemeinsamer Name</string> + <string name="certificate_cn">Name</string> <string name="certificate_o">Organisation</string> - <string name="certificate_sha1">SHA1</string> + <string name="certificate_sha1">SHA-1</string> <string name="certicate_info_not_available">(Nicht verfügbar)</string> <string name="certificate_not_found">Kein Zertifikat gefunden</string> <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string> @@ -575,11 +590,13 @@ <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_accounts">(keine aktiven Konten)</string> <string name="no_participants">Keine Mitglieder</string> <string name="pref_autojoin">Konferenzen automatisch beitreten</string> <string name="pref_autojoin_summary">Konferenzen automatisch beitreten, wenn in der Kontaktliste aktiviert.</string> <string name="pref_show_connection_options">Erweiterte Verbindungs-Optionen</string> <string name="pref_show_connection_options_summary">Zeige Hostname- und Port-Optionen</string> + <string name="no_accounts">(Keine aktivierten Konten)</string> <string name="this_field_is_required">Dieses Feld ist erforderlich</string> + <string name="correct_message">Nachricht korrigieren</string> + <string name="send_corrected_message">Korrigierte Nachricht senden</string> </resources> diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/main/res/values-pt-rBR/strings.xml diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 404e7a02a..982c3ab84 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> @@ -104,7 +103,7 @@ <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> <string name="pref_accept_files">Accept files</string> <string name="pref_accept_files_summary">Automatically accept files smaller than…</string> - <string name="pref_notification_settings">Notification Settings</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> @@ -113,12 +112,12 @@ <string name="pref_sound_summary">Play ringtone with notification</string> <string name="pref_notification_grace_period">Notification grace period</string> <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_advanced_options">Advanced</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 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> + <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> @@ -278,12 +277,14 @@ <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string> <string name="ignore">Ignore</string> <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string> - <string name="pref_encryption_settings">Encryption settings</string> + <string name="pref_security_settings">Security</string> <string name="pref_force_encryption">Force end-to-end encryption</string> <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string> + <string name="pref_allow_message_correction">Allow message correction</string> + <string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</string> <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 options</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="pref_about_conversations_summary">Build and licensing information</string> @@ -465,7 +466,7 @@ <string name="two_hours">2 hours</string> <string name="eight_hours">8 hours</string> <string name="until_further_notice">Until further notice</string> - <string name="pref_input_options">Input options</string> + <string name="pref_input_options">Input</string> <string name="pref_enter_is_send">Enter is send</string> <string name="pref_enter_is_send_summary">Use enter key to send message</string> <string name="pref_display_enter_key">Show enter key</string> @@ -541,19 +542,20 @@ <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_presence_settings">Presence</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="pref_show_connection_options">Extended connection options</string> - <string name="pref_show_connection_options_summary">Show hostname and port options when setting up an account</string> + <string name="pref_show_connection_options">Extended connection settings</string> + <string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string> <string name="hostname_example">xmpp.example.com</string> <string name="action_add_account_with_certificate">Add account with certificate</string> <string name="unable_to_parse_certificate">Unable to parse certificate</string> <string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string> <string name="mam_prefs">Archiving preferences</string> + <string name="server_side_mam_prefs">Server-side archiving preferences</string> <string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string> <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string> <string name="captcha_ocr">Captcha text</string> @@ -570,7 +572,7 @@ <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_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> @@ -594,7 +596,7 @@ <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">SHA-1</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> @@ -602,7 +604,7 @@ <string name="notify_never">Notifications disabled</string> <string name="notify_paused">Notifications paused</string> <string name="pref_picture_compression">Compress Pictures</string> - <string name="pref_picture_compression_summary">Resize and compressed pictures</string> + <string name="pref_picture_compression_summary">Resize and compress pictures</string> <string name="always">Always</string> <string name="automatically">Automatically</string> <string name="battery_optimizations_enabled">Battery optimizations enabled</string> @@ -616,4 +618,7 @@ <string name="no_accounts">(No activated accounts)</string> <string name="this_field_is_required">This field is required</string> <string name="no_participants">No participants</string> + <string name="correct_message">Correct message</string> + <string name="send_corrected_message">Send corrected message</string> +>>>>>>> refs/heads/pr/73 </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 83d019fc7..ca8847cba 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -151,7 +151,7 @@ android:summary="@string/pref_show_dynamic_tags_summary" android:title="@string/pref_show_dynamic_tags"/> </PreferenceCategory> - <PreferenceCategory android:title="@string/pref_encryption_settings"> + <PreferenceCategory android:title="@string/pref_security_settings"> <CheckBoxPreference android:defaultValue="false" android:key="dont_save_encrypted" @@ -166,6 +166,11 @@ android:key="remove_trusted_certificates" android:summary="@string/pref_remove_trusted_certificates_summary" android:title="@string/pref_remove_trusted_certificates_title"/> + <CheckBoxPreference + android:defaultValue="true" + android:key="allow_message_correction" + android:title="@string/pref_allow_message_correction" + android:summary="@string/pref_allow_message_correction_summary"/> </PreferenceCategory> <PreferenceCategory android:key="connection_options" |
