From a14a28973ada020234c60680a51cdff2f9129de9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 9 May 2014 20:46:43 +0200
Subject: nicer descriptions in notificaton for images and encrypted messages

---
 res/values/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61134d29..43ef5069 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="send_failed">unsuccessful delivery</string>
     <string name="send_rejected">rejected</string>
     <string name="receiving_image">Receiving image file. Please wait&#8230;</string>
-    <string name="preparing_image">Preparing image for transmission. Please wait&#8230;</string>
+    <string name="preparing_image">Preparing image for transmission</string>
     <string name="action_clear_history">Clear history</string>
     <string name="clear_conversation_history">Clear Conversation History</string>
     <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
@@ -86,4 +86,7 @@
     <string name="offering">offering&#8230;</string>
     <string name="no_pgp_key">No openPGP Key found</string>
     <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup openPGP.</small></string>
+    <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
+    <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
+    <string name="image_file"><i>Image received. Touch to view</i></string>
 </resources>
-- 
cgit v1.2.3


From ef0bc6714a71555b05ca3dea10c274a40605810c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Fri, 9 May 2014 21:20:34 +0200
Subject: added dialog for otr file transfer

---
 res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 43ef5069..5c844964 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -89,4 +89,7 @@
     <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
     <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
     <string name="image_file"><i>Image received. Touch to view</i></string>
+    <string name="otr_file_transfer">OTR encryption not available</string>
+    <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either openPGP or no encryption.</string>
+    <string name="use_pgp_encryption">Use openPGP encryption</string>
 </resources>
-- 
cgit v1.2.3


From 4d0bf7971ec321a55f180b833b033ceaa6635fdf Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 11 May 2014 13:55:15 +0200
Subject: transfered preferences descritpions into strings.xml

---
 res/values/strings.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c844964..abae1053 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -92,4 +92,27 @@
     <string name="otr_file_transfer">OTR encryption not available</string>
     <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either openPGP or no encryption.</string>
     <string name="use_pgp_encryption">Use openPGP encryption</string>
+    <string name="pref_xmpp_resource">XMPP resource</string>
+    <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&#8230;</string>
+    <string name="pref_notification_settings">Notification Settings</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>
+    <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
+    <string name="pref_sound">Sound</string>
+    <string name="pref_sound_summary">Play ringtone with notification</string>
+    <string name="pref_conference_notifications">Conference notifications</string>
+    <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</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_ui_options">UI Options</string>
+    <string name="pref_use_phone_self_picture">Use Phones self contact picture</string>
+    <string name="pref_use_phone_sefl_picture_summary">You may no longer be able to distinguish which account you are using in a conversation</string>
+    <string name="pref_conference_name">Conference name</string>
+    <string name="pref_conference_name_summary">Use room’s subject to identify Conferences</string>
+    <string name="pref_advanced_options">Advanced Options</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 Conversations</string>
 </resources>
-- 
cgit v1.2.3


From 3455d10a4a87916bfe5da52ca9c401dafa8d5155 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 12 May 2014 14:59:46 +0200
Subject: Better error handling if attach file doesnt work (on permission
 denied) and unified encrypted and unencrypted file attachment

---
 res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index abae1053..8020a01e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -115,4 +115,9 @@
     <string name="pref_advanced_options">Advanced Options</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 Conversations</string>
+    <string name="openpgp_error">OpenKeychain reporeted an error</string>
+    <string name="error_decrypting_file">I/O Error decrypting file</string>
+    <string name="error_copying_image_file">Error copying image file.</string>
+    <string name="accept">Accept</string>
+    <string name="error">An error has occurred</string>
 </resources>
-- 
cgit v1.2.3