From 7f8522ea67b33957fc5bb9a1489964bd504ce10b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 20 Nov 2016 17:55:45 +0100
Subject: update strings

---
 src/main/res/values-de/strings.xml |  7 +++++++
 src/main/res/values/defaults.xml   |  2 +-
 src/main/res/values/strings.xml    | 14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 41cb57aa9..c3466860e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -659,5 +659,12 @@
     <string name="navigate">Zum Standort navigieren</string>
     <string name="received_contact">Kontakt empfangen</string>
     <string name="unable_to_start_recording">Aufnahme kann nicht gestartet werden</string>
+    <string name="all_omemo_keys_have_been_verified">Alle OMEMO Fingerabdrücke wurden bestätigt</string>
+    <string name="copy_fingerprint">Fingerabdruck kopieren</string>
+    <string name="device_does_not_support_data_saver">Dein Gerät unterstützt das Deaktivieren des Datensparmodus für Pix-Art Messenger nicht.</string>
+    <string name="error_unable_to_create_temporary_file">Kann temporäre Datei nicht erstellen</string>
+    <string name="pref_video_compression">Videos komprimieren</string>
+    <string name="pref_video_compression_summary">Videogröße anpassen und komprimieren</string>
+    <string name="this_device_has_been_verified">Dieses Gerät wurde bestätigt</string>
 
 </resources>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 7d613ab5e..a6c900eba 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="default_resource">Phone</string>
+    <string name="default_resource" translatable="false">Phone</string>
     <bool name="portrait_only">true</bool>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e623aca88..d2a0fa0d2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -658,11 +658,11 @@
     <string name="no_permission">Pix-Art Messenger has no permissions</string>
     <string name="send_image">Send image?</string>
     <string name="this_device_is_no_longer_in_use">This device is no longer in use</string>
-    <string name="type_pc">Computer</string>
-    <string name="type_phone">Mobile phone</string>
-    <string name="type_tablet">Tablet</string>
-    <string name="type_web">Web browser</string>
-    <string name="type_console">Console</string>
+    <string name="type_pc" translatable="false">Computer</string>
+    <string name="type_phone" translatable="false">Mobile phone</string>
+    <string name="type_tablet" translatable="false">Tablet</string>
+    <string name="type_web" translatable="false">Web browser</string>
+    <string name="type_console" translatable="false">Console</string>
     <string name="import_canceled">Import canceled</string>
     <string name="Import_failed">Database import failed, an import is not possible</string>
     <string name="Password_wrong">Wrong password, try again</string>
@@ -701,7 +701,7 @@
     <string name="error_message">Error Message</string>
     <string name="data_saver_enabled">Data saver enabled</string>
     <string name="data_saver_enabled_explained">Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible.</string>
-    <string name="device_does_not_support_data_saver">Your device does not supporting disabling Data saver for Pix-Art Messenger.</string>
+    <string name="device_does_not_support_data_saver">Your device does not supporting disabling data saver for Pix-Art Messenger.</string>
     <string name="navigate">Navigate to location</string>
     <string name="add_to_contact_list">Add to contact list</string>
     <string name="received_contact">Received contact</string>
@@ -710,5 +710,5 @@
     <string name="error_unable_to_create_temporary_file">Unable to create temporary file</string>
     <string name="this_device_has_been_verified">This device has been verified</string>
     <string name="copy_fingerprint">Copy fingerprint</string>
-    <string name="all_omemo_keys_have_been_verified"><![CDATA[>All OMEMO keys have been verified]]></string>
+    <string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string>
 </resources>
-- 
cgit v1.2.3