aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-05 12:21:08 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-05 12:21:08 +0200
commit9aba9a4059bdc1c2f369585ef6faeada320529d2 (patch)
treee54042249b6831cc6284d28d35d785e419f56d0b /res
parentf8b4d5f338aede361c2562379d816b45f7bed3b8 (diff)
error messages for publish avatar
Diffstat (limited to '')
-rw-r--r--res/layout/activity_publish_profile_picture.xml7
-rw-r--r--res/values/strings.xml3
2 files changed, 8 insertions, 2 deletions
diff --git a/res/layout/activity_publish_profile_picture.xml b/res/layout/activity_publish_profile_picture.xml
index 9dd7a5dc..6dd1f7d3 100644
--- a/res/layout/activity_publish_profile_picture.xml
+++ b/res/layout/activity_publish_profile_picture.xml
@@ -69,7 +69,8 @@
android:layout_height="fill_parent"
android:layout_above="@+id/button_bar"
android:layout_below="@+id/hint"
- android:layout_centerHorizontal="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="8dp"
@@ -83,12 +84,14 @@
android:textSize="18sp"/>
<TextView
+ android:id="@+id/hint_or_warning"
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/publish_avatar_explanation"
android:textColor="@color/primarytext"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:minLines="3" />
</LinearLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index de925254..3b57be7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,4 +271,7 @@
<string name="publish_avatar">Publish avatar</string>
<string name="touch_to_choose_picture">Touch avatar to select picture from gallary</string>
<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
+ <string name="publishing">Publishing&#8230;</string>
+ <string name="error_publish_avatar_server_reject">The server rejected your publication</string>
+ <string name="error_publish_avatar_converting">Something went wrong while converting your picture</string>
</resources>