From ae663440952fe0cffcfe4413b7268f045727454d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 25 Jan 2017 21:22:15 +0100
Subject: reworked videocompression

---
 src/main/res/layout/conversation_list_row.xml | 1 -
 src/main/res/values-de/strings.xml            | 1 +
 src/main/res/values/strings.xml               | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index ec4b55363..08d938ffc 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,6 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants">
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c75396434..691fcd008 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -688,5 +688,6 @@
     <string name="show_inactive_devices">Zeige inaktive Geräte</string>
     <string name="distrust_omemo_key">Gerät misstrauen</string>
     <string name="distrust_omemo_key_text">Bist du sicher, dass du die Verifizierung dieses Gerätes misstrauen möchtest? Dieses Gerät und Nachrichten von dem Gerät werden als unverifiziert markiert.</string>
+    <string name="transcoding_video_progress">Video wird komprimiert (%s%% fertiggestellt)</string>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ae18b1c4a..f34a17c9d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -731,4 +731,5 @@
     <string name="hide_inactive_devices">Hide inactive devices</string>
     <string name="reply">Reply</string>
     <string name="encrypting_message">Encrypting message</string>
+    <string name="transcoding_video_progress">Compressing video (%s%% completed)</string>
 </resources>
-- 
cgit v1.2.3