aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-27 11:15:06 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-27 11:15:06 +0200
commited3b535e6c6383a15e24ea186fe541d8b0a13195 (patch)
tree59164c9f4baa742601490901ddd8ed45f14934cd /res
parent3a57f6df897202010e1de242445b0f65763946d2 (diff)
made warnings in chats i tiny bit smaller
Diffstat (limited to 'res')
-rw-r--r--res/layout/fragment_conversation.xml27
-rw-r--r--res/values/strings.xml4
2 files changed, 18 insertions, 13 deletions
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 703a525e..c09a7d5f 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -76,7 +76,7 @@
android:id="@+id/muc_error_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
+ android:padding="6dp"
android:textColor="#eee"
android:textSize="20sp"
android:textStyle="bold" />
@@ -84,9 +84,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingLeft="8dp"
- android:text="Click to edit conference details"
+ android:paddingBottom="6dp"
+ android:paddingLeft="6dp"
+ android:text="@string/edit_conference_details"
android:textColor="#eee"
android:textSize="14sp" />
</LinearLayout>
@@ -102,8 +102,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="Unknown OTR Fingerprint"
+ android:padding="6dp"
+ android:text="@string/unknown_otr_fingerprint"
android:textColor="#eee"
android:textSize="20sp"
android:textStyle="bold" />
@@ -112,10 +112,11 @@
android:id="@+id/otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingLeft="8dp"
+ android:paddingBottom="6dp"
+ android:paddingLeft="6dp"
android:textColor="#eee"
android:textSize="14sp"
+ android:singleLine="true"
android:typeface="monospace" />
</LinearLayout>
@@ -130,8 +131,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="OpenPGP encrypted messages found"
+ android:padding="6dp"
+ android:text="@string/openpgp_messages_found"
android:textColor="#eee"
android:textSize="20sp"
android:textStyle="bold" />
@@ -139,9 +140,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingLeft="8dp"
- android:text="Click here to enter passphrase and decrypt messages"
+ android:paddingBottom="6dp"
+ android:paddingLeft="6dp"
+ android:text="@string/openpgp_click_to_decrypt"
android:textColor="#eee"
android:textSize="14sp" />
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 021c70e8..40715a06 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,4 +244,8 @@
<string name="last_seen_days">last seen %d days ago</string>
<string name="never_seen">never seen</string>
<string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
+ <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
+ <string name="edit_conference_details">Touch to edit conference details</string>
+ <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
+ <string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string>
</resources> \ No newline at end of file