diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-05-17 13:04:33 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-05-17 13:04:33 +0200 |
| commit | 813896dbc9229c29b09798a296553a7d8caf07c6 (patch) | |
| tree | 0e3e4b070d1ee480ad916d6d926ff24342a3f908 /res | |
| parent | 9b95b07b97c8c51bc0388059704a503e0b11a0d3 (diff) | |
| parent | e34fddd7e1aa26da75b5ad61a4af7504c1db497c (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/dialog_verify_otr.xml | 3 | ||||
| -rw-r--r-- | res/layout/edit_account_dialog.xml | 2 | ||||
| -rw-r--r-- | res/values-de/strings.xml | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index 41ce3b07..6dfe149d 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -20,7 +20,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:text="julia@jabber.example.com" android:textSize="14sp" /> <TextView android:layout_width="wrap_content" @@ -35,7 +34,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8" android:textSize="14sp" android:typeface="monospace"/> <TextView @@ -51,7 +49,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8" android:textSize="14sp" android:typeface="monospace"/> </LinearLayout> diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml index 0a86039d..a5733cfe 100644 --- a/res/layout/edit_account_dialog.xml +++ b/res/layout/edit_account_dialog.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:ems="10" android:inputType="textEmailAddress" - android:hint="username@jabber.example.com"> + android:hint="username@example.com"> </EditText> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 221e747d..c3320b11 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -4,7 +4,7 @@ <string name="app_name">Conversations</string> <string name="action_settings">Einstellungen</string> <string name="action_add">Neue Unterhaltung</string> - <string name="action_accounts">Kontos verwalten</string> + <string name="action_accounts">Konten verwalten</string> <string name="action_refresh">Kontaktliste neu laden</string> <string name="action_end_conversation">Unterhaltung beenden</string> <string name="action_contact_details">Kontaktdetails</string> |