Merge branch 'siacs/master' into development

29 files changed, 91 insertions, 45 deletions

diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
index 25fc8591f..690400eb1 100644
--- a/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index 4445ca04a..dfd857cb2 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
index 1bd8cb51f..fd07bc20c 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
index 15d27cca8..bec207983 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 5d79264e9..10dc2e299 100644
--- a/src/main/res/drawable-hdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
index 733e96158..9e076434e 100644
--- a/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index ba63820b2..9835a7361 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
index 6523e9a14..ff8f80b69 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
index 2abd4fe1b..d7a3bb5dd 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index dd23cf7d7..596699bbe 100644
--- a/src/main/res/drawable-mdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
index c9e48859a..c49b2cb11 100644
--- a/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index aa0fc16e4..c0eb47ebb 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
index 79e6e1fdf..fe0324cee 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
index 771c3ff43..fdb6be0d1 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index 9e01ebaca..cb5654b71 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
index e69b9c8d5..873d4b140 100644
--- a/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index 0af666695..10e784089 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
index e128d58a6..53ecbecf7 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
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
index 94baefed9..436a1bd32 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index de4f8784b..f78425d21 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
index 668504dfb..baadfa780 100644
--- a/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index 8a35671d4..c474359ea 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
index 2b4e08b2b..1421768cc 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
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
index 6ea852cec..ee89b6706 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index 5cbfdbb4b..d34038d07 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 3e8dbb1e6..35d9efbb3 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -177,6 +177,48 @@
                 </LinearLayout>
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/battery_optimization"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/batt_op_headline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/battery_optimizations_enabled"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold"/>
+                <TextView
+                    android:id="@+id/batt_op_body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/batt_op_headline"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/battery_optimizations_enabled_explained"
+                    android:textColor="@color/black87"
+                    android:textSize="?attr/TextSizeBody"/>
+                <Button
+                    android:id="@+id/batt_op_disable"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_marginRight="-8dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true" android:layout_below="@+id/batt_op_body"
+                    android:text="@string/disable" android:textColor="@color/accent"/>
+            </RelativeLayout>
+
             <LinearLayout
                 android:id="@+id/stats"
                 android:layout_width="fill_parent"
@@ -205,7 +247,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/session_est"
@@ -235,7 +277,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_pep"
@@ -256,7 +298,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_blocking"
@@ -277,7 +319,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_sm"
@@ -298,7 +340,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_roster_version"
@@ -319,7 +361,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_carbons"
@@ -340,7 +382,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_mam"
@@ -361,7 +403,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_csi"
@@ -382,7 +424,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_http_upload"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
+                            android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
                             android:id="@+id/server_info_http_upload"
@@ -416,13 +458,14 @@
                             android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace" />
-
+                            
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/otr_fingerprint"
                             android:textColor="@color/black54"
                             android:textSize="?attr/TextSizeInfo" />
+
                     </LinearLayout>
 
                     <ImageButton
@@ -487,7 +530,7 @@
                             android:visibility="visible" />
 
                         <ImageButton
-                            android:id="@+id/action_regenerate_omemo_key"
+                            android:id="@+id/action_regenerate_axolotl_key"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="?android:selectableItemBackground"
@@ -495,7 +538,6 @@
                             android:padding="@dimen/image_button_padding"
                             android:src="?attr/icon_refresh"
                             android:visibility="gone" />
-
                     </LinearLayout>
                 </RelativeLayout>
             </LinearLayout>
@@ -528,7 +570,8 @@
                     android:layout_height="wrap_content"
                     android:divider="?android:dividerHorizontal"
                     android:orientation="vertical"
-                    android:showDividers="middle"></LinearLayout>
+                    android:showDividers="middle">
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
@@ -550,14 +593,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:textColor="@color/black87"/>
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12" />
+            android:background="@color/black12"/>
 
         <Button
             android:id="@+id/save_button"
