diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-27 11:47:10 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-27 11:47:10 +0200 |
| commit | cf66e091b5bbc79b4021d5424ff59f106b3e8634 (patch) | |
| tree | d375b9a33dfaaf7e18dd1fff9759f28bbd313591 /res/layout | |
| parent | 2415781ebf6fdf8846baf8294c4b0c49310b5c79 (diff) | |
| parent | d51deb12ddbf921173f1af20f238099d0748d91a (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to '')
| -rw-r--r-- | res/layout/dialog_verify_otr.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index 831f06ed..499ef6cd 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="8dp" - android:text="Jabber ID" + android:text="@string/account_settings_jabber_id" android:textColor="@color/primarytext" android:textSize="?attr/TextSizeHeadline" /> |