aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-15 15:19:02 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-15 15:19:02 +0200
commitbdf9770a61facf0e965c6c4c4dd586e8d9c27b18 (patch)
tree5ababe50f098e7037cbd48c39bcfb1ebb6210610 /res
parent513f3c47b2aa710d205a43b63eff3301812969ce (diff)
made ui with sending images a little smoother
Diffstat (limited to 'res')
-rw-r--r--res/layout/message_recieved.xml1
-rw-r--r--res/layout/message_sent.xml1
-rw-r--r--res/values/strings.xml4
3 files changed, 5 insertions, 1 deletions
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 32a26c3a..f4f34232 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -28,6 +28,7 @@
android:adjustViewBounds="true"
android:maxHeight="288dp"
android:maxWidth="288dp"
+ android:paddingBottom="2dp"
/>
<TextView
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 7b56b231..1ae422bb 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -27,6 +27,7 @@
android:adjustViewBounds="true"
android:maxHeight="288dp"
android:maxWidth="288dp"
+ android:paddingBottom="2dp"
/>
<TextView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 209f484c..edea0f82 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,7 +14,7 @@
<string name="just_now">just now</string>
<string name="sending">sending&#8230;</string>
<string name="announce_pgp">Renew PGP announcement</string>
- <string name="encrypted_message">Decrypting message. please wait&#8230;</string>
+ <string name="encrypted_message">Decrypting message. Please wait&#8230;</string>
<string name="conference_details">Conference Details</string>
<string name="nick_in_use">Nickname is already in use</string>
<string name="moderator">Moderator</string>
@@ -52,4 +52,6 @@
<string name="add_contact">Add contact</string>
<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>
</resources>