From 0aa50cb5a1f72e65d5b4a01aa4da3f1454d51a51 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sun, 11 Jan 2015 01:01:33 +0100
Subject: shortened some string

---
 src/main/res/layout/activity_muc_details.xml | 1 +
 src/main/res/values/strings.xml              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index c59d0b5b..2032c9ea 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -87,6 +87,7 @@
 				android:layout_centerVertical="true"
 				android:textColor="@color/primarytext"
 				android:textSize="?attr/TextSizeBody"
+				android:layout_alignParentLeft="true"
 				android:layout_toLeftOf="@+id/change_conference_button"
 				/>
 			<ImageButton
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 31f4dbea..e7b7d8bf 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -421,8 +421,8 @@
 	<string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string>
 	<string name="ban_now">Ban now</string>
 	<string name="could_not_change_role">Could not change role of %s</string>
-	<string name="public_conference">This is a publicly accessible conference</string>
-	<string name="private_conference">This is a private, members only conference</string>
+	<string name="public_conference">Publicly accessible conference</string>
+	<string name="private_conference">Private, members only conference</string>
 	<string name="conference_options">Conference options</string>
 	<string name="members_only">Private (Members only)</string>
 	<string name="non_anonymous">Non-anonymous</string>
-- 
cgit v1.2.3