@@ -567,7 +610,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/save"
-            android:textColor="@color/black54" />
+            android:textColor="@color/black54"/>
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 5d69f965a..124223c81 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -6,13 +6,13 @@
 
     <View
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:background="@color/primary"/>
 
     <FrameLayout
         android:id="@+id/swipeable_item"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:background="@color/grey50">
 
         <RelativeLayout
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 65036b972..64e345f08 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
   <string name="action_secure">Verschlüsselte Unterhaltung</string>
   <string name="action_add_account">Konto hinzufügen</string>
   <string name="action_edit_contact">Namen bearbeiten</string>
-  <string name="action_add_phone_book">Zum Telefonbuch hinzufügen</string>
+  <string name="action_add_phone_book">Zu Telefonbuch hinzufügen</string>
   <string name="action_delete_contact">Aus Kontaktliste entfernen</string>
   <string name="action_block_contact">Kontakt sperren</string>
   <string name="action_unblock_contact">Kontakt entsperren</string>
@@ -108,8 +108,6 @@
   <string name="pref_vibrate_summary">Vibrieren bei Erhalt einer neuen Nachricht</string>
   <string name="pref_sound">Benachrichtigungston</string>
   <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string>
-  <string name="pref_conference_notifications">Benachrichtigungen in öffentlichen Konferenzen</string>
-  <string name="pref_conference_notifications_summary">Bei jeder Nachricht in öffentlichen Konferenzen benachrichtigen und nicht nur, wenn ich angesprochen werde</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>
@@ -174,7 +172,7 @@
   <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
   <string name="invalid_jid">Ungültige Jabber-ID</string>
   <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
-  <string name="add_phone_book_text">Möchtest du %s zum Telefonbuch hinzufügen?</string>
+  <string name="add_phone_book_text">%s zum Telefonbuch hinzufügen</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">bereit</string>
   <string name="contact_status_away">abwesend</string>
@@ -244,7 +242,7 @@
   <string name="add_back">Auch hinzufügen</string>
   <string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
   <string name="publish">Veröffentlichen</string>
-  <string name="touch_to_choose_picture">Avatar anklicken, um ein Bild aus der Galerie auszuwählen</string>
+  <string name="touch_to_choose_picture">Avatar antippen, um Bild aus Galerie auszuwählen</string>
   <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
   <string name="publishing">Veröffentliche…</string>
   <string name="error_publish_avatar_server_reject">Der Server hat die Veröffentlichung des Avatars abgelehnt.</string>
@@ -263,7 +261,6 @@
   <string name="skip">Überspringen</string>
   <string name="disable_notifications">Benachrichtigungen deaktivieren</string>
   <string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
-  <string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
   <string name="enable">Aktivieren</string>
   <string name="conference_requires_password">Konferenz ist passwortgeschützt</string>
   <string name="enter_password">Passwort eingeben</string>
@@ -322,7 +319,6 @@
   <string name="verify_otr">OTR prüfen</string>
   <string name="remote_fingerprint">Fingerabdruck der Gegenseite</string>
   <string name="scan">Scannen</string>
-  <string name="or_touch_phones">(oder Touch-Handys)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Hinweis oder Frage</string>
   <string name="shared_secret_secret">Gemeinsamer Schlüssel</string>
@@ -509,7 +505,7 @@
   <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 Gerät stummgeschaltet ist</string>
+  <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Telefon lautlos ist</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>
@@ -536,7 +532,7 @@
   <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="pref_use_tor">Mit TOR verbinden</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>
@@ -552,21 +548,25 @@
   <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>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
-  <string name="sync_with_contacts_long">Pix-Art Messenger möchte deine Chat-Kontaktliste mit deinem Telefon-Kontakten abgleichen, um vollständige Namen und Avatare anzuzeigen.\n\nPix-Art Messenger wird deine Kontakte nur lokal lesen und abgleichen und benötigt keinen Abgleich mit dem Server.\n\nDu wirst gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
-  <string name="always">Immer</string>
-  <string name="automatically">Automatisch</string>
-  <string name="certicate_info_not_available">(nicht verfügbar)</string>
-  <string name="certificate_cn">Gemeinsamer Name</string>
+  <string name="sync_with_contacts_long">Pix-Art Messenger möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen und abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
+  <string name="certificate_information">Zertifikatinformationen</string>
   <string name="certificate_subject">Betreff</string>
