diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-01-25 21:22:15 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-01-25 21:22:15 +0100 |
| commit | ae663440952fe0cffcfe4413b7268f045727454d (patch) | |
| tree | 7022d7c58b8d1395af8c0e68a1b6187901cc8564 /src/main/res | |
| parent | fc0feb3ccb9b77b698e87eb3fff2f372242f8c6d (diff) | |
reworked videocompression
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 files changed, 2 insertions, 1 deletions
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> |