-  <string name="certificate_sha1"></string>
+  <string name="certificate_issuer">Aussteller</string>
+  <string name="certificate_cn">Gemeinsamer Name</string>
   <string name="certificate_o">Organisation</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(Nicht verfügbar)</string>
   <string name="certificate_not_found">Kein Zertifikat gefunden</string>
-  <string name="certificate_issuer">Aussteller</string>
-  <string name="certificate_information">Zertifikat-Information</string>
-  <string name="notify_never">Benachrichtigungen deaktivierten</string>
   <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
   <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich angesprochen werde</string>
+  <string name="notify_never">Benachrichtigungen deaktiviert</string>
   <string name="notify_paused">Benachrichtigungen pausiert</string>
   <string name="pref_picture_compression">Bilder komprimieren</string>
-  <string name="pref_picture_compression_summary">Bildgröße ändern und komprimieren</string>
+  <string name="pref_picture_compression_summary">Bildgröße anpassen und komprimieren</string>
+  <string name="always">Immer</string>
+  <string name="automatically">Automatisch</string>
+  <string name="battery_optimizations_enabled">Batterieoptimierung aktiv</string>
+  <string name="battery_optimizations_enabled_explained">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\nEs ist empfehlenswert diese zu deaktivieren.</string>
+  <string name="battery_optimizations_enabled_dialog">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können. Es ist empfehlenswert dies zu deaktivieren.</string>
+  <string name="disable">Deaktivieren</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ab969324b..ceddf390f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
 	<string name="action_secure">Secure conversation</string>
 	<string name="action_add_account">Add account</string>
 	<string name="action_edit_contact">Edit name</string>
-	<string name="action_add_phone_book">Add to phone book</string>
+	<string name="action_add_phone_book">Add to address book</string>
 	<string name="action_delete_contact">Delete from roster</string>
 	<string name="action_block_contact">Block contact</string>
 	<string name="action_unblock_contact">Unblock contact</string>
@@ -175,7 +175,7 @@
 	<string name="passwords_do_not_match">Passwords do not match</string>
 	<string name="invalid_jid">This is not a valid Jabber ID</string>
 	<string name="error_out_of_memory">Out of memory. Image is too large</string>
-	<string name="add_phone_book_text">Do you want to add %s to your devices’s contact list?</string>
+	<string name="add_phone_book_text">Do you want to add %s to your address book?</string>
 	<string name="contact_status_online">online</string>
 	<string name="contact_status_free_to_chat">free to chat</string>
 	<string name="contact_status_away">away</string>
@@ -356,7 +356,6 @@
 	<string name="verify_otr">Verify OTR</string>
 	<string name="remote_fingerprint">Remote Fingerprint</string>
 	<string name="scan">scan</string>
-	<string name="or_touch_phones">(or touch phones)</string>
 	<string name="smp">Socialist Millionaire Protocol</string>
 	<string name="shared_secret_hint">Hint or Question</string>
 	<string name="shared_secret_secret">Shared Secret</string>
@@ -410,6 +409,7 @@
 	<string name="purge_key">Purge key</string>
 	<string name="purge_key_desc_part1">Are you sure you want to purge this key?</string>
 	<string name="purge_key_desc_part2">It will irreversibly be considered compromised, and you can never build a session with it again.</string>
+	<string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server.</string>
 	<string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string>
 	<string name="error_trustkeys_title">Error</string>
 	<string name="fetching_history_from_server">Fetching history from server</string>
@@ -525,7 +525,6 @@
 	<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="account_status_dns_timeout">Timeout in DNS</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>
@@ -536,14 +535,14 @@
 	<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="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="pref_xa_on_silent_mode_summary">Marks your resource as not available when phone is 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>
 	<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
@@ -562,8 +561,8 @@
 	<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>
+	<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_port">Port</string>
 	<string name="hostname_or_onion">Server- or .onion-Address</string>
@@ -595,4 +594,8 @@
 	<string name="pref_picture_compression_summary">Resize and compressed pictures</string>
 	<string name="always">Always</string>
 	<string name="automatically">Automatically</string>
+	<string name="battery_optimizations_enabled">Battery optimizations enabled</string>
+	<string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string>
+	<string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
+	<string name="disable">Disable</string>
 </resources>