From 281ce3105fad5f012471cf3e5062a4032dfbc7a6 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 22 Oct 2014 15:44:55 -0400
Subject: Make conversations the root project

---
 src/main/res/drawable-hdpi/ic_action_add_group.png | Bin 0 -> 876 bytes
 .../res/drawable-hdpi/ic_action_add_person.png     | Bin 0 -> 616 bytes
 src/main/res/drawable-hdpi/ic_action_chat.png      | Bin 0 -> 295 bytes
 src/main/res/drawable-hdpi/ic_action_copy.png      | Bin 0 -> 381 bytes
 src/main/res/drawable-hdpi/ic_action_discard.png   | Bin 0 -> 450 bytes
 src/main/res/drawable-hdpi/ic_action_edit.png      | Bin 0 -> 765 bytes
 src/main/res/drawable-hdpi/ic_action_edit_dark.png | Bin 0 -> 884 bytes
 src/main/res/drawable-hdpi/ic_action_group.png     | Bin 0 -> 776 bytes
 src/main/res/drawable-hdpi/ic_action_new.png       | Bin 0 -> 262 bytes
 .../res/drawable-hdpi/ic_action_new_attachment.png | Bin 0 -> 587 bytes
 .../res/drawable-hdpi/ic_action_not_secure.png     | Bin 0 -> 367 bytes
 src/main/res/drawable-hdpi/ic_action_refresh.png   | Bin 0 -> 678 bytes
 src/main/res/drawable-hdpi/ic_action_remove.png    | Bin 0 -> 448 bytes
 src/main/res/drawable-hdpi/ic_action_search.png    | Bin 0 -> 650 bytes
 src/main/res/drawable-hdpi/ic_action_secure.png    | Bin 0 -> 384 bytes
 .../res/drawable-hdpi/ic_action_send_now_away.png  | Bin 0 -> 932 bytes
 .../res/drawable-hdpi/ic_action_send_now_dnd.png   | Bin 0 -> 1135 bytes
 .../drawable-hdpi/ic_action_send_now_offline.png   | Bin 0 -> 767 bytes
 .../drawable-hdpi/ic_action_send_now_online.png    | Bin 0 -> 1095 bytes
 src/main/res/drawable-hdpi/ic_activity.png         | Bin 0 -> 3040 bytes
 src/main/res/drawable-hdpi/ic_indicator.png        | Bin 0 -> 684 bytes
 src/main/res/drawable-hdpi/ic_launcher.png         | Bin 0 -> 4416 bytes
 src/main/res/drawable-hdpi/ic_notification.png     | Bin 0 -> 1033 bytes
 src/main/res/drawable-hdpi/ic_profile.png          | Bin 0 -> 999 bytes
 .../res/drawable-hdpi/ic_received_indicator.png    | Bin 0 -> 686 bytes
 src/main/res/drawable-hdpi/ic_secure_indicator.png | Bin 0 -> 294 bytes
 .../drawable-hdpi/tab_selected_conversations.9.png | Bin 0 -> 99 bytes
 .../tab_selected_focused_conversations.9.png       | Bin 0 -> 99 bytes
 .../tab_selected_pressed_conversations.9.png       | Bin 0 -> 105 bytes
 .../tab_unselected_conversations.9.png             | Bin 0 -> 101 bytes
 .../tab_unselected_focused_conversations.9.png     | Bin 0 -> 93 bytes
 .../tab_unselected_pressed_conversations.9.png     | Bin 0 -> 100 bytes
 src/main/res/drawable-mdpi/ic_action_add_group.png | Bin 0 -> 634 bytes
 .../res/drawable-mdpi/ic_action_add_person.png     | Bin 0 -> 469 bytes
 src/main/res/drawable-mdpi/ic_action_chat.png      | Bin 0 -> 261 bytes
 src/main/res/drawable-mdpi/ic_action_copy.png      | Bin 0 -> 288 bytes
 src/main/res/drawable-mdpi/ic_action_discard.png   | Bin 0 -> 324 bytes
 src/main/res/drawable-mdpi/ic_action_edit.png      | Bin 0 -> 522 bytes
 src/main/res/drawable-mdpi/ic_action_edit_dark.png | Bin 0 -> 587 bytes
 src/main/res/drawable-mdpi/ic_action_group.png     | Bin 0 -> 546 bytes
 src/main/res/drawable-mdpi/ic_action_new.png       | Bin 0 -> 185 bytes
 .../res/drawable-mdpi/ic_action_new_attachment.png | Bin 0 -> 415 bytes
 .../res/drawable-mdpi/ic_action_not_secure.png     | Bin 0 -> 298 bytes
 src/main/res/drawable-mdpi/ic_action_refresh.png   | Bin 0 -> 507 bytes
 src/main/res/drawable-mdpi/ic_action_remove.png    | Bin 0 -> 282 bytes
 src/main/res/drawable-mdpi/ic_action_search.png    | Bin 0 -> 449 bytes
 src/main/res/drawable-mdpi/ic_action_secure.png    | Bin 0 -> 304 bytes
 .../res/drawable-mdpi/ic_action_send_now_away.png  | Bin 0 -> 650 bytes
 .../res/drawable-mdpi/ic_action_send_now_dnd.png   | Bin 0 -> 784 bytes
 .../drawable-mdpi/ic_action_send_now_offline.png   | Bin 0 -> 535 bytes
 .../drawable-mdpi/ic_action_send_now_online.png    | Bin 0 -> 779 bytes
 src/main/res/drawable-mdpi/ic_activity.png         | Bin 0 -> 1854 bytes
 src/main/res/drawable-mdpi/ic_indicator.png        | Bin 0 -> 490 bytes
 src/main/res/drawable-mdpi/ic_launcher.png         | Bin 0 -> 2726 bytes
 src/main/res/drawable-mdpi/ic_notification.png     | Bin 0 -> 681 bytes
 src/main/res/drawable-mdpi/ic_profile.png          | Bin 0 -> 622 bytes
 .../res/drawable-mdpi/ic_received_indicator.png    | Bin 0 -> 447 bytes
 src/main/res/drawable-mdpi/ic_secure_indicator.png | Bin 0 -> 295 bytes
 .../drawable-mdpi/tab_selected_conversations.9.png | Bin 0 -> 96 bytes
 .../tab_selected_focused_conversations.9.png       | Bin 0 -> 96 bytes
 .../tab_selected_pressed_conversations.9.png       | Bin 0 -> 102 bytes
 .../tab_unselected_conversations.9.png             | Bin 0 -> 105 bytes
 .../tab_unselected_focused_conversations.9.png     | Bin 0 -> 90 bytes
 .../tab_unselected_pressed_conversations.9.png     | Bin 0 -> 97 bytes
 .../res/drawable-xhdpi/ic_action_add_group.png     | Bin 0 -> 1122 bytes
 .../res/drawable-xhdpi/ic_action_add_person.png    | Bin 0 -> 798 bytes
 src/main/res/drawable-xhdpi/ic_action_chat.png     | Bin 0 -> 310 bytes
 src/main/res/drawable-xhdpi/ic_action_copy.png     | Bin 0 -> 353 bytes
 src/main/res/drawable-xhdpi/ic_action_discard.png  | Bin 0 -> 543 bytes
 src/main/res/drawable-xhdpi/ic_action_edit.png     | Bin 0 -> 994 bytes
 .../res/drawable-xhdpi/ic_action_edit_dark.png     | Bin 0 -> 1179 bytes
 src/main/res/drawable-xhdpi/ic_action_group.png    | Bin 0 -> 1048 bytes
 src/main/res/drawable-xhdpi/ic_action_new.png      | Bin 0 -> 234 bytes
 .../drawable-xhdpi/ic_action_new_attachment.png    | Bin 0 -> 753 bytes
 .../res/drawable-xhdpi/ic_action_not_secure.png    | Bin 0 -> 482 bytes
 src/main/res/drawable-xhdpi/ic_action_refresh.png  | Bin 0 -> 901 bytes
 src/main/res/drawable-xhdpi/ic_action_remove.png   | Bin 0 -> 513 bytes
 src/main/res/drawable-xhdpi/ic_action_search.png   | Bin 0 -> 827 bytes
 src/main/res/drawable-xhdpi/ic_action_secure.png   | Bin 0 -> 468 bytes
 .../res/drawable-xhdpi/ic_action_send_now_away.png | Bin 0 -> 1180 bytes
 .../res/drawable-xhdpi/ic_action_send_now_dnd.png  | Bin 0 -> 1438 bytes
 .../drawable-xhdpi/ic_action_send_now_offline.png  | Bin 0 -> 968 bytes
 .../drawable-xhdpi/ic_action_send_now_online.png   | Bin 0 -> 1395 bytes
 src/main/res/drawable-xhdpi/ic_activity.png        | Bin 0 -> 4349 bytes
 src/main/res/drawable-xhdpi/ic_indicator.png       | Bin 0 -> 915 bytes
 src/main/res/drawable-xhdpi/ic_launcher.png        | Bin 0 -> 6503 bytes
 src/main/res/drawable-xhdpi/ic_notification.png    | Bin 0 -> 1407 bytes
 src/main/res/drawable-xhdpi/ic_profile.png         | Bin 0 -> 1374 bytes
 .../res/drawable-xhdpi/ic_received_indicator.png   | Bin 0 -> 855 bytes
 .../res/drawable-xhdpi/ic_secure_indicator.png     | Bin 0 -> 410 bytes
 .../tab_selected_conversations.9.png               | Bin 0 -> 104 bytes
 .../tab_selected_focused_conversations.9.png       | Bin 0 -> 103 bytes
 .../tab_selected_pressed_conversations.9.png       | Bin 0 -> 110 bytes
 .../tab_unselected_conversations.9.png             | Bin 0 -> 112 bytes
 .../tab_unselected_focused_conversations.9.png     | Bin 0 -> 93 bytes
 .../tab_unselected_pressed_conversations.9.png     | Bin 0 -> 101 bytes
 .../res/drawable-xxhdpi/ic_action_add_group.png    | Bin 0 -> 1643 bytes
 .../res/drawable-xxhdpi/ic_action_add_person.png   | Bin 0 -> 1088 bytes
 src/main/res/drawable-xxhdpi/ic_action_chat.png    | Bin 0 -> 383 bytes
 src/main/res/drawable-xxhdpi/ic_action_copy.png    | Bin 0 -> 470 bytes
 src/main/res/drawable-xxhdpi/ic_action_discard.png | Bin 0 -> 765 bytes
 src/main/res/drawable-xxhdpi/ic_action_edit.png    | Bin 0 -> 1458 bytes
 .../res/drawable-xxhdpi/ic_action_edit_dark.png    | Bin 0 -> 1670 bytes
 src/main/res/drawable-xxhdpi/ic_action_group.png   | Bin 0 -> 1475 bytes
 src/main/res/drawable-xxhdpi/ic_action_new.png     | Bin 0 -> 288 bytes
 .../drawable-xxhdpi/ic_action_new_attachment.png   | Bin 0 -> 1048 bytes
 .../res/drawable-xxhdpi/ic_action_not_secure.png   | Bin 0 -> 593 bytes
 src/main/res/drawable-xxhdpi/ic_action_refresh.png | Bin 0 -> 1274 bytes
 src/main/res/drawable-xxhdpi/ic_action_remove.png  | Bin 0 -> 681 bytes
 src/main/res/drawable-xxhdpi/ic_action_search.png  | Bin 0 -> 1152 bytes
 src/main/res/drawable-xxhdpi/ic_action_secure.png  | Bin 0 -> 586 bytes
 .../drawable-xxhdpi/ic_action_send_now_away.png    | Bin 0 -> 1426 bytes
 .../res/drawable-xxhdpi/ic_action_send_now_dnd.png | Bin 0 -> 1456 bytes
 .../drawable-xxhdpi/ic_action_send_now_offline.png | Bin 0 -> 1433 bytes
 .../drawable-xxhdpi/ic_action_send_now_online.png  | Bin 0 -> 1458 bytes
 src/main/res/drawable-xxhdpi/ic_activity.png       | Bin 0 -> 7209 bytes
 src/main/res/drawable-xxhdpi/ic_indicator.png      | Bin 0 -> 1298 bytes
 src/main/res/drawable-xxhdpi/ic_launcher.png       | Bin 0 -> 11054 bytes
 src/main/res/drawable-xxhdpi/ic_notification.png   | Bin 0 -> 2250 bytes
 src/main/res/drawable-xxhdpi/ic_profile.png        | Bin 0 -> 2137 bytes
 .../res/drawable-xxhdpi/ic_received_indicator.png  | Bin 0 -> 1236 bytes
 .../res/drawable-xxhdpi/ic_secure_indicator.png    | Bin 0 -> 380 bytes
 .../tab_selected_conversations.9.png               | Bin 0 -> 108 bytes
 .../tab_selected_focused_conversations.9.png       | Bin 0 -> 108 bytes
 .../tab_selected_pressed_conversations.9.png       | Bin 0 -> 114 bytes
 .../tab_unselected_conversations.9.png             | Bin 0 -> 109 bytes
 .../tab_unselected_focused_conversations.9.png     | Bin 0 -> 95 bytes
 .../tab_unselected_pressed_conversations.9.png     | Bin 0 -> 102 bytes
 src/main/res/drawable/actionbar_tab_indicator.xml  |  21 ++
 src/main/res/drawable/es_slidingpane_shadow.xml    |  12 +
 src/main/res/drawable/grey.xml                     |   7 +
 src/main/res/drawable/greybackground.xml           |   6 +
 src/main/res/drawable/infocard_border.xml          |  19 ++
 src/main/res/drawable/message_border.xml           |  15 ++
 src/main/res/drawable/snackbar.xml                 |  14 ++
 .../fragment_conversations_overview.xml            |  30 +++
 .../fragment_conversations_overview.xml            |  30 +++
 .../fragment_conversations_overview.xml            |  30 +++
 .../fragment_conversations_overview.xml            |  32 +++
 src/main/res/layout/account_row.xml                |  43 ++++
 src/main/res/layout/actionview_search.xml          |  19 ++
 src/main/res/layout/activity_choose_contact.xml    |  13 +
 src/main/res/layout/activity_contact_details.xml   | 114 +++++++++
 src/main/res/layout/activity_edit_account.xml      | 272 ++++++++++++++++++++
 src/main/res/layout/activity_muc_details.xml       | 119 +++++++++
 .../layout/activity_publish_profile_picture.xml    | 106 ++++++++
 .../res/layout/activity_start_conversation.xml     |   8 +
 src/main/res/layout/contact.xml                    |  51 ++++
 src/main/res/layout/contact_key.xml                |  41 +++
 src/main/res/layout/conversation_list_row.xml      |  68 +++++
 src/main/res/layout/create_contact_dialog.xml      |  39 +++
 src/main/res/layout/dialog_clear_history.xml       |  21 ++
 src/main/res/layout/dialog_verify_otr.xml          |  60 +++++
 src/main/res/layout/fragment_conversation.xml      | 102 ++++++++
 .../res/layout/fragment_conversations_overview.xml |  30 +++
 src/main/res/layout/join_conference_dialog.xml     |  47 ++++
 src/main/res/layout/manage_accounts.xml            |  16 ++
 src/main/res/layout/message_null.xml               |   7 +
 src/main/res/layout/message_received.xml           |  97 ++++++++
 src/main/res/layout/message_sent.xml               | 108 ++++++++
 src/main/res/layout/message_status.xml             |  22 ++
 src/main/res/layout/quickedit.xml                  |  19 ++
 src/main/res/layout/share_with.xml                 |  13 +
 src/main/res/menu/attachment_choices.xml           |  15 ++
 src/main/res/menu/choose_contact.xml               |  11 +
 src/main/res/menu/conference_context.xml           |  11 +
 src/main/res/menu/contact_context.xml              |  14 ++
 src/main/res/menu/contact_details.xml              |  27 ++
 src/main/res/menu/conversations.xml                |  63 +++++
 src/main/res/menu/encryption_choices.xml           |  16 ++
 src/main/res/menu/manageaccounts.xml               |  15 ++
 src/main/res/menu/manageaccounts_context.xml       |  21 ++
 src/main/res/menu/muc_details.xml                  |  21 ++
 src/main/res/menu/share_with.xml                   |  11 +
 src/main/res/menu/start_conversation.xml           |  31 +++
 src/main/res/values-ca/arrays.xml                  |  24 ++
 src/main/res/values-ca/strings.xml                 |  83 +++++++
 src/main/res/values-cs/arrays.xml                  |  39 +++
 src/main/res/values-cs/strings.xml                 | 260 +++++++++++++++++++
 src/main/res/values-de/arrays.xml                  |  31 +++
 src/main/res/values-de/strings.xml                 | 269 ++++++++++++++++++++
 src/main/res/values-es/arrays.xml                  |  39 +++
 src/main/res/values-es/strings.xml                 | 269 ++++++++++++++++++++
 src/main/res/values-eu/arrays.xml                  |  39 +++
 src/main/res/values-eu/strings.xml                 | 276 +++++++++++++++++++++
 src/main/res/values-fr/arrays.xml                  |  24 ++
 src/main/res/values-fr/strings.xml                 | 273 ++++++++++++++++++++
 src/main/res/values-gl/arrays.xml                  |  24 ++
 src/main/res/values-gl/strings.xml                 | 130 ++++++++++
 src/main/res/values-it/arrays.xml                  |  39 +++
 src/main/res/values-it/strings.xml                 | 260 +++++++++++++++++++
 src/main/res/values-iw/arrays.xml                  |  24 ++
 src/main/res/values-iw/strings.xml                 | 224 +++++++++++++++++
 src/main/res/values-nl/arrays.xml                  |  24 ++
 src/main/res/values-nl/strings.xml                 | 233 +++++++++++++++++
 src/main/res/values-ru/arrays.xml                  |  24 ++
 src/main/res/values-ru/strings.xml                 | 260 +++++++++++++++++++
 src/main/res/values-sv/arrays.xml                  |  24 ++
 src/main/res/values-sv/strings.xml                 | 260 +++++++++++++++++++
 src/main/res/values-zh-rCN/arrays.xml              |  39 +++
 src/main/res/values-zh-rCN/strings.xml             | 260 +++++++++++++++++++
 src/main/res/values-zh-rTW/arrays.xml              |  39 +++
 src/main/res/values-zh-rTW/strings.xml             | 263 ++++++++++++++++++++
 src/main/res/values/arrays.xml                     |  39 +++
 src/main/res/values/attrs.xml                      |   8 +
 src/main/res/values/colors.xml                     |  17 ++
 src/main/res/values/strings.xml                    | 276 +++++++++++++++++++++
 src/main/res/values/styles.xml                     |   8 +
 src/main/res/values/themes.xml                     |  35 +++
 src/main/res/xml/preferences.xml                   | 114 +++++++++
 210 files changed, 6157 insertions(+)
 create mode 100644 src/main/res/drawable-hdpi/ic_action_add_group.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_add_person.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_chat.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_copy.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_discard.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_edit.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_edit_dark.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_group.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_new.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_new_attachment.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_not_secure.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_refresh.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_remove.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_search.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_secure.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_away.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_offline.png
 create mode 100644 src/main/res/drawable-hdpi/ic_action_send_now_online.png
 create mode 100644 src/main/res/drawable-hdpi/ic_activity.png
 create mode 100644 src/main/res/drawable-hdpi/ic_indicator.png
 create mode 100644 src/main/res/drawable-hdpi/ic_launcher.png
 create mode 100644 src/main/res/drawable-hdpi/ic_notification.png
 create mode 100644 src/main/res/drawable-hdpi/ic_profile.png
 create mode 100644 src/main/res/drawable-hdpi/ic_received_indicator.png
 create mode 100644 src/main/res/drawable-hdpi/ic_secure_indicator.png
 create mode 100644 src/main/res/drawable-hdpi/tab_selected_conversations.9.png
 create mode 100644 src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
 create mode 100644 src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_add_group.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_add_person.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_chat.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_copy.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_discard.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_edit.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_edit_dark.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_group.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_new.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_new_attachment.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_not_secure.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_refresh.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_remove.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_search.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_secure.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_away.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_offline.png
 create mode 100644 src/main/res/drawable-mdpi/ic_action_send_now_online.png
 create mode 100644 src/main/res/drawable-mdpi/ic_activity.png
 create mode 100644 src/main/res/drawable-mdpi/ic_indicator.png
 create mode 100644 src/main/res/drawable-mdpi/ic_launcher.png
 create mode 100644 src/main/res/drawable-mdpi/ic_notification.png
 create mode 100644 src/main/res/drawable-mdpi/ic_profile.png
 create mode 100644 src/main/res/drawable-mdpi/ic_received_indicator.png
 create mode 100644 src/main/res/drawable-mdpi/ic_secure_indicator.png
 create mode 100644 src/main/res/drawable-mdpi/tab_selected_conversations.9.png
 create mode 100644 src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
 create mode 100644 src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_add_group.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_add_person.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_chat.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_copy.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_discard.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_edit.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_edit_dark.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_group.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_new.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_new_attachment.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_not_secure.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_refresh.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_remove.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_search.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_secure.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_away.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_action_send_now_online.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_activity.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_indicator.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_launcher.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_notification.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_profile.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_received_indicator.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_secure_indicator.png
 create mode 100644 src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
 create mode 100644 src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
 create mode 100644 src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_add_group.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_add_person.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_chat.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_copy.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_discard.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_edit.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_group.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_new.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_not_secure.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_refresh.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_remove.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_search.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_secure.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_activity.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_indicator.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_launcher.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_notification.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_profile.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_received_indicator.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_secure_indicator.png
 create mode 100644 src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
 create mode 100644 src/main/res/drawable/actionbar_tab_indicator.xml
 create mode 100644 src/main/res/drawable/es_slidingpane_shadow.xml
 create mode 100644 src/main/res/drawable/grey.xml
 create mode 100644 src/main/res/drawable/greybackground.xml
 create mode 100644 src/main/res/drawable/infocard_border.xml
 create mode 100644 src/main/res/drawable/message_border.xml
 create mode 100644 src/main/res/drawable/snackbar.xml
 create mode 100644 src/main/res/layout-w360dp/fragment_conversations_overview.xml
 create mode 100644 src/main/res/layout-w384dp/fragment_conversations_overview.xml
 create mode 100644 src/main/res/layout-w600dp/fragment_conversations_overview.xml
 create mode 100644 src/main/res/layout-w960dp/fragment_conversations_overview.xml
 create mode 100644 src/main/res/layout/account_row.xml
 create mode 100644 src/main/res/layout/actionview_search.xml
 create mode 100644 src/main/res/layout/activity_choose_contact.xml
 create mode 100644 src/main/res/layout/activity_contact_details.xml
 create mode 100644 src/main/res/layout/activity_edit_account.xml
 create mode 100644 src/main/res/layout/activity_muc_details.xml
 create mode 100644 src/main/res/layout/activity_publish_profile_picture.xml
 create mode 100644 src/main/res/layout/activity_start_conversation.xml
 create mode 100644 src/main/res/layout/contact.xml
 create mode 100644 src/main/res/layout/contact_key.xml
 create mode 100644 src/main/res/layout/conversation_list_row.xml
 create mode 100644 src/main/res/layout/create_contact_dialog.xml
 create mode 100644 src/main/res/layout/dialog_clear_history.xml
 create mode 100644 src/main/res/layout/dialog_verify_otr.xml
 create mode 100644 src/main/res/layout/fragment_conversation.xml
 create mode 100644 src/main/res/layout/fragment_conversations_overview.xml
 create mode 100644 src/main/res/layout/join_conference_dialog.xml
 create mode 100644 src/main/res/layout/manage_accounts.xml
 create mode 100644 src/main/res/layout/message_null.xml
 create mode 100644 src/main/res/layout/message_received.xml
 create mode 100644 src/main/res/layout/message_sent.xml
 create mode 100644 src/main/res/layout/message_status.xml
 create mode 100644 src/main/res/layout/quickedit.xml
 create mode 100644 src/main/res/layout/share_with.xml
 create mode 100644 src/main/res/menu/attachment_choices.xml
 create mode 100644 src/main/res/menu/choose_contact.xml
 create mode 100644 src/main/res/menu/conference_context.xml
 create mode 100644 src/main/res/menu/contact_context.xml
 create mode 100644 src/main/res/menu/contact_details.xml
 create mode 100644 src/main/res/menu/conversations.xml
 create mode 100644 src/main/res/menu/encryption_choices.xml
 create mode 100644 src/main/res/menu/manageaccounts.xml
 create mode 100644 src/main/res/menu/manageaccounts_context.xml
 create mode 100644 src/main/res/menu/muc_details.xml
 create mode 100644 src/main/res/menu/share_with.xml
 create mode 100644 src/main/res/menu/start_conversation.xml
 create mode 100644 src/main/res/values-ca/arrays.xml
 create mode 100644 src/main/res/values-ca/strings.xml
 create mode 100644 src/main/res/values-cs/arrays.xml
 create mode 100644 src/main/res/values-cs/strings.xml
 create mode 100644 src/main/res/values-de/arrays.xml
 create mode 100644 src/main/res/values-de/strings.xml
 create mode 100644 src/main/res/values-es/arrays.xml
 create mode 100644 src/main/res/values-es/strings.xml
 create mode 100644 src/main/res/values-eu/arrays.xml
 create mode 100644 src/main/res/values-eu/strings.xml
 create mode 100644 src/main/res/values-fr/arrays.xml
 create mode 100644 src/main/res/values-fr/strings.xml
 create mode 100644 src/main/res/values-gl/arrays.xml
 create mode 100644 src/main/res/values-gl/strings.xml
 create mode 100644 src/main/res/values-it/arrays.xml
 create mode 100644 src/main/res/values-it/strings.xml
 create mode 100644 src/main/res/values-iw/arrays.xml
 create mode 100644 src/main/res/values-iw/strings.xml
 create mode 100644 src/main/res/values-nl/arrays.xml
 create mode 100644 src/main/res/values-nl/strings.xml
 create mode 100644 src/main/res/values-ru/arrays.xml
 create mode 100644 src/main/res/values-ru/strings.xml
 create mode 100644 src/main/res/values-sv/arrays.xml
 create mode 100644 src/main/res/values-sv/strings.xml
 create mode 100644 src/main/res/values-zh-rCN/arrays.xml
 create mode 100644 src/main/res/values-zh-rCN/strings.xml
 create mode 100644 src/main/res/values-zh-rTW/arrays.xml
 create mode 100644 src/main/res/values-zh-rTW/strings.xml
 create mode 100644 src/main/res/values/arrays.xml
 create mode 100644 src/main/res/values/attrs.xml
 create mode 100644 src/main/res/values/colors.xml
 create mode 100644 src/main/res/values/strings.xml
 create mode 100644 src/main/res/values/styles.xml
 create mode 100644 src/main/res/values/themes.xml
 create mode 100644 src/main/res/xml/preferences.xml

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/ic_action_add_group.png b/src/main/res/drawable-hdpi/ic_action_add_group.png
new file mode 100644
index 00000000..97640355
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_add_group.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_add_person.png b/src/main/res/drawable-hdpi/ic_action_add_person.png
new file mode 100644
index 00000000..9d88d0f4
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_add_person.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png
new file mode 100644
index 00000000..0847ac46
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_chat.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_copy.png b/src/main/res/drawable-hdpi/ic_action_copy.png
new file mode 100644
index 00000000..22327391
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_copy.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png
new file mode 100644
index 00000000..703b31f8
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_discard.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_edit.png b/src/main/res/drawable-hdpi/ic_action_edit.png
new file mode 100644
index 00000000..756db316
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_edit.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/src/main/res/drawable-hdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..5f7c6eff
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_edit_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_group.png b/src/main/res/drawable-hdpi/ic_action_group.png
new file mode 100644
index 00000000..3e7f16d5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_group.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_new.png b/src/main/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 00000000..d866d616
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_new.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_new_attachment.png b/src/main/res/drawable-hdpi/ic_action_new_attachment.png
new file mode 100644
index 00000000..c01c2b38
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_new_attachment.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_not_secure.png b/src/main/res/drawable-hdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..2c917615
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_not_secure.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh.png b/src/main/res/drawable-hdpi/ic_action_refresh.png
new file mode 100644
index 00000000..45b22282
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_refresh.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_remove.png b/src/main/res/drawable-hdpi/ic_action_remove.png
new file mode 100644
index 00000000..58a56e45
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_remove.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 00000000..772e3598
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png
new file mode 100644
index 00000000..4439d1ae
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_secure.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_away.png b/src/main/res/drawable-hdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..505cbe63
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_send_now_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..a376524d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_offline.png b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..d4d2d510
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_online.png b/src/main/res/drawable-hdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..48676f7b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_send_now_online.png differ
diff --git a/src/main/res/drawable-hdpi/ic_activity.png b/src/main/res/drawable-hdpi/ic_activity.png
new file mode 100644
index 00000000..613da683
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_activity.png differ
diff --git a/src/main/res/drawable-hdpi/ic_indicator.png b/src/main/res/drawable-hdpi/ic_indicator.png
new file mode 100644
index 00000000..6de8969f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_indicator.png differ
diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..d48df2c3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 00000000..664ba535
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-hdpi/ic_profile.png b/src/main/res/drawable-hdpi/ic_profile.png
new file mode 100644
index 00000000..3f071dec
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_profile.png differ
diff --git a/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png
new file mode 100644
index 00000000..b1e3f274
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png
new file mode 100644
index 00000000..2a2934fb
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_secure_indicator.png differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
new file mode 100644
index 00000000..b8f44c21
Binary files /dev/null and b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
new file mode 100644
index 00000000..5512dbd3
Binary files /dev/null and b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
new file mode 100644
index 00000000..e5f1df22
Binary files /dev/null and b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
new file mode 100644
index 00000000..7cd46d63
Binary files /dev/null and b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
new file mode 100644
index 00000000..438ecdd8
Binary files /dev/null and b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
new file mode 100644
index 00000000..4f18a95a
Binary files /dev/null and b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_add_group.png b/src/main/res/drawable-mdpi/ic_action_add_group.png
new file mode 100644
index 00000000..9a655899
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_add_group.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_add_person.png b/src/main/res/drawable-mdpi/ic_action_add_person.png
new file mode 100644
index 00000000..b7d8f46a
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_add_person.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png
new file mode 100644
index 00000000..8fdb5d75
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_chat.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_copy.png b/src/main/res/drawable-mdpi/ic_action_copy.png
new file mode 100644
index 00000000..71348202
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_copy.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_discard.png b/src/main/res/drawable-mdpi/ic_action_discard.png
new file mode 100644
index 00000000..248fb09c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_discard.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_edit.png b/src/main/res/drawable-mdpi/ic_action_edit.png
new file mode 100644
index 00000000..68a45320
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_edit.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/src/main/res/drawable-mdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..650b4d89
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_edit_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_group.png b/src/main/res/drawable-mdpi/ic_action_group.png
new file mode 100644
index 00000000..1ee3cccd
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_group.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_new.png b/src/main/res/drawable-mdpi/ic_action_new.png
new file mode 100644
index 00000000..f17e7980
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_new.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_new_attachment.png b/src/main/res/drawable-mdpi/ic_action_new_attachment.png
new file mode 100644
index 00000000..1d265aac
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_new_attachment.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_not_secure.png b/src/main/res/drawable-mdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..faffa233
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_not_secure.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh.png b/src/main/res/drawable-mdpi/ic_action_refresh.png
new file mode 100644
index 00000000..de008e51
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_refresh.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_remove.png b/src/main/res/drawable-mdpi/ic_action_remove.png
new file mode 100644
index 00000000..342a79de
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_remove.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_search.png b/src/main/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 00000000..4edb1ff9
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png
new file mode 100644
index 00000000..05332ebf
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_secure.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_away.png b/src/main/res/drawable-mdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..0fdca901
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_send_now_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..c0aef36c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_offline.png b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..7723f4aa
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_send_now_online.png b/src/main/res/drawable-mdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..39d00ee4
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_send_now_online.png differ
diff --git a/src/main/res/drawable-mdpi/ic_activity.png b/src/main/res/drawable-mdpi/ic_activity.png
new file mode 100644
index 00000000..c8727f57
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_activity.png differ
diff --git a/src/main/res/drawable-mdpi/ic_indicator.png b/src/main/res/drawable-mdpi/ic_indicator.png
new file mode 100644
index 00000000..bb4fee10
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_indicator.png differ
diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..200daf4c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 00000000..5d1aca10
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-mdpi/ic_profile.png b/src/main/res/drawable-mdpi/ic_profile.png
new file mode 100644
index 00000000..0d056c7c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_profile.png differ
diff --git a/src/main/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png
new file mode 100644
index 00000000..88ff1efb
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png
new file mode 100644
index 00000000..5a73aef4
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_secure_indicator.png differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
new file mode 100644
index 00000000..09d42dc8
Binary files /dev/null and b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
new file mode 100644
index 00000000..20af01de
Binary files /dev/null and b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
new file mode 100644
index 00000000..13a878be
Binary files /dev/null and b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
new file mode 100644
index 00000000..ad2dbae9
Binary files /dev/null and b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
new file mode 100644
index 00000000..dfff5ac8
Binary files /dev/null and b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
new file mode 100644
index 00000000..4365d178
Binary files /dev/null and b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_add_group.png b/src/main/res/drawable-xhdpi/ic_action_add_group.png
new file mode 100644
index 00000000..c493aa5a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_add_group.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_add_person.png b/src/main/res/drawable-xhdpi/ic_action_add_person.png
new file mode 100644
index 00000000..4e8de1b6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_add_person.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png
new file mode 100644
index 00000000..8a9a4314
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_chat.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_copy.png b/src/main/res/drawable-xhdpi/ic_action_copy.png
new file mode 100644
index 00000000..5ddf1513
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_copy.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png
new file mode 100644
index 00000000..9eeeed12
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_discard.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_edit.png b/src/main/res/drawable-xhdpi/ic_action_edit.png
new file mode 100644
index 00000000..67e056fe
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_edit.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..8ab436d8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_group.png b/src/main/res/drawable-xhdpi/ic_action_group.png
new file mode 100644
index 00000000..fa2af497
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_group.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_new.png b/src/main/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 00000000..dde2141f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_new.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
new file mode 100644
index 00000000..41cbab20
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/src/main/res/drawable-xhdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..c0902a03
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_not_secure.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh.png b/src/main/res/drawable-xhdpi/ic_action_refresh.png
new file mode 100644
index 00000000..cdc160d4
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_refresh.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_remove.png b/src/main/res/drawable-xhdpi/ic_action_remove.png
new file mode 100644
index 00000000..58e2e3b4
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_remove.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 00000000..19658e4a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png
new file mode 100644
index 00000000..4e08b95a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_secure.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..bb999d85
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..a0bf5561
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..6da9ff7b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..348ba657
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_activity.png b/src/main/res/drawable-xhdpi/ic_activity.png
new file mode 100644
index 00000000..95ffbecf
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_activity.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_indicator.png b/src/main/res/drawable-xhdpi/ic_indicator.png
new file mode 100644
index 00000000..3e5141c2
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_indicator.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..927a2d2a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 00000000..dfa643d0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_profile.png b/src/main/res/drawable-xhdpi/ic_profile.png
new file mode 100644
index 00000000..88a82cf0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_profile.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png
new file mode 100644
index 00000000..2c871933
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png
new file mode 100644
index 00000000..1f4c9a32
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_secure_indicator.png differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
new file mode 100644
index 00000000..34eb4ec0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
new file mode 100644
index 00000000..3155ef69
Binary files /dev/null and b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
new file mode 100644
index 00000000..5c2440e4
Binary files /dev/null and b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
new file mode 100644
index 00000000..e9ab742e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
new file mode 100644
index 00000000..42a2191e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
new file mode 100644
index 00000000..a5a2c25e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_add_group.png b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
new file mode 100644
index 00000000..2b46dbb9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_add_group.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
new file mode 100644
index 00000000..e9a58eaf
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_add_person.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
new file mode 100644
index 00000000..04000fd0
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_chat.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_copy.png b/src/main/res/drawable-xxhdpi/ic_action_copy.png
new file mode 100644
index 00000000..a0508df8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_copy.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100644
index 00000000..cb1260a4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_discard.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_edit.png b/src/main/res/drawable-xxhdpi/ic_action_edit.png
new file mode 100644
index 00000000..3a241ea4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_edit.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
new file mode 100644
index 00000000..f2b2078b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_group.png b/src/main/res/drawable-xxhdpi/ic_action_group.png
new file mode 100644
index 00000000..9289b1c8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_group.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_new.png b/src/main/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 00000000..c42c2bfb
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_new.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
new file mode 100644
index 00000000..ce7536cb
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..a186f1fb
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
new file mode 100644
index 00000000..cb847f37
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_refresh.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_remove.png b/src/main/res/drawable-xxhdpi/ic_action_remove.png
new file mode 100644
index 00000000..331c545b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_remove.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 00000000..a1086388
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
new file mode 100644
index 00000000..ccf1fb00
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_secure.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
new file mode 100644
index 00000000..12ec4d33
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
new file mode 100644
index 00000000..7719f81a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
new file mode 100644
index 00000000..18895813
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
new file mode 100644
index 00000000..29bde36e
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_activity.png b/src/main/res/drawable-xxhdpi/ic_activity.png
new file mode 100644
index 00000000..0b642d9b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_activity.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png
new file mode 100644
index 00000000..2c51b8b7
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_indicator.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..65c1af34
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 00000000..ee1e9534
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_profile.png b/src/main/res/drawable-xxhdpi/ic_profile.png
new file mode 100644
index 00000000..309dc513
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_profile.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
new file mode 100644
index 00000000..039a9ef9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
new file mode 100644
index 00000000..1ee9b67d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
new file mode 100644
index 00000000..e4439e7c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
new file mode 100644
index 00000000..dd2ded89
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
new file mode 100644
index 00000000..58c8a576
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
new file mode 100644
index 00000000..566062f0
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
new file mode 100644
index 00000000..432e68c4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
new file mode 100644
index 00000000..8dd01d5c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png differ
diff --git a/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml
new file mode 100644
index 00000000..5598ee42
--- /dev/null
+++ b/src/main/res/drawable/actionbar_tab_indicator.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Non focused states -->
+    <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
+
+    <!-- Pressed -->
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
+    <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml
new file mode 100644
index 00000000..44ffd4ea
--- /dev/null
+++ b/src/main/res/drawable/es_slidingpane_shadow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <gradient
+        android:endColor="@color/divider"
+        android:startColor="@android:color/transparent" />
+
+    <size
+        android:height="0.5dp"
+        android:width="3.0dp" />
+
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/grey.xml b/src/main/res/drawable/grey.xml
new file mode 100644
index 00000000..2e90d96d
--- /dev/null
+++ b/src/main/res/drawable/grey.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <solid android:color="#ffdddddd" />
+
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/greybackground.xml b/src/main/res/drawable/greybackground.xml
new file mode 100644
index 00000000..bedc4b17
--- /dev/null
+++ b/src/main/res/drawable/greybackground.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/grey" android:state_pressed="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml
new file mode 100644
index 00000000..af7d5d22
--- /dev/null
+++ b/src/main/res/drawable/infocard_border.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@color/primarybackground" />
+
+    <corners android:radius="2dp" />
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/divider" >
+    </stroke>
+    
+    <padding
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp"
+        android:top="0dp" />
+
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml
new file mode 100644
index 00000000..b35693d5
--- /dev/null
+++ b/src/main/res/drawable/message_border.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <corners android:radius="2dp" />
+
+    <padding
+        android:bottom="1.5dp"
+        android:left="1.5dp"
+        android:right="1.5dp"
+        android:top="1.5dp" />
+
+    <solid android:color="@color/divider" />
+
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml
new file mode 100644
index 00000000..13818618
--- /dev/null
+++ b/src/main/res/drawable/snackbar.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@color/darkbackground" />
+
+    <corners android:radius="8dip" />
+
+    <padding
+        android:bottom="0dip"
+        android:left="0dip"
+        android:right="0dip"
+        android:top="0dip" />
+
+</shape>
\ No newline at end of file
diff --git a/src/main/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
new file mode 100644
index 00000000..a600118d
--- /dev/null
+++ b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
@@ -0,0 +1,30 @@
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_view_spl"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="300dp"
+        android:layout_height="match_parent"
+        android:background="@color/primarybackground"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/primarybackground"
+            android:divider="@color/divider"
+            android:dividerHeight="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selected_conversation"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
new file mode 100644
index 00000000..c3aa67ae
--- /dev/null
+++ b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
@@ -0,0 +1,30 @@
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_view_spl"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="345dp"
+        android:layout_height="match_parent"
+        android:background="@color/primarybackground"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/primarybackground"
+            android:divider="@color/divider"
+            android:dividerHeight="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selected_conversation"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
new file mode 100644
index 00000000..331fb1f0
--- /dev/null
+++ b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
@@ -0,0 +1,30 @@
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_view_spl"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="400dp"
+        android:layout_height="match_parent"
+        android:background="@color/primarybackground"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/primarybackground"
+            android:divider="@color/divider"
+            android:dividerHeight="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selected_conversation"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
new file mode 100644
index 00000000..2744f38e
--- /dev/null
+++ b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
@@ -0,0 +1,32 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_view_ll"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:baselineAligned="false">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="@color/primarybackground"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/primarybackground"
+            android:divider="@color/divider"
+            android:dividerHeight="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selected_conversation"
+        android:layout_width="0dp"
+        android:layout_weight="2"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
new file mode 100644
index 00000000..2d1190a3
--- /dev/null
+++ b/src/main/res/layout/account_row.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:padding="8dp" >
+
+    <ImageView
+        android:id="@+id/account_image"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentLeft="true"
+        android:src="@drawable/ic_profile" >
+    </ImageView>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/account_image"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
+
+        <TextView
+            android:id="@+id/account_jid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scrollHorizontally="false"
+            android:singleLine="true"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline" />
+
+        <TextView
+            android:id="@+id/account_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_status_unknown"
+            android:textColor="@color/secondarytext"
+            android:textSize="?attr/TextSizeBody"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml
new file mode 100644
index 00000000..64b75f0e
--- /dev/null
+++ b/src/main/res/layout/actionview_search.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:addStatesFromChildren="true"
+    android:focusable="true"
+    android:gravity="center"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp" >
+
+    <EditText
+        android:id="@+id/search_field"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:inputType="textEmailAddress|textNoSuggestions"
+        android:textColor="@color/ondarktext" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
new file mode 100644
index 00000000..248a7822
--- /dev/null
+++ b/src/main/res/layout/activity_choose_contact.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ListView
+        android:id="@+id/choose_contact_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/contact" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
new file mode 100644
index 00000000..f7cb2198
--- /dev/null
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/secondarybackground" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:background="@drawable/infocard_border"
+            android:padding="16dp" >
+
+            <QuickContactBadge
+                android:id="@+id/details_contact_badge"
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:layout_alignParentTop="true"
+                android:scaleType="centerCrop" />
+
+            <LinearLayout
+                android:id="@+id/details_jidbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_toRightOf="@+id/details_contact_badge"
+                android:orientation="vertical" >
+
+                <TextView
+                    android:id="@+id/details_contactjid"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/account_settings_example_jabber_id"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeHeadline"
+                    android:textStyle="bold" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        android:id="@+id/details_contactstatus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" · "
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+
+                    <TextView
+                        android:id="@+id/details_lastseen"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textColor="@color/secondarytext"
+                        android:textSize="?attr/TextSizeBody" />
+                </LinearLayout>
+
+                <CheckBox
+                    android:id="@+id/details_send_presence"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/send_presence_updates"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody" />
+
+                <CheckBox
+                    android:id="@+id/details_receive_presence"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/receive_presence_updates"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/details_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/details_jidbox"
+                android:layout_marginTop="32dp"
+                android:text="@string/using_account"
+                android:textColor="@color/secondarytext"
+                android:textSize="?attr/TextSizeInfo" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/details_contact_keys"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:background="@drawable/infocard_border"
+            android:divider="?android:dividerHorizontal"
+            android:orientation="vertical"
+            android:padding="8dp"
+            android:showDividers="middle" >
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
new file mode 100644
index 00000000..97289628
--- /dev/null
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/secondarybackground" >
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/button_bar"
+        android:layout_alignParentTop="true" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:id="@+id/editor"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="16dp" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/account_settings_jabber_id"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody" />
+
+                <AutoCompleteTextView
+                    android:id="@+id/account_jid"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/account_settings_example_jabber_id"
+                    android:inputType="textEmailAddress"
+                    android:textColor="@color/primarytext"
+                    android:textColorHint="@color/secondarytext"
+                    android:textSize="?attr/TextSizeBody" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/account_settings_password"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody" />
+
+                <EditText
+                    android:id="@+id/account_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/password"
+                    android:inputType="textPassword"
+                    android:textColor="@color/primarytext"
+                    android:textColorHint="@color/secondarytext"
+                    android:textSize="?attr/TextSizeBody" />
+
+                <CheckBox
+                    android:id="@+id/account_register_new"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/register_account"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody" />
+
+                <TextView
+                    android:id="@+id/account_confirm_password_desc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/account_settings_confirm_password"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody"
+                    android:visibility="gone" />
+
+                <EditText
+                    android:id="@+id/account_password_confirm"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:hint="@string/confirm_password"
+                    android:inputType="textPassword"
+                    android:visibility="gone"
+                    android:textColor="@color/primarytext"
+                    android:textColorHint="@color/secondarytext"
+                    android:textSize="?attr/TextSizeBody" />
+            </LinearLayout>
+
+           <LinearLayout
+                android:id="@+id/stats"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="8dp"
+                android:background="@drawable/infocard_border"
+                android:orientation="vertical"
+                android:padding="16dp"
+                android:visibility="gone" >
+
+                <TableLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:stretchColumns="1" >
+
+                    <TableRow
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/server_info_session_established"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+
+                        <TextView
+                            android:id="@+id/session_est"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+                    </TableRow>
+
+                    <TableRow
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/server_info_pep"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+
+                        <TextView
+                            android:id="@+id/server_info_pep"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+                    </TableRow>
+
+                    <TableRow
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/server_info_stream_management"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+
+                        <TextView
+                            android:id="@+id/server_info_sm"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+                    </TableRow>
+
+                    <TableRow
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content" >
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/server_info_carbon_messages"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+
+                        <TextView
+                            android:id="@+id/server_info_carbons"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody" />
+                    </TableRow>
+                </TableLayout>
+
+
+
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:id="@+id/otr_fingerprint_box"
+                    android:layout_marginTop="32dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/otr_fingerprint"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/primarytext"
+                            android:textSize="?attr/TextSizeBody"
+                            android:typeface="monospace" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/secondarytext"
+                            android:textSize="?attr/TextSizeInfo"
+                            android:text="@string/otr_fingerprint"/>
+                    </LinearLayout>
+
+                    <ImageButton
+                        android:id="@+id/action_copy_to_clipboard"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="?android:selectableItemBackground"
+                        android:padding="8dp"
+                        android:src="@drawable/ic_action_copy"
+                        android:visibility="visible" />
+                </RelativeLayout>
+
+               
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/button_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true" >
+
+        <Button
+            android:id="@+id/cancel_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/cancel"
+            android:textColor="@color/primarytext" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="7dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/divider" />
+
+        <Button
+            android:id="@+id/save_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:enabled="false"
+            android:text="@string/save"
+            android:textColor="@color/secondarytext" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
new file mode 100644
index 00000000..f689f10d
--- /dev/null
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/secondarybackground" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:background="@drawable/infocard_border"
+        android:orientation="vertical"
+        android:padding="16dp" >
+
+        <TextView
+            android:id="@+id/muc_jabberid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_settings_example_jabber_id"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline"
+            android:textStyle="bold"
+            android:layout_marginBottom="16dp"/>
+        
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/your_photo"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_alignParentLeft="true"
+                android:src="@drawable/ic_profile" >
+            </ImageView>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/your_photo"
+                android:orientation="vertical"
+                android:paddingLeft="8dp" >
+
+                <TextView
+                    android:id="@+id/muc_your_nick"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeHeadline" />
+
+                <TextView
+                    android:id="@+id/muc_role"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textColor="@color/primarytext"
+                    android:textSize="?attr/TextSizeBody" />
+            </LinearLayout>
+
+            <ImageButton
+                android:id="@+id/edit_nick_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="?android:selectableItemBackground"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_edit_dark" />
+        </RelativeLayout>
+         <TextView
+                android:id="@+id/details_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginTop="32dp"
+                android:text="@string/using_account"
+                android:textColor="@color/secondarytext"
+                android:textSize="?attr/TextSizeInfo" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/muc_more_details"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:background="@drawable/infocard_border"
+        android:orientation="vertical"
+        android:padding="8dp" >
+
+
+            <LinearLayout
+                android:id="@+id/muc_members"
+                android:layout_width="fill_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:divider="?android:dividerHorizontal"
+                android:orientation="vertical"
+                android:showDividers="middle" >
+            </LinearLayout>
+
+        <Button
+            android:id="@+id/invite"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="24dp"
+            android:text="@string/invite_contact" />
+    </LinearLayout>
+
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
new file mode 100644
index 00000000..fac499bc
--- /dev/null
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primarybackground" >
+
+    <LinearLayout
+        android:id="@+id/account_image_wrapper"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/message_border" >
+
+        <ImageView
+            android:id="@+id/account_image"
+            android:layout_width="194dp"
+            android:layout_height="194dp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/account_image_wrapper"
+        android:layout_centerHorizontal="true"
+        android:text="@string/touch_to_choose_picture"
+        android:textColor="@color/secondarytext" />
+
+    <TextView
+        android:id="@+id/secondary_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/hint"
+        android:layout_centerHorizontal="true"
+        android:text="@string/or_long_press_for_default"
+        android:textColor="@color/secondarytext" />
+
+    <LinearLayout
+        android:id="@+id/button_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true" >
+
+        <Button
+            android:id="@+id/cancel_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/cancel"
+            android:textColor="@color/primarytext" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="7dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/divider" />
+
+        <Button
+            android:id="@+id/publish_button"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:enabled="false"
+            android:text="@string/publish"
+            android:textColor="@color/secondarytext" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/button_bar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/secondary_hint"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp" >
+
+        <TextView
+            android:id="@+id/account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline" />
+
+        <TextView
+            android:id="@+id/hint_or_warning"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:minLines="3"
+            android:text="@string/publish_avatar_explanation"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeBody" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
new file mode 100644
index 00000000..f9c98529
--- /dev/null
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/start_conversation_view_pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primarybackground" >
+
+</android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
new file mode 100644
index 00000000..12ab3da1
--- /dev/null
+++ b/src/main/res/layout/contact.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:padding="8dp" >
+
+    <ImageView
+        android:id="@+id/contact_photo"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentLeft="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_profile" >
+    </ImageView>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/contact_photo"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
+
+        <TextView
+            android:id="@+id/contact_display_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline" />
+
+        <TextView
+            android:id="@+id/contact_jid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline"
+            android:typeface="monospace"
+            android:visibility="gone" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
new file mode 100644
index 00000000..7053857f
--- /dev/null
+++ b/src/main/res/layout/contact_key.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/button_remove"
+        android:orientation="vertical"
+        android:padding="8dp" >
+
+        <TextView
+            android:id="@+id/key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeBody"
+            android:typeface="monospace" />
+
+        <TextView
+            android:id="@+id/key_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/secondarytext"
+            android:textSize="?attr/TextSizeInfo"/>
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/button_remove"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:background="?android:selectableItemBackground"
+        android:padding="8dp"
+        android:src="@drawable/ic_action_remove"
+        android:visibility="invisible" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
new file mode 100644
index 00000000..21147b4a
--- /dev/null
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -0,0 +1,68 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="8dp" >
+
+    <ImageView
+        android:id="@+id/conversation_image"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_alignParentLeft="true"
+        android:scaleType="centerCrop" />
+
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/conversation_image"
+        android:paddingLeft="8dp" >
+
+        <TextView
+            android:id="@+id/conversation_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/conversation_lastwrapper"
+            android:layout_toLeftOf="@+id/conversation_lastupdate"
+            android:singleLine="true"
+            android:textColor="@color/primarytext"
+            android:textSize="?attr/TextSizeHeadline"
+            android:typeface="sans" />
+
+        <LinearLayout
+            android:id="@+id/conversation_lastwrapper"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/conversation_name"
+            android:orientation="vertical"
+            android:paddingTop="3dp" >
+
+            <TextView
+                android:id="@+id/conversation_lastmsg"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:scrollHorizontally="false"
+                android:singleLine="true"
+                android:textColor="@color/primarytext"
+                android:textSize="?attr/TextSizeBody" />
+
+            <ImageView
+                android:id="@+id/conversation_lastimage"
+                android:layout_width="fill_parent"
+                android:layout_height="36dp"
+                android:background="@color/primarytext"
+                android:scaleType="centerCrop" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/conversation_lastupdate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/conversation_name"
+            android:layout_alignParentRight="true"
+            android:gravity="right"
+            android:textColor="@color/secondarytext"
+            android:textSize="?attr/TextSizeInfo" />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
new file mode 100644
index 00000000..1ab4b686
--- /dev/null
+++ b/src/main/res/layout/create_contact_dialog.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+
+    <TextView
+        android:id="@+id/your_account"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/your_account"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeBody" />
+
+    <Spinner
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/jabber_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/account_settings_jabber_id"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeBody" />
+
+    <AutoCompleteTextView
+        android:id="@+id/jid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/account_settings_example_jabber_id"
+        android:inputType="textEmailAddress"
+        android:textColor="@color/primarytext"
+        android:textColorHint="@color/secondarytext" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
new file mode 100644
index 00000000..252808c8
--- /dev/null
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
+        android:text="@string/clear_histor_msg"
+        android:textSize="?attr/TextSizeBody" />
+
+    <CheckBox
+        android:id="@+id/end_conversation_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/also_end_conversation" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml
new file mode 100644
index 00000000..499ef6cd
--- /dev/null
+++ b/src/main/res/layout/dialog_verify_otr.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="16dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:text="@string/account_settings_jabber_id"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeHeadline" />
+
+    <TextView
+        android:id="@+id/verify_otr_jid"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:textColor="@color/secondarytext"
+        android:textSize="?attr/TextSizeBody" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:text="@string/otr_fingerprint"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeHeadline" />
+
+    <TextView
+        android:id="@+id/verify_otr_fingerprint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:textColor="@color/secondarytext"
+        android:textSize="?attr/TextSizeBody"
+        android:typeface="monospace" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:text="@string/your_fingerprint"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeHeadline" />
+
+    <TextView
+        android:id="@+id/verify_otr_yourprint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:textColor="@color/secondarytext"
+        android:textSize="?attr/TextSizeBody"
+        android:typeface="monospace" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
new file mode 100644
index 00000000..f9aae10a
--- /dev/null
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/secondarybackground" >
+
+    <ListView
+        android:id="@+id/messages_view"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/snackbar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:background="@color/secondarybackground"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:listSelector="@android:color/transparent"
+        android:stackFromBottom="true"
+        android:transcriptMode="normal"
+        tools:listitem="@layout/message_sent" >
+    </ListView>
+
+    <RelativeLayout
+        android:id="@+id/textsend"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:background="@color/primarybackground" >
+
+        <eu.siacs.conversations.ui.EditMessage
+            android:id="@+id/textinput"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@+id/textSendButton"
+            android:background="@color/primarybackground"
+            android:ems="10"
+            android:imeOptions="flagNoExtractUi|actionSend"
+            android:inputType="textShortMessage|textMultiLine|textCapSentences"
+            android:minHeight="48dp"
+            android:minLines="1"
+            android:paddingBottom="12dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:paddingTop="12dp"
+            android:textColor="@color/primarytext" >
+
+            <requestFocus />
+        </eu.siacs.conversations.ui.EditMessage>
+
+        <ImageButton
+            android:id="@+id/textSendButton"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="?android:selectableItemBackground"
+            android:src="@drawable/ic_action_send_now_offline" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/snackbar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/textsend"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:background="@drawable/snackbar"
+        android:minHeight="48dp"
+        android:visibility="gone" >
+
+        <TextView
+            android:id="@+id/snackbar_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/snackbar_action"
+            android:paddingLeft="24dp"
+            android:textColor="@color/ondarktext"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/snackbar_action"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:paddingBottom="16dp"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:paddingTop="16dp"
+            android:textAllCaps="true"
+            android:textColor="@color/ondarktext"
+            android:textSize="?attr/TextSizeBody"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
new file mode 100644
index 00000000..d4145761
--- /dev/null
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -0,0 +1,30 @@
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content_view_spl"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="288dp"
+        android:layout_height="match_parent"
+        android:background="@color/primarybackground"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@+id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/primarybackground"
+            android:divider="@color/divider"
+            android:dividerHeight="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/selected_conversation"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
new file mode 100644
index 00000000..95c9d24c
--- /dev/null
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+
+    <TextView
+        android:id="@+id/your_account"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/your_account"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeBody" />
+
+    <Spinner
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/jabber_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/conference_address"
+        android:textColor="@color/primarytext"
+        android:textSize="?attr/TextSizeBody" />
+
+    <AutoCompleteTextView
+        android:id="@+id/jid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/conference_address_example"
+        android:inputType="textEmailAddress"
+        android:textColor="@color/primarytext"
+        android:textColorHint="@color/secondarytext" />
+
+    <CheckBox
+        android:id="@+id/bookmark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:checked="true"
+        android:text="@string/save_as_bookmark" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
new file mode 100644
index 00000000..11ce35b2
--- /dev/null
+++ b/src/main/res/layout/manage_accounts.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/primarybackground" >
+
+    <ListView
+        android:id="@+id/account_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:divider="@color/divider"
+        android:dividerHeight="1dp" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_null.xml b/src/main/res/layout/message_null.xml
new file mode 100644
index 00000000..0e0f1c92
--- /dev/null
+++ b/src/main/res/layout/message_null.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="0dp"
+    android:background="#00000000">
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
new file mode 100644
index 00000000..730d00d5
--- /dev/null
+++ b/src/main/res/layout/message_received.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="4dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="4dp" >
+
+    <LinearLayout
+        android:id="@+id/message_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toRightOf="@+id/message_photo"
+        android:background="@drawable/message_border"
+        android:minHeight="48dp" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:background="@color/primarybackground"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingBottom="4dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="4dp" >
+
+            <ImageView
+                android:id="@+id/message_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:background="@color/primarytext"
+                android:paddingBottom="2dp"
+                android:scaleType="centerCrop" />
+
+            <TextView
+                android:id="@+id/message_body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:textColor="@color/primarytext"
+                android:textIsSelectable="true"
+                android:textSize="?attr/TextSizeBody" />
+
+            <Button
+                android:id="@+id/download_button"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/download_image"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="1dp" >
+
+                <ImageView
+                    android:id="@+id/security_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_secure_indicator" />
+
+                <TextView
+                    android:id="@+id/message_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:text="@string/sending"
+                    android:textColor="@color/secondarytext"
+                    android:textSize="?attr/TextSizeInfo" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/message_photo"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="-1.5dp"
+        android:padding="0dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_profile" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
new file mode 100644
index 00000000..e3e9b673
--- /dev/null
+++ b/src/main/res/layout/message_sent.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="4dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="4dp" >
+
+    <LinearLayout
+        android:id="@+id/message_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@+id/message_photo"
+        android:background="@drawable/message_border"
+        android:minHeight="48dp" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:background="@color/primarybackground"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingBottom="4dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="4dp" >
+
+            <ImageView
+                android:id="@+id/message_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:background="@color/primarytext"
+                android:paddingBottom="2dp"
+                android:scaleType="centerCrop" />
+
+            <TextView
+                android:id="@+id/message_body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:textColor="@color/primarytext"
+                android:textIsSelectable="true"
+                android:textSize="?attr/TextSizeBody" />
+            
+             <Button
+                android:id="@+id/download_button"
+                style="?android:attr/buttonStyleSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/download_image"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:orientation="horizontal"
+                android:paddingTop="1dp" >
+
+                <TextView
+                    android:id="@+id/message_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:text="@string/sending"
+                    android:textColor="@color/secondarytext"
+                    android:textSize="?attr/TextSizeInfo" />
+
+                <ImageView
+                    android:id="@+id/security_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_secure_indicator" />
+
+                <ImageView
+                    android:id="@+id/indicator_received"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_received_indicator" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/message_photo"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="-1.5dp"
+        android:padding="0dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_profile" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
new file mode 100644
index 00000000..d5f8bb33
--- /dev/null
+++ b/src/main/res/layout/message_status.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="6dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="6dp"
+    android:paddingTop="6dp" >
+
+    <ImageView
+        android:id="@+id/message_photo"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="-1.5dp"
+        android:padding="0dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_profile" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
new file mode 100644
index 00000000..20a2868a
--- /dev/null
+++ b/src/main/res/layout/quickedit.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp" >
+
+    <EditText
+        android:id="@+id/editor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:textColor="@color/primarytext" >
+
+        <requestFocus />
+    </EditText>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml
new file mode 100644
index 00000000..41b6033d
--- /dev/null
+++ b/src/main/res/layout/share_with.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ListView
+        android:id="@+id/choose_conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/conversation_list_row" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
new file mode 100644
index 00000000..20932489
--- /dev/null
+++ b/src/main/res/menu/attachment_choices.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/attach_choose_picture"
+        android:title="@string/attach_choose_picture"/>
+    <item
+        android:id="@+id/attach_take_picture"
+        android:title="@string/attach_take_picture"/>
+    <item
+        android:id="@+id/attach_record_voice"
+        android:title="@string/attach_record_voice"
+        android:visible="false"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
new file mode 100644
index 00000000..e39091b3
--- /dev/null
+++ b/src/main/res/menu/choose_contact.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_search"
+        android:actionLayout="@layout/actionview_search"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|always"
+        android:title="@string/search"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml
new file mode 100644
index 00000000..fd898580
--- /dev/null
+++ b/src/main/res/menu/conference_context.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/context_join_conference"
+        android:title="@string/join_conference"/>
+    <item
+        android:id="@+id/context_delete_conference"
+        android:title="@string/delete_bookmark"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml
new file mode 100644
index 00000000..11ac7d7c
--- /dev/null
+++ b/src/main/res/menu/contact_context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/context_start_conversation"
+        android:title="@string/start_conversation"/>
+    <item
+        android:id="@+id/context_contact_details"
+        android:title="@string/view_contact_details"/>
+    <item
+        android:id="@+id/context_delete_contact"
+        android:title="@string/delete_contact"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
new file mode 100644
index 00000000..02f2e813
--- /dev/null
+++ b/src/main/res/menu/contact_details.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_edit_contact"
+        android:icon="@drawable/ic_action_edit"
+        android:orderInCategory="10"
+        android:showAsAction="always"
+        android:title="@string/action_edit_contact"/>
+    <item
+        android:id="@+id/action_delete_contact"
+        android:icon="@drawable/ic_action_discard"
+        android:orderInCategory="10"
+        android:showAsAction="always"
+        android:title="@string/action_delete_contact"/>
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
new file mode 100644
index 00000000..3edee120
--- /dev/null
+++ b/src/main/res/menu/conversations.xml
@@ -0,0 +1,63 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_add"
+        android:icon="@drawable/ic_action_new"
+        android:orderInCategory="10"
+        android:showAsAction="always"
+        android:title="@string/action_add"/>
+    <item
+        android:id="@+id/action_security"
+        android:icon="@drawable/ic_action_not_secure"
+        android:orderInCategory="20"
+        android:showAsAction="always"
+        android:title="@string/action_secure"/>
+    <item
+        android:id="@+id/action_attach_file"
+        android:icon="@drawable/ic_action_new_attachment"
+        android:orderInCategory="30"
+        android:showAsAction="always"
+        android:title="@string/attach_file"/>
+    <item
+        android:id="@+id/action_contact_details"
+        android:orderInCategory="40"
+        android:showAsAction="never"
+        android:title="@string/action_contact_details"/>
+    <item
+        android:id="@+id/action_muc_details"
+        android:icon="@drawable/ic_action_group"
+        android:orderInCategory="40"
+        android:showAsAction="ifRoom"
+        android:title="@string/action_muc_details"/>
+    <item
+        android:id="@+id/action_invite"
+        android:orderInCategory="45"
+        android:showAsAction="never"
+        android:title="@string/invite_contact"/>
+    <item
+        android:id="@+id/action_clear_history"
+        android:orderInCategory="50"
+        android:showAsAction="never"
+        android:title="@string/action_clear_history"/>
+    <item
+        android:id="@+id/action_archive"
+        android:orderInCategory="60"
+        android:showAsAction="never"
+        android:title="@string/action_end_conversation"/>
+    <item
+        android:id="@+id/action_mute"
+        android:orderInCategory="70"
+        android:showAsAction="never"
+        android:title="@string/disable_notifications"/>
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
new file mode 100644
index 00000000..adf0ad8d
--- /dev/null
+++ b/src/main/res/menu/encryption_choices.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <group android:checkableBehavior="single" >
+        <item
+            android:id="@+id/encryption_choice_none"
+            android:title="@string/encryption_choice_none"/>
+        <item
+            android:id="@+id/encryption_choice_otr"
+            android:title="@string/encryption_choice_otr"/>
+        <item
+            android:id="@+id/encryption_choice_pgp"
+            android:title="@string/encryption_choice_pgp"/>
+    </group>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
new file mode 100644
index 00000000..b5cd9b50
--- /dev/null
+++ b/src/main/res/menu/manageaccounts.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_add_account"
+        android:icon="@drawable/ic_action_add_person"
+        android:showAsAction="always"
+        android:title="@string/action_add_account"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
new file mode 100644
index 00000000..7a7cc0a2
--- /dev/null
+++ b/src/main/res/menu/manageaccounts_context.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/mgmt_account_enable"
+        android:title="@string/mgmt_account_enable"/>
+    <item
+        android:id="@+id/mgmt_account_publish_avatar"
+        android:title="@string/mgmt_account_publish_avatar"/>
+    <item
+        android:id="@+id/mgmt_account_announce_pgp"
+        android:title="@string/mgmt_account_publish_pgp"/>
+    <item
+        android:id="@+id/mgmt_account_disable"
+        android:showAsAction="never"
+        android:title="@string/mgmt_account_disable"/>
+    <item
+        android:id="@+id/mgmt_account_delete"
+        android:title="@string/mgmt_account_delete"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
new file mode 100644
index 00000000..97369098
--- /dev/null
+++ b/src/main/res/menu/muc_details.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_edit_subject"
+        android:icon="@drawable/ic_action_edit"
+        android:orderInCategory="10"
+        android:showAsAction="always"
+        android:title="@string/action_edit_subject"/>
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
new file mode 100644
index 00000000..cbd15c11
--- /dev/null
+++ b/src/main/res/menu/share_with.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_add"
+        android:icon="@drawable/ic_action_new"
+        android:orderInCategory="10"
+        android:showAsAction="always"
+        android:title="@string/action_add"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
new file mode 100644
index 00000000..f7230169
--- /dev/null
+++ b/src/main/res/menu/start_conversation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_search"
+        android:actionLayout="@layout/actionview_search"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|always"
+        android:title="@string/search"/>
+    <item
+        android:id="@+id/action_create_contact"
+        android:icon="@drawable/ic_action_add_person"
+        android:showAsAction="always"
+        android:title="@string/create_contact"/>
+    <item
+        android:id="@+id/action_join_conference"
+        android:icon="@drawable/ic_action_add_group"
+        android:showAsAction="always"
+        android:title="@string/join_conference"/>
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/values-ca/arrays.xml b/src/main/res/values-ca/arrays.xml
new file mode 100644
index 00000000..ff1a0d4b
--- /dev/null
+++ b/src/main/res/values-ca/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mòbil</item>
+        <item>Telèfon</item>
+        <item>Tauleta</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>mai</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000..cfbe428b
--- /dev/null
+++ b/src/main/res/values-ca/strings.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Preferències</string>
+    <string name="action_add">Nova conversa</string>
+    <string name="action_accounts">Gestionar comptes</string>
+    <string name="action_end_conversation">Finalitzar conversa</string>
+    <string name="action_contact_details">Detalls del contacte</string>
+    <string name="action_muc_details">Detalls de la conferència</string>
+    <string name="action_secure">Conversa segura</string>
+    <string name="action_add_account">Afegir compte</string>
+    <string name="just_now">ara</string>
+    <string name="sending">enviant&#8230;</string>
+    <string name="encrypted_message">Desxifrant missatge. Espera si us plau&#8230;</string>
+    <string name="nick_in_use">El sobrenom ja està en ús</string>
+    <string name="moderator">Moderador</string>
+    <string name="participant">Participant</string>
+    <string name="visitor">Visitant</string>
+    <string name="remove_contact_text">Vols eliminar a %s de la teva llista?. La conversa associada a aquest compte no s\'eliminarà.</string>
+    <string name="register_account">Registrar nou compte al servidor</string>
+    <string name="share_with">Compartir amb</string>
+    <string name="start_conversation">Començar conversa</string>
+    <string name="cancel">Cancel·lar</string>
+    <string name="crash_report_title">Conversations s\'ha aturat.</string>
+    <string name="crash_report_message">Enviant bolcats de piles ajudes al desenvolupament de Conversations\n<b>Avís:</b> Això usarà el teu compte XMPP per enviar el bolcat de pila al desenvolupador.</string>
+    <string name="send_now">Enviar ara</string>
+    <string name="send_never">No preguntar de nou</string>
+    <string name="problem_connecting_to_account">No s\'ha pogut connectar al compte</string>
+    <string name="problem_connecting_to_accounts">No s\'ha pogut connectar a múltiples comptes</string>
+    <string name="touch_to_fix">Prem aqui per gestionar els teus comptes</string>
+    <string name="attach_file">Enviar arxiu</string>
+    <string name="not_in_roster">El contacte no està a la teva llista. Vols afegir-lo?</string>
+    <string name="add_contact">Afefgir contacte</string>
+    <string name="send_failed">Error a l\'enviar</string>
+    <string name="send_rejected">rebutjat</string>
+    <string name="receiving_image">Rebent arxiu d\'imatge. Espera si us plau&#8230;</string>
+    <string name="preparing_image">Preparant imatge per enviar</string>
+    <string name="action_clear_history">Netejar historial</string>
+    <string name="clear_conversation_history">Netejar historial de conversa</string>
+    <string name="clear_histor_msg">Vols esborrar tots els missatges d\'aquesta conversa?\n\n<b>Avís:</b> Això no afectarà els missatges desats en altres dispositius o servidors.</string>
+    <string name="delete_messages">Esborrar missatges</string>
+    <string name="also_end_conversation">Finalitzar aquesta conversa més tard</string>
+    <string name="choose_presence">Selecciona recurs del contacte</string>
+    <string name="send_plain_text_message">Enviar missatge de text</string>
+    <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
+    <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
+    <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
+    <string name="download_image">Descarregar imatge</string>
+    <string name="image_offered_for_download"><i>Fitxer d\'imatge ofert per a descàrrega</i></string>
+    <string name="send_unencrypted">Enviar sense xifrar</string>
+    <string name="decryption_failed">Ha fallat el desxiframent. Potser no tinguis la clau privada apropiada.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations utilitza una aplicació de tercers anomenada <b>OpenKeychain</b> per xifrar i desxifrar missatges i gestionar les teves claus públiques..\n\nOpenKeychain està publicat sota llicència GPLv3 i disponible a la F-Droid i Google Play.\n\n<small>(Si us plau, reinicieu Conversations després.)</small></string>
+    <string name="restart">Reiniciar</string>
+    <string name="install">Instal·lar</string>
+    <string name="offering">oferint&#8230;</string>
+    <string name="no_pgp_key">Clau OpenPGP no trobada</string>
+    <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
+    <string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
+    <string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
+    <string name="pref_xmpp_resource">Recursos XMPP</string>
+    <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
+    <string name="pref_accept_files">Acceptar fitxers</string>
+    <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string>
+    <string name="pref_notification_settings">Ajustos de notificacions</string>
+    <string name="pref_notifications">Notificacions</string>
+    <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
+    <string name="pref_vibrate">Vibra</string>
+    <string name="pref_vibrate_summary">Vibra quan arriba un nou missatge</string>
+    <string name="pref_sound">So</string>
+    <string name="pref_sound_summary">Reprodueix el to de trucada amb la notificació</string>
+    <string name="pref_conference_notifications">Notificacions de conferència</string>
+    <string name="pref_conference_notifications_summary">Sempre notifica quan arriba un nou missatge de conferència en comptes de només quan està destacat</string>
+    <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
+    <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
+    <string name="pref_advanced_options">Opcions avançades</string>
+    <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
+    <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
+    <string name="pref_ui_options">Opcions de UI</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-cs/arrays.xml b/src/main/res/values-cs/arrays.xml
new file mode 100644
index 00000000..4510cf84
--- /dev/null
+++ b/src/main/res/values-cs/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mobil</item>
+        <item>Telefon</item>
+        <item>Tablet</item>
+        <item>Konverzace</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>nikdy</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 minut</item>
+        <item>jedna hodina</item>
+        <item>2 hodiny</item>
+        <item>8 hodin</item>
+        <item>než opět změním</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000..185c5d31
--- /dev/null
+++ b/src/main/res/values-cs/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Nastavení</string>
+    <string name="action_add">Nová konverzace</string>
+    <string name="action_accounts">Nastavení účtů</string>
+    <string name="action_end_conversation">Ukončit tuto konverzaci</string>
+    <string name="action_contact_details">Detaily kontaktu</string>
+    <string name="action_muc_details">Detaily konference</string>
+    <string name="action_secure">Zabezpečená konverzace</string>
+    <string name="action_add_account">Přidat účet</string>
+    <string name="action_edit_contact">Upravit jméno</string>
+    <string name="action_add_phone_book">Přidat do telefonního seznamu</string>
+    <string name="action_delete_contact">Smazat ze seznamu</string>
+    <string name="title_activity_manage_accounts">Nastavení účtů</string>
+    <string name="title_activity_settings">Nastavení</string>
+    <string name="title_activity_conference_details">Detaily konference</string>
+    <string name="title_activity_contact_details">Detaily kontaktu</string>
+    <string name="title_activity_conversations">Konverzace</string>
+    <string name="title_activity_sharewith">Sdílet s konverzací</string>
+    <string name="title_activity_start_conversation">Začít konverzaci</string>
+    <string name="title_activity_choose_contact">Vybrat kontakt</string>
+    <string name="just_now">právě teď</string>
+    <string name="minute_ago">před 1 minutou</string>
+    <string name="minutes_ago">před %d minutami</string>
+    <string name="unread_conversations">nepřečtené konverzace</string>
+    <string name="sending">odesílám&#8230;</string>
+    <string name="encrypted_message">Dešifruji zprávu. Chvíli strpení&#8230;</string>
+    <string name="nick_in_use">Přezdívka se již používá</string>
+    <string name="admin">Administrátor</string>
+    <string name="owner">Vlastník</string>
+    <string name="moderator">Moderátor</string>
+    <string name="participant">Účastník</string>
+    <string name="visitor">Návštěvník</string>
+    <string name="remove_contact_text">Chcete odstranit %s ze svého seznamu? Konverzace spojené s tímto kontaktem nebudou odstraněny.</string>
+    <string name="remove_bookmark_text">Chcete odstranit %s ze záložek? Konverzace spojené s touto záložkou nebudou odstraněny.</string>
+    <string name="register_account">Registrovat nový účet na serveru</string>
+    <string name="share_with">Sdílet s</string>
+    <string name="start_conversation">Začít konverzaci</string>
+    <string name="invite_contact">Pozvat kontakt</string>
+    <string name="contacts">Kontakty</string>
+    <string name="cancel">Zrušit</string>
+    <string name="add">Přidat</string>
+    <string name="edit">Upravit</string>
+    <string name="delete">Smazat</string>
+    <string name="save">Uložit</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Aplikace Konverzace přestala reagovat</string>
+    <string name="crash_report_message">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace\n<b>Varování:</b> Toto použije nastavený XMPP účet pro zaslání detailů vývojářům.</string>
+    <string name="send_now">Odeslat teď</string>
+    <string name="send_never">Již se neptat</string>
+    <string name="problem_connecting_to_account">Připojení k účtu se nezdařilo</string>
+    <string name="problem_connecting_to_accounts">Připojení k několika účtům se nezdařilo</string>
+    <string name="touch_to_fix">Pro nastavení účtů tapni zde</string>
+    <string name="attach_file">Přiložit soubor</string>
+    <string name="not_in_roster">Kontakt není v seznamu. Chcete ho přidat?</string>
+    <string name="add_contact">Přidat kontakt</string>
+    <string name="send_failed">doručení selhalo</string>
+    <string name="send_rejected">zamítnuto</string>
+    <string name="receiving_image">Přijímám obrázek. Chvíli strpení&#8230;</string>
+    <string name="preparing_image">Připravuji obrázek na přenos</string>
+    <string name="action_clear_history">Smazat historii</string>
+    <string name="clear_conversation_history">Smaže historii konverzací</string>
+    <string name="clear_histor_msg">Chcete smazat všechny zprávy v této konverzaci?\n\n<b>Varování:</b> Toto neovlivní zprávy uložené na jiných přístrojích nebo serverech.</string>
+    <string name="delete_messages">Smazat zprávy</string>
+    <string name="also_end_conversation">Poté ukončit i tuto konverzaci</string>
+    <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
+    <string name="send_plain_text_message">Poslat textovou zprávu</string>
+    <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
+    <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
+    <string name="your_nick_has_been_changed">Přezdívka byla změněna</string>
+    <string name="download_image">Stáhnout obrázek</string>
+    <string name="image_offered_for_download"><i>Byl nabídnut obrázek ke stažení</i></string>
+    <string name="send_unencrypted">Poslat nešifrované</string>
+    <string name="decryption_failed">Zašifrování se nezdařilo. Možná nemáte správný privátní klíč.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Konverzace využívá aplikaci třetí strany, <b>OpenKeychain</b>, k šifrování a dešifrování zpráv a ke správě veřejných klíčů.\n\nOpenKeychain je licencován pod GPLv3 a dostupný na F-Droid a Google Play.\n\n<small>(Po instalaci prosím restartujte aplikaci Konverzace.)</small></string>
+    <string name="restart">Restartovat</string>
+    <string name="install">Instalovat</string>
+    <string name="offering">nabízí&#8230;</string>
+    <string name="waiting">čekám&#8230;</string>
+    <string name="no_pgp_key">Nebyl nalezen žádný OpenPGP klíč</string>
+    <string name="contact_has_no_pgp_key">Není možné zašifrovat zprávu v aplikaci Konverzace, protože druhá strana neoznamuje svůj veřejný klíč.\n\n<small>Požádejte svůj kontakt ať si nastaví OpenPGP.</small></string>
+    <string name="no_pgp_keys">Nebyly nalezeny žádné OpenPGP klíče</string>
+    <string name="contacts_have_no_pgp_keys">Není možné zašifrovat zprávy v aplikaci Konverzace, protože kontakty neoznamují svůj veřejný klíč.\n\n<small>Požádejte své kontakty ať si nastaví OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Byla přijata šifrovaná zpráva. Tapni pro dešifrování a přečtení.</i></string>
+    <string name="encrypted_image_received"><i>Byl přijat šifrovaný obrázek. Tapni pro dešifrování a prohlédnutí.</i></string>
+    <string name="image_file"><i>Byl přijat obrázek. Tapni pro prohlédnutí</i></string>
+    <string name="pref_general">Obecné</string>
+    <string name="pref_xmpp_resource">XMPP zdroj</string>
+    <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
+    <string name="pref_accept_files">Přijímat soubory</string>
+    <string name="pref_accept_files_summary">Automaticky přijímat soubory menší než&#8230;</string>
+    <string name="pref_notification_settings">Nastavení upozornění</string>
+    <string name="pref_notifications">Upozornění</string>
+    <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string>
+    <string name="pref_vibrate">Vibrovat</string>
+    <string name="pref_vibrate_summary">Vibrovat při přijetí nové zprávy</string>
+    <string name="pref_sound">Zvuk</string>
+    <string name="pref_sound_summary">Přehrát zvuk společně s upozorněním</string>
+    <string name="pref_conference_notifications">Upozornění při konferencích</string>
+    <string name="pref_conference_notifications_summary">Vždy upozorňovat při nové konferenční zprávě, nejen pokud je vybrána</string>
+    <string name="pref_notification_grace_period">Četnost upozornění</string>
+    <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string>
+    <string name="pref_advanced_options">Pokročilé nastavení</string>
+    <string name="pref_never_send_crash">Neodesílat detaily o pádu aplikace</string>
+    <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
+    <string name="pref_confirm_messages">Potvrzovat zprávy</string>
+    <string name="pref_confirm_messages_summary">Dá vědět kontaktům, že zpráva byla přijata a přečtena</string>
+    <string name="pref_ui_options">Nastavení UI</string>
+    <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
+    <string name="error_decrypting_file">I/O chyba dešifrování souboru</string>
+    <string name="accept">Přijmout</string>
+    <string name="error">Došlo k chybě</string>
+    <string name="pref_grant_presence_updates">Povolit aktualizace stavu</string>
+    <string name="pref_grant_presence_updates_summary">Aktivně povolovat a žádat o zasílání změn stavu pro vytvářené kontakty</string>
+    <string name="subscriptions">Odběry</string>
+    <string name="your_account">Váš účet</string>
+    <string name="keys">Klíče</string>
+    <string name="send_presence_updates">Zasílat změny stavu</string>
+    <string name="receive_presence_updates">Přijímat změny stavu</string>
+    <string name="ask_for_presence_updates">Zažádat o změny stavu</string>
+    <string name="attach_choose_picture">Vybrat obrázek</string>
+    <string name="attach_take_picture">Vyfotit obrázek</string>
+    <string name="preemptively_grant">Aktivně povolovat vyžádání změnu stavu</string>
+    <string name="error_not_an_image_file">Vybraný soubor není obrázek</string>
+    <string name="error_compressing_image">Chyba při konverzi obrázkového souboru</string>
+    <string name="error_file_not_found">Soubor nenalezen</string>
+    <string name="error_io_exception">Obecná I/O chyba. Že by již nebylo volné místo?</string>
+    <string name="error_security_exception_during_image_copy">Aplikace, která byla vybrána pro výběr obrázku, nepovolila přečtení souboru.\n\n<small>Zkuste použít jiného správce souborů pro výběr obrázku</small></string>
+    <string name="account_status_unknown">Neznámý</string>
+    <string name="account_status_disabled">Dočasně vypnuto</string>
+    <string name="account_status_online">Online</string>
+    <string name="account_status_connecting">Připojuji\u2026</string>
+    <string name="account_status_offline">Offline</string>
+    <string name="account_status_unauthorized">Nepřihlášen</string>
+    <string name="account_status_not_found">Server nenalezen</string>
+    <string name="account_status_no_internet">Žádné připojení</string>
+    <string name="account_status_regis_fail">Registrace selhala</string>
+    <string name="account_status_regis_conflict">Uživatelské jméno se již používá</string>
+    <string name="account_status_regis_success">Registrace dokončena</string>
+    <string name="account_status_regis_not_sup">Server nepodporuje registrace</string>
+    <string name="encryption_choice_none">Čistý text</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Upravit účet</string>
+    <string name="mgmt_account_delete">Smazat účet</string>
+    <string name="mgmt_account_disable">Dočasně vypnout</string>
+    <string name="mgmt_account_publish_avatar">Zveřejnit avatar</string>
+    <string name="mgmt_account_publish_pgp">Zveřejnit OpenPGP klíč</string>
+    <string name="mgmt_account_enable">Povolit účet</string>
+    <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
+    <string name="mgmt_account_delete_confirm_text">Pokud smažete svůj účet celá historie konverzací bude ztracena</string>
+    <string name="attach_record_voice">Nahrát hlas</string>
+    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_password">Heslo</string>
+    <string name="account_settings_example_jabber_id">jmeno@server.cz</string>
+    <string name="account_settings_confirm_password">Potvrdit heslo</string>
+    <string name="password">Heslo</string>
+    <string name="confirm_password">Potvrdit heslo</string>
+    <string name="passwords_do_not_match">Hesla nesouhlasí</string>
+    <string name="invalid_jid">Toto není platné Jabber ID</string>
+    <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
+    <string name="add_phone_book_text">Chcete přidat %s do svého telefonního seznamu?</string>
+    <string name="contact_status_online">online</string>
+    <string name="contact_status_free_to_chat">volný pro chat</string>
+    <string name="contact_status_away">pryč</string>
+    <string name="contact_status_extended_away">rozšířené pryč</string>
+    <string name="contact_status_do_not_disturb">nerušit</string>
+    <string name="contact_status_offline">offline</string>
+    <string name="muc_details_conference">Konference</string>
+    <string name="muc_details_other_members">Ostatní členové</string>
+    <string name="server_info_carbon_messages">XEP-0280: Kopie zpráv</string>
+    <string name="server_info_stream_management">XEP-0198: Nastavení proudu</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">dostupný</string>
+    <string name="server_info_unavailable">nedostupný</string>
+    <string name="missing_public_keys">Chybí oznámení o veřejném klíči</string>
+    <string name="last_seen_now">právě spatřen</string>
+    <string name="last_seen_min">naposledy spatřen před 1 minutou</string>
+    <string name="last_seen_mins">naposledy spatřen před %d minutami</string>
+    <string name="last_seen_hour">naposledy spatřen před 1 hodinou</string>
+    <string name="last_seen_hours">naposledy spatřen před %d hodinami</string>
+    <string name="last_seen_day">naposledy spatřen před 1 dnem</string>
+    <string name="last_seen_days">naposledy spatřen před %d dny</string>
+    <string name="never_seen">nebyl nikdy spatřen</string>
+    <string name="install_openkeychain">Šifrovaná zpráva. Nainstaluje prosím OpenKeychain pro dešifrování.</string>
+    <string name="unknown_otr_fingerprint">Neznámý OTR identifikátor</string>
+    <string name="openpgp_messages_found">Nalezena OpenPGP šifrovaná zpráva</string>
+    <string name="reception_failed">Příjem selhal</string>
+    <string name="your_fingerprint">Váš identifikátor</string>
+    <string name="otr_fingerprint">OTR identifikátor</string>
+    <string name="verify">Ověřit</string>
+    <string name="decrypt">Dešifrovat</string>
+    <string name="conferences">Konference</string>
+    <string name="search">Hledat</string>
+    <string name="create_contact">Vytvořit kontakt</string>
+    <string name="join_conference">Připojit ke konferenci</string>
+    <string name="delete_contact">Smazat kontakt</string>
+    <string name="view_contact_details">Zobrazit detaily kontaktu</string>
+    <string name="create">Vytvořit</string>
+    <string name="contact_already_exists">Kontakt již existuje</string>
+    <string name="join">Vstoupit</string>
+    <string name="conference_address">Adresa konference</string>
+    <string name="conference_address_example">mistnost@konference.server.cz</string>
+    <string name="save_as_bookmark">Uložit jako záložku</string>
+    <string name="delete_bookmark">Smazat záložku</string>
+    <string name="bookmark_already_exists">Tato záložka již existuje</string>
+    <string name="you">Já</string>
+    <string name="action_edit_subject">Upravit jméno konference</string>
+    <string name="conference_not_found">Konference nenalezena</string>
+    <string name="leave">Odejít</string>
+    <string name="contact_added_you">Kontakt přidán do seznamu</string>
+    <string name="add_back">Opět přidat</string>
+    <string name="contact_has_read_up_to_this_point">%s dočetl až sem</string>
+    <string name="publish">Zveřejnit</string>
+    <string name="touch_to_choose_picture">Tapnout na avatar a vybrat obrázek z galerie</string>
+    <string name="publish_avatar_explanation">Pozor: Každý s povolením vidět změny stavu uvidí tento obrázek.</string>
+    <string name="publishing">Zveřejňuji&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Server odmítl toto zveřejnění</string>
+    <string name="error_publish_avatar_converting">Při konverzi obrázku se něco nezdařilo</string>
+    <string name="error_saving_avatar">Nepodařilo se uložit avatar na disk</string>
+    <string name="or_long_press_for_default">(Stisknout dlouze pro obnovení výchozího stavu)</string>
+    <string name="error_publish_avatar_no_server_support">Váš server nepodporuje zveřejňování avataru</string>
+    <string name="private_message">šeptem</string>
+    <string name="private_message_to">pro %s</string>
+    <string name="send_private_message_to">Zaslat soukromou zprávu pro %s</string>
+    <string name="connect">Připojit</string>
+    <string name="account_already_exists">Tentou účet již existuje</string>
+    <string name="next">Další</string>
+    <string name="server_info_session_established">Současné sezení vytvořeno</string>
+    <string name="additional_information">Dodatečné informace</string>
+    <string name="skip">Přeskočit</string>
+    <string name="disable_notifications">Vypnout upozornění</string>
+    <string name="disable_notifications_for_this_conversation">Vypnout upozornění pro tuto konverzaci</string>
+    <string name="notifications_disabled">Upozornění jsou vypnuta</string>
+    <string name="enable">Povolit</string>
+    <string name="conference_requires_password">Konference vyžaduje heslo</string>
+    <string name="enter_password">Vložit heslo</string>
+    <string name="missing_presence_updates">Kontakt nezasílá informace o změně stavu</string>
+    <string name="request_presence_updates">Nejdříve si prosím vyžádejte povolení o zasílání změn stavu kontatku.\n\n<small>To bude poté použito pro zjištění jakou aplikaci tento kontakt používá.</small></string>
+    <string name="request_now">Ihned vyžádat</string>
+    <string name="delete_fingerprint">Smazat identifikátor</string>
+    <string name="sure_delete_fingerprint">Chcete opravdu smazat tento identifikátor?</string>
+    <string name="ignore">Ignorovat</string>
+    <string name="without_mutual_presence_updates"><b>Varování:</b> Odeslání bez povolení změn stavu může způsobit nečekané problémy na obou stranách.\n\n<small>Přejdi na detaily kontaktu pro ověření povolení o změnách stavu.</small></string>
+    <string name="pref_encryption_settings">Nastavení šifrování</string>
+    <string name="pref_force_encryption">Vynutit šifrování</string>
+    <string name="pref_force_encryption_summary">Vždy zasílat šifrované zprávy (mimo konference)</string>
+    <string name="pref_dont_save_encrypted">Neukládat šifrované zprávy</string>
+    <string name="pref_dont_save_encrypted_summary">Varování: Toto může vést ke ztrátě zpráv</string>
+    <string name="pref_expert_options">Expertní nastavení</string>
+    <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
+    <string name="pref_use_larger_font">Zvětšit velikost písma</string>
+    <string name="pref_use_larger_font_summary">Použít větší písmo v celé aplikaci</string>
+    <string name="pref_use_send_button_to_indicate_status">Tlačítko pro odeslání zobrazuje stav</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Obarvit tlačítko pro odeslání barvou stavu kontaktu</string>
+
+</resources>
diff --git a/src/main/res/values-de/arrays.xml b/src/main/res/values-de/arrays.xml
new file mode 100644
index 00000000..9b429c5a
--- /dev/null
+++ b/src/main/res/values-de/arrays.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mobile</item>
+        <item>Phone</item>
+        <item>Tablet</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>nie</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 Minuten</item>
+        <item>eine Stunde</item>
+        <item>2 Stunden</item>
+        <item>8 Stunden</item>
+        <item>bis auf Widerruf</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000..72121774
--- /dev/null
+++ b/src/main/res/values-de/strings.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="action_add">Neue Unterhaltung</string>
+    <string name="action_accounts">Konten verwalten</string>
+    <string name="action_end_conversation">Unterhaltung beenden</string>
+    <string name="action_contact_details">Kontaktdetails</string>
+    <string name="action_muc_details">Konferenzdetails</string>
+    <string name="action_secure">Verschlüsselte Unterhaltung</string>
+    <string name="action_add_account">Konto hinzufügen</string>
+    <string name="action_edit_contact">Name bearbeiten</string>
+    <string name="action_add_phone_book">Zum Telefonbuch hinzufügen</string>
+    <string name="action_delete_contact">Aus Kontaktliste entfernen</string>
+    <string name="title_activity_manage_accounts">Konten verwalten</string>
+    <string name="title_activity_settings">Einstellungen</string>
+    <string name="title_activity_conference_details">Konferenzdetails</string>
+    <string name="title_activity_contact_details">Kontaktdetails</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Mit Unterhaltung teilen</string>
+    <string name="title_activity_start_conversation">Beginne Unterhaltung</string>
+    <string name="title_activity_choose_contact">Kontakt auswählen</string>
+    <string name="just_now">gerade</string>
+    <string name="minute_ago">vor einer Minute</string>
+    <string name="minutes_ago">vor %d Minuten</string>
+    <string name="unread_conversations">ungelesene Unterhaltungen</string>
+    <string name="sending">senden&#8230;</string>
+    <string name="encrypted_message">Entschlüssele Nachricht. Bitte warten&#8230;</string>
+    <string name="nick_in_use">Nickname wird bereits verwendet</string>
+    <string name="admin">Administrator</string>
+    <string name="owner">Eigentümer</string>
+    <string name="moderator">Moderator</string>
+    <string name="participant">Teilnehmer</string>
+    <string name="visitor">Besucher</string>
+    <string name="remove_contact_text">Möchtest du %s von deiner Kontaktliste entfernen? Die Unterhaltung mit diesem Kontakt wird dabei nicht entfernt.</string>
+    <string name="remove_bookmark_text">Möchtest du das Lesezeichen %s entfernen? Die Unterhaltung mit diesem Lesezeichen wird dabei nicht entfernt.</string>
+    <string name="register_account">Neues Konto auf dem Server erstellen</string>
+    <string name="share_with">Teile mit&#8230;</string>
+    <string name="start_conversation">Beginne Unterhaltung</string>
+    <string name="invite_contact">Kontakt einladen</string>
+    <string name="contacts">Kontakte</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="add">Hinzufügen</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="delete">Entfernen</string>
+    <string name="save">Speichern</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Conversations ist abgestürzt</string>
+    <string name="crash_report_message">Durch das Einsenden von Fehlerberichten hilfst du bei der stetigen Verbesserung von Conversations.\n<b>Achtung:</b> Dies wird eines deiner XMPP-Konten benutzen, um den Entwickler zu kontaktieren.</string>
+    <string name="send_now">Jetzt abschicken</string>
+    <string name="send_never">Nie mehr nachfragen</string>
+    <string name="problem_connecting_to_account">Es gibt Probleme beim Verbindungsaufbau mit einem Konto</string>
+    <string name="problem_connecting_to_accounts">Es gibt Probleme beim Verbindungsaufbau mit mehreren Konto</string>
+    <string name="touch_to_fix">Drücke hier, um das Konto zu verwalten</string>
+    <string name="attach_file">Datei anfügen</string>
+    <string name="not_in_roster">Der Kontakt ist nicht in deiner Kontaktliste. Möchtest du ihn hinzufügen?</string>
+    <string name="add_contact">Kontakt hinzufügen</string>
+    <string name="send_failed">Zustellung nicht erfolgreich</string>
+    <string name="send_rejected">abgelehnt</string>
+    <string name="receiving_image">Empfange Bild. Bitte warten&#8230;</string>
+    <string name="preparing_image">Bereite Bild für die Übertragung vor</string>
+    <string name="action_clear_history">Verlauf löschen</string>
+    <string name="clear_conversation_history">Unterhaltungsverlauf löschen</string>
+    <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string>
+    <string name="delete_messages">Nachrichten löschen</string>
+    <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
+    <string name="choose_presence">Choose presence to contact</string>
+    <string name="send_plain_text_message">Unverschlüsselt schreiben</string>
+    <string name="send_otr_message">OTR-verschlüsselt schreiben</string>
+    <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben</string>
+    <string name="your_nick_has_been_changed">Dein Nickname wurde geändert</string>
+    <string name="download_image">Bild herunterladen</string>
+    <string name="image_offered_for_download"><i>Bilddatei zum Download angeboten</i></string>
+    <string name="send_unencrypted">Unverschlüsselt verschicken</string>
+    <string name="decryption_failed">Entschlüsselung fehlgeschlagen. Vielleicht hast du nicht den richtigen privaten Schlüssel.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations benutzt eine Drittanwendung namens <b>OpenKeychain</b>, um Nachrichten zu ver- und entschlüsseln und um deine Schlüssel zu verwalten.\n\nOpenKeychain ist GPLv3-lizenziert und kann über F-Droid oder Google Play bezogen werden.\n\n<small>(Bitte starte Conversations danach neu.)</small></string>
+    <string name="restart">Neustarten</string>
+    <string name="install">Installieren</string>
+    <string name="offering">angeboten&#8230;</string>
+    <string name="waiting">warten&#8230;</string>
+    <string name="no_pgp_key">Kein OpenPGP-Schlüssel gefunden</string>
+    <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge bitte OpenPGP einrichten.</small></string>
+    <string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string>
+    <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge bitte OpenPGP einrichten.</small></string>
+    <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier, um sie anzuzeigen und zu entschlüsseln.</i></string>
+    <string name="encrypted_image_received"><i>Verschlüsseltes Bild erhalten. Drücke hier, um es anzuzeigen und zu entschlüsseln.</i></string>
+    <string name="image_file"><i>Bild erhalten. Drücke hier, um es anzuzeigen.</i></string>
+    <string name="pref_general">Allgemein</string>
+    <string name="pref_xmpp_resource">XMPP-Ressource</string>
+    <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string>
+    <string name="pref_accept_files">Dateiannahme</string>
+    <string name="pref_accept_files_summary">Dateien, die kleiner sind als &#8230;, automatisch annehmen</string>
+    <string name="pref_notification_settings">Benachrichtigungseinstellungen</string>
+    <string name="pref_notifications">Benachrichtigungen</string>
+    <string name="pref_notifications_summary">Benachrichtige mich, wenn eine neue Nachricht ankommt</string>
+    <string name="pref_vibrate">Vibrieren</string>
+    <string name="pref_vibrate_summary">Vibriere, wenn eine neue Nachricht ankommt</string>
+    <string name="pref_sound">Klingelton</string>
+    <string name="pref_sound_summary">Spiele Klingelton, wenn eine neue Nachricht ankommt</string>
+    <string name="pref_conference_notifications">Konferenz-Benachrichtigungen</string>
+    <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenznachricht und nicht nur, wenn ich angesprochen werde.</string>
+    <string name="pref_notification_grace_period">Gnadenfrist</string>
+    <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
+    <string name="pref_advanced_options">Erweiterte Optionen</string>
+    <string name="pref_never_send_crash">Sende niemals Absturzberichte</string>
+    <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
+    <string name="pref_confirm_messages">Lesebestätigung senden</string>
+    <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfängst oder liest</string>
+    <string name="openpgp_error">Fehler mit OpenKeychain</string>
+    <string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string>
+    <string name="accept">Annehmen</string>
+    <string name="error">Ein unbekannter Fehler ist aufgetreten</string>
+    <string name="pref_grant_presence_updates">Online-Status</string>
+    <string name="pref_grant_presence_updates_summary">Erlaube Kontakten, die von dir erstellt wurden, deinen Status zu sehen und frage um Erlaubnis, ihren sehen zu dürfen</string>
+    <string name="subscriptions">Abonnements</string>
+    <string name="your_account">Dein Konto</string>
+    <string name="keys">Schlüssel</string>
+    <string name="send_presence_updates">Anwesenheitsbenachrichtigungen senden</string>
+    <string name="receive_presence_updates">Empfange Anwesenheitsbenachrichtigungen</string>
+    <string name="ask_for_presence_updates">Frage um Erlaubnis, Anwesenheitsbenachrichtigungen sehen zu dürfen</string>
+    <string name="attach_choose_picture">Foto auswählen</string>
+    <string name="attach_take_picture">Foto aufnehmen</string>
+    <string name="preemptively_grant">Erlaube Statusanfrage vorab</string>
+    <string name="error_not_an_image_file">Die ausgewählte Datei ist kein Bild</string>
+    <string name="error_compressing_image">Fehler beim Umwandeln des Bildes</string>
+    <string name="error_file_not_found">Datei nicht gefunden</string>
+    <string name="error_io_exception">Allgemeiner Fehler. Vielleicht hast du keinen Speicherplatz mehr?</string>
+    <string name="error_security_exception_during_image_copy">Die App, mit der du das Bild ausgesucht hast, hat uns keine Rechte eingeräumt, das Bild zu betrachten.\n\n<small>Benutze einen anderen Dateimanager</small></string>
+    <string name="account_status_unknown">Unbekannt</string>
+    <string name="account_status_disabled">Vorübergehend abgeschaltet</string>
+    <string name="account_status_online">Online</string>
+    <string name="account_status_connecting">Verbinde\u2026</string>
+    <string name="account_status_offline">Offline</string>
+    <string name="account_status_unauthorized">Ungültige Zugangsdaten</string>
+    <string name="account_status_not_found">Server nicht gefunden</string>
+    <string name="account_status_no_internet">Keine Internetverbindung</string>
+    <string name="account_status_regis_fail">Registrierung fehlgeschlagen</string>
+    <string name="account_status_regis_conflict">Benutzername wird bereits verwendet</string>
+    <string name="account_status_regis_success">Registrierung abgeschlossen</string>
+    <string name="account_status_regis_not_sup">Der Server unterstützt keine Registrierung</string>
+    <string name="encryption_choice_none">Klartext</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Konto bearbeiten</string>
+    <string name="mgmt_account_delete">Löschen</string>
+    <string name="mgmt_account_disable">Vorübergehend abschalten</string>
+    <string name="mgmt_account_publish_avatar">Avatar veröffentlichen</string>
+    <string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string>
+    <string name="mgmt_account_enable">Anschalten</string>
+    <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
+    <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löscht, gehen alle Gesprächsverläufe verloren</string>
+    <string name="attach_record_voice">Sprache aufzeichnen</string>
+    <string name="account_settings_jabber_id">Jabber-ID:</string>
+    <string name="account_settings_password">Passwort:</string>
+    <string name="account_settings_example_jabber_id">benutzer@domain.de</string>
+    <string name="account_settings_confirm_password">Passwort bestätigen</string>
+    <string name="password">Passwort</string>
+    <string name="confirm_password">Passwort bestätigen</string>
+    <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
+    <string name="invalid_jid">Ungültige Jabber-ID</string>
+    <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
+    <string name="add_phone_book_text">Möchtest du %s zum Telefonbuch hinzufügen?</string>
+    <string name="contact_status_online">Online</string>
+    <string name="contact_status_free_to_chat">Bereit</string>
+    <string name="contact_status_away">Abwesend</string>
+    <string name="contact_status_extended_away">Abwesend (erweitert)</string>
+    <string name="contact_status_do_not_disturb">Nicht stören</string>
+    <string name="contact_status_offline">Offline</string>
+    <string name="muc_details_conference">Konferenz</string>
+    <string name="muc_details_other_members">Andere Mitglieder</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatare)</string>
+    <string name="server_info_available">verfügbar</string>
+    <string name="server_info_unavailable">nicht verfügbar</string>
+    <string name="missing_public_keys">Öffentlicher Schlüssel fehlt</string>
+    <string name="last_seen_now">Gerade online</string>
+    <string name="last_seen_min">Vor einer Minute gesehen</string>
+    <string name="last_seen_mins">Vor %d Minuten gesehen</string>
+    <string name="last_seen_hour">Vor einer Stunde gesehen</string>
+    <string name="last_seen_hours">Vor %d Stunden gesehen</string>
+    <string name="last_seen_day">Vor einem Tag gesehen</string>
+    <string name="last_seen_days">Vor %d Tagen gesehen</string>
+    <string name="never_seen">Noch nie gesehen</string>
+    <string name="install_openkeychain">Verschlüsselte Nachricht. Bitte installiere OpenKeychain zur Entschlüsselung.</string>
+    <string name="unknown_otr_fingerprint">Unbekannter OTR-Fingerabdruck</string>
+    <string name="openpgp_messages_found">Verschlüsselte OpenPGP-Nachricht gefunden</string>
+    <string name="reception_failed">Empfang ist fehlgeschlagen</string>
+    <string name="your_fingerprint">Dein Fingerabdruck</string>
+    <string name="otr_fingerprint">OTR-Fingerabdruck</string>
+    <string name="verify">Verifizieren</string>
+    <string name="decrypt">Entschlüsseln</string>
+    <string name="conferences">Konferenzen</string>
+    <string name="search">Suche</string>
+    <string name="create_contact">Kontakt erstellen</string>
+    <string name="join_conference">Konferenz beitreten</string>
+    <string name="delete_contact">Kontakt löschen</string>
+    <string name="view_contact_details">Kontaktdetails anzeigen</string>
+    <string name="create">Erstellen</string>
+    <string name="contact_already_exists">Der Kontakt existiert bereits</string>
+    <string name="join">Beitreten</string>
+    <string name="conference_address">Konferenzadresse</string>
+    <string name="conference_address_example">raum@conference.example.com</string>
+    <string name="save_as_bookmark">Als Lesezeichen speichern</string>
+    <string name="delete_bookmark">Lesezeichen löschen</string>
+    <string name="bookmark_already_exists">Das Lesezeichen existiert bereits</string>
+    <string name="you">Du</string>
+    <string name="action_edit_subject">Konferenzthema anpassen</string>
+    <string name="conference_not_found">Konferenz nicht gefunden</string>
+    <string name="leave">Verlassen</string>
+    <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
+    <string name="add_back">Auch hinzufügen</string>
+    <string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
+    <string name="publish">Veröffentlichen</string>
+    <string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string>
+    <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
+    <string name="publishing">Veröffentliche&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Der Server hat die Veröffentlichung des Avatars abgelehnt.</string>
+    <string name="error_publish_avatar_converting">Bei der Konvertierung des Avatars lief etwas schief.</string>
+    <string name="error_saving_avatar">Kann Avatar nicht speichern.</string>
+    <string name="or_long_press_for_default">(Oder klicke lange, um Standard wiederherzustellen)</string>
+    <string name="error_publish_avatar_no_server_support">Dein Server unterstützt die Veröffentlichung von Avataren nicht.</string>
+    <string name="private_message">private Nachricht</string>
+    <string name="private_message_to">an %s</string>
+    <string name="send_private_message_to">Sende private Nachricht an %s</string>
+    <string name="connect">Verbinden</string>
+    <string name="account_already_exists">Das Konto existiert bereits</string>
+    <string name="next">Weiter</string>
+    <string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string>
+    <string name="additional_information">Zusätzliche Informationen</string>
+    <string name="skip">Überspringen</string>
+    <string name="pref_ui_options">Benutzeroberfläche</string>
+    <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
+    <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häckchen markiert. Bitte beachte das dies nicht unbedingt in allen Fällen funktioniert.</string>
+    <string name="disable_notifications">Benachrichtigungen deaktivieren</string>
+    <string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
+    <string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
+    <string name="enable">Aktivieren</string>
+    <string name="conference_requires_password">Konferenz ist passwortgeschützt</string>
+    <string name="enter_password">Passwort eingeben</string>
+    <string name="missing_presence_updates">Fehlender Online-Status vom Kontakt</string>
+    <string name="request_presence_updates">Bitte erst Anwesenheitsbenachrichtigungen vom Kontakt anfordern.\n\n</string>
+    <string name="request_now">Jetzt anfordern</string>
+    <string name="delete_fingerprint">Fingerabdruck löschen</string>
+    <string name="sure_delete_fingerprint">Soll dieser Fingerabdruck definitiv gelöscht werden?</string>
+    <string name="ignore">Ignorieren</string>
+    <string name="without_mutual_presence_updates"><b>Achtung:</b> Es kann zu unerwarteten Problemen führen, dies ohne gegenseitige Anwesenheitsbenachrichtigungen abzusenden.\n\n<small>Bitte die Online-Status-Abonnements in den Kontaktdetails prüfen.</small></string>
+    <string name="pref_encryption_settings">Verschlüsselungs-Einstellungen</string>
+    <string name="pref_force_encryption">Ende-zu-Ende-Verschlüsselung forcieren</string>
+    <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string>
+    <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
+    <string name="pref_dont_save_encrypted_summary">Achtung: Kann zu Nachrichtenverlust führen</string>
+    <string name="pref_expert_options">Einstellungen für Experten</string>
+    <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
+    <string name="pref_use_larger_font">Schriftgröße erhöhen</string>
+    <string name="pref_use_larger_font_summary">Überall in der App eine größere Schrift verwenden</string>
+    <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
+    <string name="pref_expert_options_other">Sonstiges</string>
+    <string name="pref_conference_name">Konferenz-Name</string>
+    <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Name verwenden</string>
+    <string name="toast_message_otr_fingerprint">OTR Fingerabdruck in die Zwischenablage kopiert!</string>
+    <string name="conference_banned">Du wurdest aus dem Konferenzraum verbannt</string>
+    <string name="conference_members_only">Der Konferenzraum ist nur für Mitglieder</string>
+    <string name="conference_kicked">Du wurdest aus dem Konferenzraum geworfen</string>
+
+</resources>
diff --git a/src/main/res/values-es/arrays.xml b/src/main/res/values-es/arrays.xml
new file mode 100644
index 00000000..15231955
--- /dev/null
+++ b/src/main/res/values-es/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Móvil</item>
+        <item>Teléfono</item>
+        <item>Tablet</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>nunca</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 minutos</item>
+        <item>1 hora</item>
+        <item>2 horas</item>
+        <item>8 horas</item>
+        <item>Hasta nuevo aviso</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..7fdc95c0
--- /dev/null
+++ b/src/main/res/values-es/strings.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Ajustes</string>
+    <string name="action_add">Nueva conversación</string>
+    <string name="action_accounts">Gestionar cuentas</string>
+    <string name="action_end_conversation">Terminar conversación</string>
+    <string name="action_contact_details">Detalles del contacto</string>
+    <string name="action_muc_details">Detalles de la conferencia</string>
+    <string name="action_secure">Conversación segura</string>
+    <string name="action_add_account">Añadir cuenta</string>
+    <string name="action_edit_contact">Editar contacto</string>
+    <string name="action_delete_contact">Eliminar contacto de la lista</string>
+    <string name="action_add_phone_book">Añadir a contactos del teléfono</string>
+    <string name="title_activity_manage_accounts">Gestionar Cuentas</string>
+    <string name="title_activity_settings">Ajustes</string>
+    <string name="title_activity_conference_details">Detalles de Conferencia</string>
+    <string name="title_activity_contact_details">Detalles del Contacto</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Compartir con Conversación</string>
+    <string name="title_activity_start_conversation">Nueva Conversación</string>
+    <string name="title_activity_choose_contact">Elegir Contacto</string>
+    <string name="just_now">ahora</string>
+    <string name="minute_ago">hace 1 min</string>
+    <string name="minutes_ago">hace %d min</string>
+    <string name="unread_conversations">conversaciones por leer</string>
+    <string name="sending">enviando&#8230;</string>
+    <string name="encrypted_message">Desencriptando mensaje. Espera por favor&#8230;</string>
+    <string name="nick_in_use">El apodo ya está en uso</string>
+    <string name="admin">Administrador</string>
+    <string name="owner">Propietario</string>
+    <string name="moderator">Moderador</string>
+    <string name="participant">Participante</string>
+    <string name="visitor">Visitante</string>
+    <string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string>
+    <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación de la conferencia asociada con este marcador no se eliminará.</string>
+    <string name="register_account">Registrar nueva cuenta en servidor</string>
+    <string name="share_with">Compartir con</string>
+    <string name="start_conversation">Comenzar conversación</string>
+    <string name="invite_contact">Invitar contactos</string>
+    <string name="contacts">Contactos</string>
+    <string name="cancel">Cancelar</string>
+    <string name="add">Añadir</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Eliminar</string>
+    <string name="save">Guardar</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Conversations se ha detenido.</string>
+    <string name="crash_report_message">Si envías un informe de fallos ayudas al desarrollo de Conversations\n<b>Aviso:</b> Esto usará tu cuenta XMPP para enviar los registros de error al desarrollador.</string>
+    <string name="send_now">Enviar ahora</string>
+    <string name="send_never">No preguntar de nuevo</string>
+    <string name="problem_connecting_to_account">No se ha podido conectar a la cuenta</string>
+    <string name="problem_connecting_to_accounts">No se ha podido conectar a múltiples cuentas</string>
+    <string name="touch_to_fix">Pulsa aquí para gestionar tus cuentas</string>
+    <string name="attach_file">Adjuntar</string>
+    <string name="not_in_roster">El contacto no está en tu lista. ¿Te gustaría añadirlo?</string>
+    <string name="add_contact">Añadir contacto</string>
+    <string name="send_failed">Error al enviar</string>
+    <string name="send_rejected">rechazado</string>
+    <string name="receiving_image">Recibiendo archivo de imagen. Espera por favor&#8230;</string>
+    <string name="preparing_image">Preparando imagen para enviar</string>
+    <string name="action_clear_history">Limpiar historial</string>
+    <string name="clear_conversation_history">Limpiar historial de conversación</string>
+    <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
+    <string name="delete_messages">Borrar mensajes</string>
+    <string name="also_end_conversation">Terminar esta conversación más tarde</string>
+    <string name="choose_presence">Selecciona recurso del contacto</string>
+    <string name="send_plain_text_message">Enviar mensaje de texto</string>
+    <string name="send_otr_message">Enviar mensaje encriptado con OTR</string>
+    <string name="send_pgp_message">Enviar mensaje encriptado con OpenPGP</string>
+    <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string>
+    <string name="download_image">Descargar imagen</string>
+    <string name="image_offered_for_download"><i>Archivo de imagen ofrecido para descarga</i></string>
+    <string name="send_unencrypted">Enviar sin encriptar</string>
+    <string name="decryption_failed">Falló la desencriptación. Tal vez no tengas la clave privada apropiada.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para encriptar y desencriptar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string>
+    <string name="restart">Reiniciar</string>
+    <string name="install">Instalar</string>
+    <string name="offering">ofreciendo&#8230;</string>
+    <string name="waiting">esperando&#8230;</string>
+    <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
+    <string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
+    <string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
+    <string name="contacts_have_no_pgp_keys">Conversations no ha podido encriptar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Mensaje encriptado recibido. Pulsa para ver.</i></string>
+    <string name="encrypted_image_received"><i>Imagen encriptada recibida. Pulsa para ver.</i></string>
+    <string name="image_file"><i>Imagen recibida. Pulsa para ver</i></string>
+    <string name="pref_general">General</string>
+    <string name="pref_xmpp_resource">Recurso</string>
+    <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
+    <string name="pref_accept_files">Aceptar archivos</string>
+    <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que&#8230;</string>
+    <string name="pref_notification_settings">Ajustes de notificación</string>
+    <string name="pref_notifications">Notificaciones</string>
+    <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string>
+    <string name="pref_vibrate">Vibrar</string>
+    <string name="pref_vibrate_summary">Vibra cuando llega un nuevo mensaje</string>
+    <string name="pref_sound">Sonido</string>
+    <string name="pref_sound_summary">Reproduce tono con la notificación</string>
+    <string name="pref_conference_notifications">Notificaciones de conferencia</string>
+    <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje de conferencia y no solo cuando llega un mensaje destacado</string>
+    <string name="pref_notification_grace_period">Notificaciones Carbons</string>
+    <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
+    <string name="pref_advanced_options">Opciones avanzadas</string>
+    <string name="pref_never_send_crash">Nunca enviar informe de fallos</string>
+    <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
+    <string name="pref_confirm_messages">Confirmar Mensajes</string>
+    <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string>
+    <string name="pref_ui_options">Opciones de interfaz</string>
+    <string name="openpgp_error">OpenKeychain reportó un error</string>
+    <string name="error_decrypting_file">Error desencriptando fichero</string>
+    <string name="accept">Aceptar</string>
+    <string name="error">Ha ocurrido un error</string>
+    <string name="pref_grant_presence_updates">Suscripción de presencia</string>
+    <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder suscripciones de presencia de los contactos que has creado</string>
+    <string name="subscriptions">Suscripciones</string>
+    <string name="your_account">Tu cuenta</string>
+    <string name="keys">Claves</string>
+    <string name="send_presence_updates">Enviar actualizaciones de presencia</string>
+    <string name="receive_presence_updates">Recibir actualizaciones de presencia</string>
+    <string name="ask_for_presence_updates">Solicitar actualizaciones de presencia</string>
+    <string name="attach_choose_picture">Seleccionar imagen</string>
+    <string name="attach_take_picture">Hacer foto</string>
+    <string name="preemptively_grant">De forma automática conceder solicitud de suscripción</string>
+    <string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string>
+    <string name="error_compressing_image">Error comprimiendo el archivo de imagen</string>
+    <string name="error_file_not_found">Archivo no encontrado</string>
+    <string name="error_io_exception">Error general. ¿Puede que no tengas espacio en disco?</string>
+    <string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar imágenes no proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de ficheros diferente para seleccionar la imagen</small></string>
+    <string name="account_status_unknown">Desconocido</string>
+    <string name="account_status_disabled">Deshabilitado temporalmente</string>
+    <string name="account_status_online">Conectado</string>
+    <string name="account_status_connecting">Conectando\u2026</string>
+    <string name="account_status_offline">Desconectado</string>
+    <string name="account_status_unauthorized">No autorizado</string>
+    <string name="account_status_not_found">Servidor no encontrado</string>
+    <string name="account_status_no_internet">Sin conectividad</string>
+    <string name="account_status_regis_fail">Error en el registro</string>
+    <string name="account_status_regis_conflict">El identificador ya está en uso</string>
+    <string name="account_status_regis_success">Registro completado</string>
+    <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
+    <string name="encryption_choice_none">Texto plano</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Editar cuenta</string>
+    <string name="mgmt_account_delete">Eliminar cuenta</string>
+    <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
+    <string name="mgmt_account_publish_avatar">Imagen de perfil</string>
+    <string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string>
+    <string name="mgmt_account_enable">Habilitar</string>
+    <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
+    <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
+    <string name="attach_record_voice">Grabar audio</string>
+    <string name="account_settings_jabber_id">Identificador Jabber</string>
+    <string name="account_settings_password">Contraseña</string>
+    <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
+    <string name="account_settings_confirm_password">Confirmar contraseña</string>
+    <string name="password">Contraseña</string>
+    <string name="confirm_password">Confirmar contraseña</string>
+    <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
+    <string name="invalid_jid">El identificador no es un identificador de Jabber válido</string>
+    <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
+    <string name="add_phone_book_text">¿Te gustaría añadir a %s a tus contactos del teléfono?</string>
+    <string name="contact_status_online">Disponible</string>
+    <string name="contact_status_free_to_chat">Hablador</string>
+    <string name="contact_status_away">Ausente</string>
+    <string name="contact_status_extended_away">Ausencia extendida</string>
+    <string name="contact_status_do_not_disturb">No molestar</string>
+    <string name="contact_status_offline">Desconectado</string>
+    <string name="muc_details_conference">Conferencia</string>
+    <string name="muc_details_other_members">Otros Miembros</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">Sí</string>
+    <string name="server_info_unavailable">No</string>
+    <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string>
+    <string name="last_seen_now">Visto última vez ahora</string>
+    <string name="last_seen_min">Visto última vez hace 1 minuto</string>
+    <string name="last_seen_mins">Visto última vez hace %d minutos</string>
+    <string name="last_seen_hour">Visto última vez hace 1 hora</string>
+    <string name="last_seen_hours">Visto última vez hace %d horas</string>
+    <string name="last_seen_day">Visto última vez hace 1 día</string>
+    <string name="last_seen_days">Visto última vez hace %d días</string>
+    <string name="never_seen">Nunca visto</string>
+    <string name="install_openkeychain">Mensaje encriptado. Por favor instala OpenKeychain para desencriptar.</string>
+    <string name="unknown_otr_fingerprint">Clave OTR desconocida</string>
+    <string name="openpgp_messages_found">Encontrado mensaje encriptado con OpenPGP</string>
+    <string name="reception_failed">Error al recibir</string>
+    <string name="your_fingerprint">Tu clave</string>
+    <string name="otr_fingerprint">Clave OTR</string>
+    <string name="verify">Verificar</string>
+    <string name="decrypt">Desencriptar</string>
+    <string name="conferences">Conferencias</string>
+    <string name="search">Buscar</string>
+    <string name="create_contact">Crear Contacto</string>
+    <string name="join_conference">Unirse a Conferencia</string>
+    <string name="delete_contact">Eliminar Contacto</string>
+    <string name="view_contact_details">Ver detalles del contacto</string>
+    <string name="create">Crear</string>
+    <string name="contact_already_exists">El contacto ya existe</string>
+    <string name="join">Unirse</string>
+    <string name="conference_address">Dirección de la Conferencia</string>
+    <string name="conference_address_example">nombre@conferencia.ejemplo.com</string>
+    <string name="save_as_bookmark">Guardar en marcadores</string>
+    <string name="delete_bookmark">Eliminar marcador</string>
+    <string name="bookmark_already_exists">Este marcador ya exsite</string>
+    <string name="you">Tú</string>
+    <string name="action_edit_subject">Editar asunto de la conferencia</string>
+    <string name="conference_not_found">Conferencia no encontrada</string>
+    <string name="leave">Salir</string>
+    <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
+    <string name="add_back">Añadir contacto</string>
+    <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
+    <string name="publish">Publicar</string>
+    <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
+    <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
+    <string name="publishing">Publicando&#8230;</string>
+    <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string>
+    <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string>
+    <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string>
+    <string name="or_long_press_for_default">(O pulsación prolongada para volver a tu imagen de la agenda)</string>
+    <string name="error_publish_avatar_no_server_support">Tu servidor no soporta la publicación de imágenes de perfil</string>
+    <string name="private_message">en privado</string>
+    <string name="private_message_to">en privado para %s</string>
+    <string name="send_private_message_to">Enviar mensaje privado a %s</string>
+    <string name="connect">Conectar</string>
+    <string name="account_already_exists">Esta cuenta ya existe</string>
+    <string name="next">Siguiente</string>
+    <string name="server_info_session_established">Inicio sesión actual</string>
+    <string name="additional_information">Información adicional</string>
+    <string name="skip">Omitir</string>
+    <string name="disable_notifications">Deshabilitar notificaciones</string>
+    <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string>
+    <string name="notifications_disabled">Las notificaciones están deshabilitadas</string>
+    <string name="enable">Habilitar</string>
+    <string name="conference_requires_password">La conferencia requiere contraseña</string>
+    <string name="enter_password">Introduce la contraseña</string>
+    <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto perdida</string>
+    <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto será usado para determinar qué cliente(s) está usando tu contacto.</small></string>
+    <string name="request_now">Solicitar ahora</string>
+    <string name="delete_fingerprint">Eliminar Clave OTR</string>
+    <string name="sure_delete_fingerprint">¿Estás seguro que quieres eliminar la clave OTR?</string>
+    <string name="ignore">Ignorar</string>
+    <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string>
+    <string name="pref_encryption_settings">Ajustes de encriptación</string>
+    <string name="pref_force_encryption">Forzar encriptación end-to-end</string>
+    <string name="pref_force_encryption_summary">Siempre enviar mensajes encriptados (excepto para conferencias)</string>
+    <string name="pref_dont_save_encrypted">No guardar mensajes encriptados</string>
+    <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string>
+    <string name="pref_expert_options">Ajustes avanzados</string>
+    <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
+    <string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
+    <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
+    <string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string>
+    <string name="pref_use_indicate_received">Solicitar entrega de mensaje</string>
+    <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
+    <string name="pref_expert_options_other">Otros</string>
+    <string name="pref_conference_name">Nombre de conferencia</string>
+    <string name="pref_conference_name_summary">Usar el asunto de la conferencia en lugar del identificador jabber como nombre de conferencia</string>
+    <string name="toast_message_otr_fingerprint">¡Clave OTR copiada en el portapapeles!</string>
+    <string name="conference_banned">Tu entrada a esta conferencia ha sido prohibida</string>
+    <string name="conference_members_only">Esta conferencia es solo para miembros</string>
+    <string name="conference_kicked">Has sido expulsado de esta conferencia</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-eu/arrays.xml b/src/main/res/values-eu/arrays.xml
new file mode 100644
index 00000000..a34d3c6a
--- /dev/null
+++ b/src/main/res/values-eu/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mugikorra</item>
+        <item>Telefonoa</item>
+        <item>Tableta</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>inoiz</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 minutu</item>
+        <item>ordu bat</item>
+        <item>2 ordu</item>
+        <item>8 ordu</item>
+        <item>abisatu arte</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
new file mode 100644
index 00000000..43c141ea
--- /dev/null
+++ b/src/main/res/values-eu/strings.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Ezarpenak</string>
+    <string name="action_add">Elkarrizketa berria</string>
+    <string name="action_accounts">Kontuak kudeatu</string>
+    <string name="action_end_conversation">Elkarrizketa hau amaitu</string>
+    <string name="action_contact_details">Kontaktuaren xehetasunak</string>
+    <string name="action_muc_details">Konferentziaren xehetasunak</string>
+    <string name="action_secure">Elkarrizketa segurua</string>
+    <string name="action_add_account">Kontua gehitu</string>
+    <string name="action_edit_contact">Izena editatu</string>
+    <string name="action_add_phone_book">Telefono kontaktuetara gehitu</string>
+    <string name="action_delete_contact">Zerrendatik ezabatu</string>
+    <string name="title_activity_manage_accounts">Kontuak kudeatu</string>
+    <string name="title_activity_settings">Ezarpenak</string>
+    <string name="title_activity_conference_details">Konferentziaren xehetasunak</string>
+    <string name="title_activity_contact_details">Kontaktuaren xehetasunak</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string>
+    <string name="title_activity_start_conversation">Elkarrizketa hasi</string>
+    <string name="title_activity_choose_contact">Kontaktua hautatu</string>
+    <string name="just_now">orain</string>
+    <string name="minute_ago">min 1 lehenago</string>
+    <string name="minutes_ago">%d min lehenago</string>
+    <string name="unread_conversations">irakurri gabeko elkarrizketak</string>
+    <string name="sending">bidaltzen&#8230;</string>
+    <string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron&#8230;</string>
+    <string name="nick_in_use">Ezizena erabilita dagoeneko</string>
+    <string name="admin">Administratzailea</string>
+    <string name="owner">Jabea</string>
+    <string name="moderator">Moderatzailea</string>
+    <string name="participant">Parte-hartzailea</string>
+    <string name="visitor">Bisitaria</string>
+    <string name="remove_contact_text">%s zure zerrendatik ezabatu nahi duzu? Kontu honekin lotutako elkarrizketa ez da ezabatuko.</string>
+    <string name="remove_bookmark_text">%s laster-marka bezala ezabatu nahi duzu? Laster-marka honekin lotutako elkarrizketa ez da ezabatuko.</string>
+    <string name="register_account">Kontu berria zerbitzarian erregistratu</string>
+    <string name="share_with">Honekin partekatu</string>
+    <string name="start_conversation">Elkarrizketa hasi</string>
+    <string name="invite_contact">Kontaktu bat gonbidatu</string>
+    <string name="contacts">Kontaktuak</string>
+    <string name="cancel">Utzi</string>
+    <string name="add">Gehitu</string>
+    <string name="edit">Editatu</string>
+    <string name="delete">Ezabatu</string>
+    <string name="save">Gorde</string>
+    <string name="ok">Ados</string>
+    <string name="crash_report_title">Conversations gelditu da</string>
+    <string name="crash_report_message">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu\n<b>Abisua:</b> Honek zure XMPP kontua erabiliko du garatzaileari akats harraska bidaltzeko.</string>
+    <string name="send_now">Bidali orain</string>
+    <string name="send_never">Ez galdetu berriz</string>
+    <string name="problem_connecting_to_account">Ezin izan da kontura konektatu</string>
+    <string name="problem_connecting_to_accounts">Ezin izan da hainbat kontuetara konektatu</string>
+    <string name="touch_to_fix">Ukitu hemen zure kontuak kudeatzeko</string>
+    <string name="attach_file">Fitxategia erantsi</string>
+    <string name="not_in_roster">Kontaktua ez dago zure zerrendan. Gehitu nahiko al zenuke?</string>
+    <string name="add_contact">Kontaktua gehitu</string>
+    <string name="send_failed">huts bidaltzerakoan</string>
+    <string name="send_rejected">ukatua</string>
+    <string name="receiving_image">Irudi fitxategia jasotzen. Mesedez itxaron&#8230;</string>
+    <string name="preparing_image">Irudia transmisiorako prestatzen. Mesedez itxaron&#8230;</string>
+    <string name="action_clear_history">Historia garbitu</string>
+    <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
+    <string name="clear_histor_msg">Elkarrizketa honetako mezu guztiak ezabatu nahi al dituzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako mezuetan eraginik izango.</string>
+    <string name="delete_messages">Mezuak ezabatu</string>
+    <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
+    <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
+    <string name="send_plain_text_message">Testu mezua bidali</string>
+    <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
+    <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
+    <string name="your_nick_has_been_changed">Zure ezizena aldatu da</string>
+    <string name="download_image">Irudia deskargatu</string>
+    <string name="image_offered_for_download"><i>Irudi fitxategia deskargarako eskeinia</i></string>
+    <string name="send_unencrypted">Enkriptatu gabe bidali</string>
+    <string name="decryption_failed">Desenkriptazioak huts egin du. Agian ez duzu gako pribatu egokia.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversationsek <b>OpenKeychain</b> izeneko hirugarren app bat erabiltzen du mezuak enkriptatu eta desenkriptatzeko eta zure gako publikoak kudeatzeko.\n\nOpenKeychain GPLv3 lizentziapean dago eta F-Droid eta Google Playn eskura daiteke.\n\n<small>(Mesedez ondoren Conversations berrabiarazi)</small></string>
+    <string name="restart">Berrabiarazi</string>
+    <string name="install">Instalatu</string>
+    <string name="offering">eskeintzen&#8230;</string>
+    <string name="waiting">itxaroten&#8230;</string>
+    <string name="no_pgp_key">Ez da OpenPGP gakorik aurkitu</string>
+    <string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
+    <string name="no_pgp_keys">Ez da OpenPGP gakorik aurkitu</string>
+    <string name="contacts_have_no_pgp_keys">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktuak haien gako publikoa jakinarazten ez daudelako.\n\n<small>Mesedez eskatu ezaiezu zure kontakuei OpenPGP konfigura dezaten.</small></string>
+    <string name="encrypted_message_received"><i>Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
+    <string name="encrypted_image_received"><i>Enkriptatutako irudia jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
+    <string name="image_file"><i>Irudia jaso da. Ukitu ikusteko</i></string>
+    <string name="pref_general">Orokorrak</string>
+    <string name="pref_xmpp_resource">XMPP baliabidea</string>
+    <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
+    <string name="pref_accept_files">Fitxategiak onartu</string>
+    <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu&#8230;</string>
+    <string name="pref_notification_settings">Jakinarazpenen ezarpenak</string>
+    <string name="pref_notifications">Jakinarazpenak</string>
+    <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string>
+    <string name="pref_vibrate">Dardaratu</string>
+    <string name="pref_vibrate_summary">Dardaratu ere mezu berri bat heltzerakoan</string>
+    <string name="pref_sound">Soinua</string>
+    <string name="pref_sound_summary">Dei-tonua jo jakinarazpenarekin</string>
+    <string name="pref_conference_notifications">Konferentzien jakinarazpenak</string>
+    <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia mezu berri bat heltzerakoan eta ez soilik nabarmentzerakoan</string>
+    <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
+    <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
+    <string name="pref_advanced_options">Aukera aurreratuak</string>
+    <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
+    <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
+    <string name="pref_confirm_messages">Mezuak egiaztatu</string>
+    <string name="pref_confirm_messages_summary">Zure kontaktuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string>
+    <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
+    <string name="openpgp_error">OpenKeychainek akats baten berri eman du</string>
+    <string name="error_decrypting_file">Sarrera/Irteera akatsa fitxategia desenkriptatzerakoan</string>
+    <string name="accept">Onartu</string>
+    <string name="error">Akats bat gertatu da</string>
+    <string name="pref_grant_presence_updates">Presentzia eguneraketak eman</string>
+    <string name="pref_grant_presence_updates_summary">Prebentiboki presentzia eguneraketak eman eta eskatu sortu dituzun kontaktuetarako</string>
+    <string name="subscriptions">Harpidetzak</string>
+    <string name="your_account">Zure kontua</string>
+    <string name="keys">Gakoak</string>
+    <string name="send_presence_updates">Presentzia eguneraketak bidali</string>
+    <string name="receive_presence_updates">Presentzia eguneraketak jaso</string>
+    <string name="ask_for_presence_updates">Presentzia eguneraketak eskatu</string>
+    <string name="attach_choose_picture">Argazkia aukeratu</string>
+    <string name="attach_take_picture">Argazkia egin</string>
+    <string name="preemptively_grant">Prebentiboki harpidetza eskaera eman</string>
+    <string name="error_not_an_image_file">Aukeratu duzun fitxategia ez da irudi bat</string>
+    <string name="error_compressing_image">Huts irudi fitxategia bihurtzerakoan</string>
+    <string name="error_file_not_found">Fitxategia ez da aurkitu</string>
+    <string name="error_io_exception">Sarrera/Irteera akats orokorra. Agian biltegian lekurik gabe gelditu zara?</string>
+    <string name="error_security_exception_during_image_copy">Irudi hau aukeratzeko erabili duzun aplikazioak ez digu fitxategia irakurtzeko baimen nahikorik eman.\n\n<small>Beste fitxategi kudeatzaile bat erabili ezazu irudia aukeratzeko</small></string>
+    <string name="account_status_unknown">Ezezaguna</string>
+    <string name="account_status_disabled">Aldi baterako ezgaituta</string>
+    <string name="account_status_online">Konektatuta</string>
+    <string name="account_status_connecting">Konektatzen\u2026</string>
+    <string name="account_status_offline">Lineaz kanpo</string>
+    <string name="account_status_unauthorized">Ez baimenduta</string>
+    <string name="account_status_not_found">Zerbitzaria ez da aurkitu</string>
+    <string name="account_status_no_internet">Konektagarritasunik ez</string>
+    <string name="account_status_regis_fail">Erregistroak huts egin du</string>
+    <string name="account_status_regis_conflict">Erabiltzaile izena dagoeneko erabilita</string>
+    <string name="account_status_regis_success">Erregistroa burutu da</string>
+    <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
+    <string name="encryption_choice_none">Testu laua</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Kontua editatu</string>
+    <string name="mgmt_account_delete">Kontua ezabatu</string>
+    <string name="mgmt_account_disable">Aldi baterako ezgaitu</string>
+    <string name="mgmt_account_publish_avatar">Profileko argazkia argitaratu</string>
+    <string name="mgmt_account_publish_pgp">OpenPGP gako publikoa argitaratu</string>
+    <string name="mgmt_account_enable">Kontua gaitu</string>
+    <string name="mgmt_account_are_you_sure">Ziur al zaude?</string>
+    <string name="mgmt_account_delete_confirm_text">Zure kontua ezabatzen baduzu zure elkarrizketa historia guztia galduko da</string>
+    <string name="attach_record_voice">Ahotsa grabatu</string>
+    <string name="account_settings_jabber_id">Jabber IDa</string>
+    <string name="account_settings_password">Pasahitza</string>
+    <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
+    <string name="account_settings_confirm_password">Pasahitza egiaztatu</string>
+    <string name="password">Pasahitza</string>
+    <string name="confirm_password">Pasahitza egiaztatu</string>
+    <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
+    <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
+    <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
+    <string name="add_phone_book_text">%s zure telefono kontaktu zerrendara gehitu nahi al duzu?</string>
+    <string name="contact_status_online">konektatuta</string>
+    <string name="contact_status_free_to_chat">hitzegiteko aske</string>
+    <string name="contact_status_away">kanpoan</string>
+    <string name="contact_status_extended_away">luzerako kanpoan</string>
+    <string name="contact_status_do_not_disturb">ez gogaitu</string>
+    <string name="contact_status_offline">lineaz kanpo</string>
+    <string name="muc_details_conference">Konferentzia</string>
+    <string name="muc_details_other_members">Beste kideak</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+    <string name="server_info_pep">XEP-0163: PEP (Profileko argazkiak)</string>
+    <string name="server_info_available">eskuragarri</string>
+    <string name="server_info_unavailable">ez eskuragarri</string>
+    <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string>
+    <string name="last_seen_now">azkenengoz ikusia orain</string>
+    <string name="last_seen_mins">azkenengoz ikusia %d minutu lehenago</string>
+    <string name="last_seen_hours">azkenengoz ikusia %d ordu lehenago</string>
+    <string name="last_seen_days">azkenengoz ikusia %d egun lehenago</string>
+    <string name="never_seen">inoiz ez ikusia</string>
+    <string name="last_seen_min">azkenengoz ikusia minutu 1 lehenago</string>
+    <string name="last_seen_hour">azkenengoz ikusia ordu 1 lehenago</string>
+    <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string>
+    <string name="install_openkeychain">Mezu enkriptatua. Mesedez instalatu OpenKeychain desenkriptatzeko.</string>
+    <string name="unknown_otr_fingerprint">OTR hatz-marka ezezaguna</string>
+    <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string>
+    <string name="reception_failed">Jasotzeak huts egin du</string>
+    <string name="your_fingerprint">Zure hatz-marka</string>
+    <string name="otr_fingerprint">OTR hatz-marka</string>
+    <string name="verify">Egiaztatu</string>
+    <string name="decrypt">Desenkriptatu</string>
+    <string name="conferences">Konferentziak</string>
+    <string name="search">Bilatu</string>
+    <string name="create_contact">Kontaktua sortu</string>
+    <string name="join_conference">Konferentziara batu</string>
+    <string name="delete_contact">Kontaktua ezabatu</string>
+    <string name="view_contact_details">Kontaktuaren xehetasunak ikusi</string>
+    <string name="create">Sortu</string>
+    <string name="contact_already_exists">Kontaktua existitzen da dagoeneko</string>
+    <string name="join">Batu</string>
+    <string name="conference_address">Konferentziaren helbidea</string>
+    <string name="conference_address_example">gela@conference.example.com</string>
+    <string name="save_as_bookmark">Gorde laster-marka bezala</string>
+    <string name="delete_bookmark">Laster-marka ezabatu</string>
+    <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
+    <string name="you">Zu</string>
+    <string name="action_edit_subject">Konferentziaren gaia editatu</string>
+    <string name="conference_not_found">Konferentzia ez da aurkitu</string>
+    <string name="leave">Alde egin</string>
+    <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
+    <string name="add_back">Bera gehitu</string>
+    <string name="contact_has_read_up_to_this_point">%s(e)k puntu honetaraino irakurri du</string>
+    <string name="publish">Argitaratu</string>
+    <string name="touch_to_choose_picture">Ukitu profileko argazkia irudi bat galeriatik hautatzeko</string>
+    <string name="publish_avatar_explanation">Adi: Zure presentzia eguneraketetara harpidetutako edonork irudi hau ikusi ahal izango du.</string>
+    <string name="publishing">Argitaratzen&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Zerbitzariak zure argitarapena ukatu du</string>
+    <string name="error_publish_avatar_converting">Zerbait oker joan da zure irudia bihurtzerakoan</string>
+    <string name="error_saving_avatar">Ezin izan da profileko argazkia diskoan gorde</string>
+    <string name="or_long_press_for_default">(Edo sakatu luze lehenetsira bueltatzeko)</string>
+    <string name="error_publish_avatar_no_server_support">Zure zerbitzariak ez du profileko argazkien argitarapena onartzen</string>
+    <string name="private_message">xuxurlatu</string>
+    <string name="private_message_to">%s(r)i</string>
+    <string name="send_private_message_to">%s(r)i mezu pribatua bidali</string>
+    <string name="connect">Konektatu</string>
+    <string name="account_already_exists">Kontu hau existitzen da dagoeneko</string>
+    <string name="next">Hurrengoa</string>
+    <string name="server_info_session_established">Uneko saioa ezarri da</string>
+    <string name="additional_information">Informazio gehiago</string>
+    <string name="skip">Orain ez</string>
+    <string name="disable_notifications">Jakinarazpenak ezgaitu</string>
+    <string name="disable_notifications_for_this_conversation">Elkarrizketa honetarako jakinarazpenak ezgaitu</string>
+    <string name="notifications_disabled">Jakinarazpenak ezgaituta daude</string>
+    <string name="enable">Gaitu</string>
+    <string name="conference_requires_password">Konferentziak pasahitza behar du</string>
+    <string name="enter_password">Sartu pasahitza</string>
+    <string name="missing_presence_updates">Kontaktuaren presentzia eguneraketak falta dira</string>
+    <string name="request_presence_updates">Mesedez eskatu lehenago zure kontaktuaren presentzia eguneraketak.\n\n<small>Kontaktuak erabiltzen ari den bezeroa(k) zehazteko erabilika da hau.</small></string>
+    <string name="request_now">Eskatu orain</string>
+    <string name="delete_fingerprint">Hatz-marka ezabatu</string>
+    <string name="sure_delete_fingerprint">Ziur al zaude hatz-marka hau ezabatu nahi duzulaz?</string>
+    <string name="ignore">Kasurik ez egin</string>
+    <string name="without_mutual_presence_updates"><b>Adi:</b> Bien arteko presentzia eguneraketarik gabe hau bidaltzeak ustekabeko arazoak sor litzake.\n\n<small>Joan zaitez kontaktuaren xehetasunetara zure presentzia eguneraketak egiaztatzeko.</small></string>
+    <string name="pref_encryption_settings">Enkriptazio ezarpenak</string>
+    <string name="pref_force_encryption">End-to-end enkriptazioa behartu</string>
+    <string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
+    <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
+    <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
+    <string name="pref_enable_legacy_ssl">Oinordetutako SSL gaitu</string>
+    <string name="pref_enable_legacy_ssl_summary">SSLv3 gaitzen du oinordetutako zerbitzarietarako. Adi: SSLv3 ez segurutzat hartzen da.</string>
+    <string name="pref_expert_options">Adituentzako aukerak</string>
+    <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
+    <string name="pref_use_larger_font">Letraren tamaina handitu</string>
+    <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
+    <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
+    <string name="pref_use_indicate_received">Mezuen jasotzea eskatu</string>
+    <string name="pref_use_indicate_received_summary">Jasotako mezuak marka berde batekin markatuko dira. Baliteke kasu guztietan ez funtzionatzea.</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
+    <string name="pref_expert_options_other">Besteak</string>
+    <string name="pref_conference_name">Konferentziaren izena</string>
+    <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko eta ez JIDa</string>
+    <string name="toast_message_otr_fingerprint">OTR hatz-marka arbelara kopiatu da</string>
+    <string name="conference_banned">Konferentzia honetara sartzea debekatuta duzu</string>
+    <string name="conference_members_only">Konferentzia hau kideentzat da soilik</string>
+    <string name="conference_kicked">Konferentzia honetatik kanporatua izan zara</string>
+    <string name="using_account">%s kontua erabiltzen</string>
+    <string name="checking_image">Irudia egiaztatzen HTTP ostalarian</string>
+    <string name="image_file_deleted">Irudia ezabatu egin da</string>
+    <string name="not_connected_try_again">Ez zaude konektatuta. Saiatu beranduago berriz</string>
+    <string name="check_image_filesize">Irudiaren tamaina egiaztatu</string>
+
+</resources>
diff --git a/src/main/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml
new file mode 100644
index 00000000..ae140796
--- /dev/null
+++ b/src/main/res/values-fr/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mobile</item>
+        <item>Téléphone</item>
+        <item>Tablette</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>jamais</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000..e1db316d
--- /dev/null
+++ b/src/main/res/values-fr/strings.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_add">Nouvelle conversation</string>
+    <string name="action_accounts">Gérer les comptes</string>
+    <string name="action_end_conversation">Terminer cette conversation</string>
+    <string name="action_contact_details">Détails du contact</string>
+    <string name="action_muc_details">Détails de la conférence</string>
+    <string name="action_secure">Conversation sécurisée</string>
+    <string name="action_add_account">Ajouter un compte</string>
+    <string name="action_edit_contact">Modifier le nom</string>
+    <string name="action_add_phone_book">Ajouter aux contacts</string>
+    <string name="action_delete_contact">Retirer des contacts</string>
+    <string name="title_activity_manage_accounts">Gestion des comptes</string>
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="title_activity_conference_details">Détails de la conférence</string>
+    <string name="title_activity_contact_details">Détails du contact</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Partager avec Conversation</string>
+    <string name="title_activity_start_conversation">Lancement de Conversation</string>
+    <string name="title_activity_choose_contact">Choix du contact</string>
+    <string name="just_now">À l\'instant</string>
+    <string name="minute_ago">Il y a 1 minute</string>
+    <string name="minutes_ago">Il y a %d minutes</string>
+    <string name="unread_conversations">Conversations non lues</string>
+    <string name="sending">envoi&#8230;</string>
+    <string name="encrypted_message">Déchiffrement du message. Patientez&#8230;</string>
+    <string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
+    <string name="admin">Administrateur</string>
+    <string name="owner">Propriétaire</string>
+    <string name="moderator">Modérateur</string>
+    <string name="participant">Participant</string>
+    <string name="visitor">Visiteur</string>
+    <string name="remove_contact_text">Voulez-vous supprimer %s de votre liste? Les conversations associées à ce compte ne seront pas supprimées.</string>
+    <string name="remove_bookmark_text">Voulez-vous retirer %s des favoris? La conversation associée avec ce favoris ne sera pas supprimé.</string>
+    <string name="register_account">Créer un nouveau compte sur le serveur</string>
+    <string name="share_with">Partager avec</string>
+    <string name="start_conversation">Démarrer une conversation</string>
+    <string name="invite_contact">Inviter des contacts</string>
+    <string name="contacts">Contacts</string>
+    <string name="cancel">Annuler</string>
+    <string name="add">Ajouter</string>
+    <string name="edit">Modifier</string>
+    <string name="delete">Supprimer</string>
+    <string name="save">Enregistrer</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Conversations s\'est arreté</string>
+    <string name="crash_report_message">En envoyant des logs vous aidez au développement de Conversations.\n\n<b>Attention:</b> Votre compte XMPP sera utilisé pour envoyer les logs aux développeurs.</string>
+    <string name="send_now">Envoyer</string>
+    <string name="send_never">Ne plus me demander</string>
+    <string name="problem_connecting_to_account">Impossible de se connecter au compte.</string>
+    <string name="problem_connecting_to_accounts">Impossible de se connecter aux comptes.</string>
+    <string name="touch_to_fix">Appuyez pour gérer vos comptes.</string>
+    <string name="attach_file">Lier un fichier</string>
+    <string name="not_in_roster">Le contact n\'est pas dans votre carnet d\'adresses. Voulez-vous l\'y ajouter?</string>
+    <string name="add_contact">Ajouter un contact</string>
+    <string name="send_failed">Echec de l\'envoi.</string>
+    <string name="send_rejected">Rejeté</string>
+    <string name="receiving_image">Réception d\'une image. Patientez&#8230;</string>
+    <string name="preparing_image">Préparation de la transmission de l\'image. Patientez&#8230;</string>
+    <string name="action_clear_history">Vider l\'historique</string>
+    <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
+    <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation?\n\n<b>Attention:</b> Les messages seront supprimés uniquement sur ce périphérique.</string>
+    <string name="delete_messages">Supprimer les messages</string>
+    <string name="also_end_conversation">Terminer plus tard cette conversation</string>
+    <string name="choose_presence">Choisir le status de présence</string>
+    <string name="send_plain_text_message">Envoyer un message</string>
+    <string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
+    <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string>
+    <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
+    <string name="download_image">Télécharger l\'image</string>
+    <string name="image_offered_for_download"><i>Image proposée au téléchargement.</i></string>
+    <string name="send_unencrypted">Envoyer en clair</string>
+    <string name="decryption_failed">Echec du déchiffrement. Merci de vérifier la clef privée utilisée.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Merci de redémarrer Conversations apres l\'installation du logiciel)</small></string>
+    <string name="restart">Redémarrer</string>
+    <string name="install">Installer</string>
+    <string name="offering">Proposition&#8230;</string>
+    <string name="waiting">Patientez&#8230;</string>
+    <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
+    <string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer OpenPGP.</small></string>
+    <string name="no_pgp_keys">Aucune clef OpenPGP n\'est disponible.</string>
+    <string name="contacts_have_no_pgp_keys">Conversations ne peut pas chiffrer votre message car vous ne connaissez pas la clef publique de vos contacts.\n\n<small>Merci de les faire configurer leur OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
+    <string name="encrypted_image_received"><i>Image chiffrée reçue. Appuyez pour la déchiffrer.</i></string>
+    <string name="image_file"><i>Image reçue. Appuyez pour visualiser.</i></string>
+    <string name="pref_general">Général</string>
+    <string name="pref_xmpp_resource">Ressource XMPP</string>
+    <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
+    <string name="pref_accept_files">Accepter les fichiers</string>
+    <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que&#8230;</string>
+    <string name="pref_notification_settings">Paramètres de notification</string>
+    <string name="pref_notifications">Notifications</string>
+    <string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string>
+    <string name="pref_vibrate">Vibration</string>
+    <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message</string>
+    <string name="pref_sound">Sonore</string>
+    <string name="pref_sound_summary">Jouer une sonnerie lors de l\'arrivée d\'un message</string>
+    <string name="pref_conference_notifications">Notifications lors des conférences</string>
+    <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</string>
+    <string name="pref_notification_grace_period">Période sans notification</string>
+    <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
+    <string name="pref_advanced_options">Options avancées</string>
+    <string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string>
+    <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
+    <string name="pref_confirm_messages">Confirmation de lecture</string>
+    <string name="pref_confirm_messages_summary">Informer l\'expéditeur d\'un message de sa bonne réception.</string>
+    <string name="pref_ui_options">Options d\'affichage</string>
+    <string name="openpgp_error">Une erreur s\'est produite via OpenKeychain</string>
+    <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
+    <string name="accept">Accepter</string>
+    <string name="error">Une erreur s\'est produite</string>
+    <string name="pref_grant_presence_updates">Accepter les mises à jour de présence</string>
+    <string name="pref_grant_presence_updates_summary">Demander et accepter par avance les mises à jour de présence des contacts créés.</string>
+    <string name="subscriptions">Publications</string>
+    <string name="your_account">Votre compte</string>
+    <string name="keys">Clefs</string>
+    <string name="send_presence_updates">Envoyer les mises à jour de présence</string>
+    <string name="receive_presence_updates">Recevoir les mises à jour de présence</string>
+    <string name="ask_for_presence_updates">Demander les mises à jour de présence</string>
+    <string name="attach_choose_picture">Choisir une image</string>
+    <string name="attach_take_picture">Prendre une photo</string>
+    <string name="preemptively_grant">Accepter par avance les demandes de publication.</string>
+    <string name="error_not_an_image_file">Le fichier choisi n\'est pas une image</string>
+    <string name="error_compressing_image">Une erreur s\'est produite en convertissant l\'image</string>
+    <string name="error_file_not_found">Fichier non trouvé</string>
+    <string name="error_io_exception">Erreur générale d\'E/S. Avez-vous encore de l\'espace libre?</string>
+    <string name="error_security_exception_during_image_copy">L\'application utilisée empêche la lecture de l\'image.\n\n<small>Choisissez l\'image depuis une autre application.</small></string>
+    <string name="account_status_unknown">Inconnu</string>
+    <string name="account_status_disabled">Désactivé temporairement</string>
+    <string name="account_status_online">En ligne</string>
+    <string name="account_status_connecting">Connexion\u2026</string>
+    <string name="account_status_offline">Hors-ligne</string>
+    <string name="account_status_unauthorized">Non autorisé</string>
+    <string name="account_status_not_found">Serveur non trouvé</string>
+    <string name="account_status_no_internet">Aucune connectivité</string>
+    <string name="account_status_regis_fail">Enregistrement échoué</string>
+    <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
+    <string name="account_status_regis_success">Enregistrement réussi</string>
+    <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
+    <string name="encryption_choice_none">Texte clair</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Modifier le compte</string>
+    <string name="mgmt_account_delete">Supprimer</string>
+    <string name="mgmt_account_disable">Désactiver temporairement</string>
+    <string name="mgmt_account_publish_avatar">Publier un avatar</string>
+    <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
+    <string name="mgmt_account_enable">Activer</string>
+    <string name="mgmt_account_are_you_sure">Êtes-vous sûr?</string>
+    <string name="mgmt_account_delete_confirm_text">En supprimant votre compte, votre historique de conversations sera perdu!</string>
+    <string name="attach_record_voice">Enregistrer un son</string>
+    <string name="account_settings_jabber_id">Identifiant</string>
+    <string name="account_settings_password">Mot de passe</string>
+    <string name="account_settings_example_jabber_id">utilisateur@exemple.com</string>
+    <string name="account_settings_confirm_password">Confirmer le mot de passe</string>
+    <string name="password">Mot de passe</string>
+    <string name="confirm_password">Confirmer le mot de passe</string>
+    <string name="passwords_do_not_match">Les deux mots de passes ne correspondent pas.</string>
+    <string name="invalid_jid">Ce n\'est pas un identifiant valide.</string>
+    <string name="error_out_of_memory">Plus de mémoire disponible. L\'image est trop volumineuse.</string>
+    <string name="add_phone_book_text">Voulez-vous ajouter %s aux contacts du téléphone?</string>
+    <string name="contact_status_online">En ligne</string>
+    <string name="contact_status_free_to_chat">Disponible</string>
+    <string name="contact_status_away">Absent</string>
+    <string name="contact_status_extended_away">Absent depuis longtemps</string>
+    <string name="contact_status_do_not_disturb">Ne pas déranger</string>
+    <string name="contact_status_offline">Hors-ligne</string>
+    <string name="muc_details_conference">Conférence</string>
+    <string name="muc_details_other_members">Autres membres</string>
+    <string name="server_info_carbon_messages">Copies carbone</string>
+    <string name="server_info_stream_management">Gestion des flux</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">disponible</string>
+    <string name="server_info_unavailable">indisponible</string>
+    <string name="missing_public_keys">Aucune annonce de clef publique</string>
+    <string name="last_seen_now">en ligne à l\'instant</string>
+    <string name="last_seen_min">en ligne il y a 1 minute</string>
+    <string name="last_seen_mins">en ligne il y a %d minutes</string>
+    <string name="last_seen_hour">en ligne il y a 1 heure</string>
+    <string name="last_seen_hours">en ligne il y a %d heures</string>
+    <string name="last_seen_day">en ligne hier</string>
+    <string name="last_seen_days">en ligne il y a %d jours</string>
+    <string name="never_seen">jamais vu en ligne</string>
+    <string name="install_openkeychain">Message chiffré. Merci d\'installer OpenKeychain pour lire le contenu du message.</string>
+    <string name="unknown_otr_fingerprint">Empreinte OTR inconnue.</string>
+    <string name="openpgp_messages_found">Messages chiffrés par OpenPGP détectés.</string>
+    <string name="reception_failed">Echec lors de la réception</string>
+    <string name="your_fingerprint">Votre empreinte</string>
+    <string name="otr_fingerprint">Empreinte OTR</string>
+    <string name="verify">Vérifier</string>
+    <string name="decrypt">Déchiffrer</string>
+    <string name="conferences">Conférences</string>
+    <string name="search">Rechercher</string>
+    <string name="create_contact">Ajouter un contact</string>
+    <string name="join_conference">Rejoindre la conférence</string>
+    <string name="delete_contact">Supprimer le contact</string>
+    <string name="view_contact_details">Afficher les détails du contact</string>
+    <string name="create">Ajouter</string>
+    <string name="contact_already_exists">Le contact existe déjà.</string>
+    <string name="join">Rejoindre</string>
+    <string name="conference_address">Adresse de la conférence</string>
+    <string name="conference_address_example">salle@conference.exemple.com</string>
+    <string name="save_as_bookmark">Enregistrer en favoris</string>
+    <string name="delete_bookmark">Supprimer le favoris</string>
+    <string name="bookmark_already_exists">Ce favoris existe déjà.</string>
+    <string name="you">Vous</string>
+    <string name="action_edit_subject">Modifier le sujet de la conférence</string>
+    <string name="conference_not_found">Conférence non trouvée</string>
+    <string name="leave">Partir</string>
+    <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
+    <string name="add_back">Ajouter également</string>
+    <string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
+    <string name="publish">Publier</string>
+    <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
+    <string name="publish_avatar_explanation">Nota Bene: Les personnes ayant activé les mises jour de présence verront cette image.</string>
+    <string name="publishing">Mise à jour&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre envoi d\'image</string>
+    <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
+    <string name="error_saving_avatar">Impossible de stocker l\'image sur le disque</string>
+    <string name="or_long_press_for_default">(Un appui long réinitialise le paramètre par defaut)</string>
+    <string name="error_publish_avatar_no_server_support">Votre serveur n\'autorise pas l\'envoi d\'avatars</string>
+    <string name="private_message">chuchoté</string>
+    <string name="private_message_to">pour %s</string>
+    <string name="send_private_message_to">Envoyer un message privé à %s</string>
+    <string name="connect">Se connecter</string>
+    <string name="account_already_exists">Ce compte existe déjà</string>
+    <string name="next">suivant</string>
+    <string name="server_info_session_established">Session établie</string>
+    <string name="additional_information">Informations supplémentaires</string>
+    <string name="skip">Passer</string>
+	<string name="disable_notifications">Désactiver les notifications</string>
+    <string name="disable_notifications_for_this_conversation">Désactiver les notifications pour cette conversation</string>
+    <string name="notifications_disabled">Notifications are Désactivées</string>
+    <string name="enable">Activer</string>
+    <string name="conference_requires_password">La conférence necessite un mot de passe</string>
+    <string name="enter_password">Entrer le mot de passe</string>
+    <string name="missing_presence_updates">Mise à jour de présence non connue</string>
+    <string name="request_presence_updates">Merci de demander à votre contact de fournir les mises à jour de présence.\n\n<small>Cela permettra de savoir quel matériel utilise votre contact.</small></string>
+    <string name="request_now">Demander maintenant</string>
+    <string name="delete_fingerprint">Supprimer l\'empreinte</string>
+    <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte?</string>
+    <string name="ignore">Ignorer</string>
+    <string name="without_mutual_presence_updates"><b>Attention:</b> Ceci peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
+    <string name="pref_encryption_settings">Paramètres de chiffrement</string>
+    <string name="pref_force_encryption">Forcer le chiffrement de bout en bout</string>
+    <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
+    <string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
+    <string name="pref_dont_save_encrypted_summary">Attention: Celà peut mener à une perte de messages</string>
+    <string name="pref_expert_options">Options avancées</string>
+    <string name="pref_expert_options_summary">A utiliser avec précautions</string>
+    <string name="pref_use_larger_font">Augmenter la taille du texte</string>
+    <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application</string>
+    <string name="pref_use_send_button_to_indicate_status">Le bouton Envoyer permet d\'indiquer le statut</string>
+    <string name="pref_use_indicate_received">Accusé de reception</string>
+    <string name="pref_use_indicate_received_summary">Les messages recus seront marqués d\'une coche verte si disponible</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Adapter la couleur du bouton Envoyer pour indiquer le statut</string>
+    <string name="pref_expert_options_other">Autres</string>
+    <string name="pref_conference_name">Nom de la conférence </string>
+    <string name="pref_conference_name_summary">Identifier la conférence par son nom plutot que par son JID</string>
+    <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier!</string>
+    <string name="conference_banned">Vous êtes interdit de cette conférence</string>
+    <string name="conference_members_only">Cette conférence est réservée aux membres</string>
+    <string name="conference_kicked">Vous avez été éjecté de cette conférence</string>
+    <string name="using_account">utiliser le compte %s</string>
+    <string name="checking_image">Vérification de l\'image</string>
+    <string name="image_file_deleted">L\'image a été suprimée</string>
+    <string name="not_connected_try_again">Vous n\'êtes pas connecté. Merci de retenter plus tard.</string>
+
+</resources>
diff --git a/src/main/res/values-gl/arrays.xml b/src/main/res/values-gl/arrays.xml
new file mode 100644
index 00000000..19424a78
--- /dev/null
+++ b/src/main/res/values-gl/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Móvil</item>
+        <item>Teléfono</item>
+        <item>Tablet</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>nunca</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
new file mode 100644
index 00000000..58116463
--- /dev/null
+++ b/src/main/res/values-gl/strings.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Axustes</string>
+    <string name="action_add">Nova conversa</string>
+    <string name="action_accounts">Xestionar contas</string>
+    <string name="action_end_conversation">Terminar conversa</string>
+    <string name="action_contact_details">Detalles do contacto</string>
+    <string name="action_muc_details">Detalles da conferencia</string>
+    <string name="action_secure">Conversa segura</string>
+    <string name="action_add_account">Engadir conta</string>
+    <string name="action_edit_contact">Editar contacto</string>
+    <string name="action_delete_contact">Eliminar contacto da lista</string>
+    <string name="just_now">agora</string>
+    <string name="minutes_ago">min</string>
+    <string name="unread_conversations">conversas sen ler</string>
+    <string name="sending">enviando&#8230;</string>
+    <string name="encrypted_message">Descifrando mensaxe. Agarda uns intres&#8230;</string>
+    <string name="nick_in_use">O apodo xa está en uso</string>
+    <string name="moderator">Moderador</string>
+    <string name="participant">Participante</string>
+    <string name="visitor">Visitante</string>
+    <string name="remove_contact_text">¿Queres eliminar a %s da túa lista?. A conversa asociada a esta conta non se eliminará.</string>
+    <string name="register_account">Rexistrar nova conta no servidor</string>
+    <string name="share_with">Compartir con</string>
+    <string name="start_conversation">Comeza conversa</string>
+    <string name="cancel">Cancelar</string>
+    <string name="crash_report_title">Conversations deteuse.</string>
+    <string name="crash_report_message">Enviando volcados de pilas axudas ao desenrolo de Conversations\n<b>Aviso:</b> Isto empregará a túa conta XMPP para enviar o volcado de pila ao desenrolador.</string>
+    <string name="send_now">Enviar agora</string>
+    <string name="send_never">Non preguntar de novo</string>
+    <string name="problem_connecting_to_account">Erro na conexión á conta</string>
+    <string name="problem_connecting_to_accounts">Erro na conexión a múltiples contas</string>
+    <string name="touch_to_fix">Pulsa aquí para xestionar as túas contass</string>
+    <string name="attach_file">Adxuntar</string>
+    <string name="not_in_roster">O contacto non está na túa lista. ¿Queres engadilo?</string>
+    <string name="add_contact">Engadir contacto</string>
+    <string name="send_failed">Erro ao enviar</string>
+    <string name="send_rejected">rechazado</string>
+    <string name="receiving_image">Recibindo arquivo de imaxe. Agarda por favor&#8230;</string>
+    <string name="preparing_image">Preparando imaxe para enviar</string>
+    <string name="action_clear_history">Limpar historial</string>
+    <string name="clear_conversation_history">Limpar historial de conversa</string>
+    <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
+    <string name="delete_messages">Borrar mensaxes</string>
+    <string name="also_end_conversation">Terminar esta conversa máis tarde</string>
+    <string name="choose_presence">Selecciona recurso del contacto</string>
+    <string name="send_plain_text_message">Enviar mensaxe de texto</string>
+    <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
+    <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
+    <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
+    <string name="download_image">Descargar imaxe</string>
+    <string name="image_offered_for_download"><i>Arquivo de imaxe ofrecido para descarga</i></string>
+    <string name="send_unencrypted">Enviar sen cifrar</string>
+    <string name="decryption_failed">Fallou o descifrado. Quizábeis non teñas a clave privada apropiada.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations emprega unha aplicación de terceiros chamada <b>OpenKeychain</b> para cifrar e descifrar mensaxes e xestionar as túas claves públicas.\n\nOpenKeychain está publicado baixo licencia GPLv3 e disponible en F-Droid e Google Play.\n\n<small>(Por favor, reinicie Conversations despois.)</small></string>
+    <string name="restart">Reiniciar</string>
+    <string name="install">Instalar</string>
+    <string name="offering">ofrecendo&#8230;</string>
+    <string name="no_pgp_key">Clave OpenPGP non atopada</string>
+    <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Mensaxe cifrado recibido. Pulsa para ver.</i></string>
+    <string name="encrypted_image_received"><i>Imaxe cifrada recibida. Pulsa para ver.</i></string>
+    <string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
+    <string name="pref_xmpp_resource">Recurso</string>
+    <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
+    <string name="pref_accept_files">Aceptar arquivos</string>
+    <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de&#8230;</string>
+    <string name="pref_notification_settings">Axustes de notificación</string>
+    <string name="pref_notifications">Notificacións</string>
+    <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
+    <string name="pref_vibrate">Tremer</string>
+    <string name="pref_vibrate_summary">Treme cando chega unha novo mensaxe</string>
+    <string name="pref_sound">Son</string>
+    <string name="pref_sound_summary">Reproduce un ton ca notificación</string>
+    <string name="pref_conference_notifications">Notificacións de conferencia</string>
+    <string name="pref_conference_notifications_summary">Siempre notifica cuando chega unha mensaxe de conferencia e non solo cuando chega unha mensaxe destacada</string>
+    <string name="pref_notification_grace_period">Notificacións Carbons</string>
+    <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
+    <string name="pref_advanced_options">Opcións avanzadas</string>
+    <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
+    <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
+    <string name="openpgp_error">OpenKeychain reportou un erro</string>
+    <string name="error_decrypting_file">I/O Erro descifrando arquivo</string>
+    <string name="accept">Aceptar</string>
+    <string name="error">Produciuse un erro</string>
+    <string name="pref_grant_presence_updates">Suscripción de presencia</string>
+    <string name="pref_grant_presence_updates_summary">Por defecto otorgar e pedir suscripcións de presencia dos contactos que creaches</string>
+    <string name="subscriptions">Suscripcións</string>
+    <string name="your_account">A túa conta</string>
+    <string name="keys">Chaves</string>
+    <string name="send_presence_updates">Enviar actualizacións de presencia</string>
+    <string name="receive_presence_updates">Recibir actualizacións de presencia</string>
+    <string name="ask_for_presence_updates">Solicitar actualizacións de presencia</string>
+    <string name="attach_choose_picture">Seleccionar imaxe</string>
+    <string name="attach_take_picture">Facer foto</string>
+    <string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string>
+    <string name="error_not_an_image_file">O arquivo seleccionado non é unha imaxe</string>
+    <string name="error_compressing_image">Erro convertindo o arquivo de imaxe</string>
+    <string name="error_file_not_found">Arquivo non atopado</string>
+    <string name="error_io_exception">Erro xeral de I/O. ¿Quedaches sen espazo no disco?</string>
+    <string name="error_security_exception_during_image_copy">A aplicación que usas para seleccionar imaxes non proporciona suficientes permisos para leer o arquivo.\n\n<small>Utiliza un explorador de arquivos diferente para seleccionar a imaxe</small></string>
+    <string name="account_status_unknown">Descoñecido</string>
+    <string name="account_status_disabled">Deshabilitado temporalmente</string>
+    <string name="account_status_online">Conectado</string>
+    <string name="account_status_connecting">Conectando\u2026</string>
+    <string name="account_status_offline">Desconectado</string>
+    <string name="account_status_unauthorized">Non autorizado</string>
+    <string name="account_status_not_found">Servidor non atopado</string>
+    <string name="account_status_no_internet">Sen conectividade</string>
+    <string name="account_status_regis_fail">Erro no rexistro</string>
+    <string name="account_status_regis_conflict">O identificador xa está en uso</string>
+    <string name="account_status_regis_success">Rexistro completado</string>
+    <string name="account_status_regis_not_sup">O servidor non soporta rexistros</string>
+    <string name="encryption_choice_none">Texto plano</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Editar conta</string>
+    <string name="mgmt_account_delete">Eliminar conta</string>
+    <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
+    <string name="mgmt_account_enable">Habilitar</string>
+    <string name="attach_record_voice">Grabar audio</string>
+    <string name="save">Gardar</string>
+    <string name="passwords_do_not_match">As contrasinais non coinciden</string>
+    <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
+    <string name="pref_ui_options">Opcións de interfaz</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-it/arrays.xml b/src/main/res/values-it/arrays.xml
new file mode 100644
index 00000000..491c4438
--- /dev/null
+++ b/src/main/res/values-it/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Cellulare</item>
+        <item>Telefono</item>
+        <item>Tablet</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>mai</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 minuti</item>
+        <item>un\'ora</item>
+        <item>2 ore</item>
+        <item>8 ore</item>
+        <item>fino avviso ulteriore</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000..0bb0e05e
--- /dev/null
+++ b/src/main/res/values-it/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Impostazioni</string>
+    <string name="action_add">Nuova conversazione</string>
+    <string name="action_accounts">Gestisci utenti</string>
+    <string name="action_end_conversation">Termina questa conversazione</string>
+    <string name="action_contact_details">Dettagli del contatto</string>
+    <string name="action_muc_details">Dettagli conferenza</string>
+    <string name="action_secure">Conversazione sicura</string>
+    <string name="action_add_account">Aggiungi utente</string>
+    <string name="action_edit_contact">Modifica il nome</string>
+    <string name="action_add_phone_book">Aggiungi alla rubrica</string>
+    <string name="action_delete_contact">Cancella dalla lista</string>
+    <string name="title_activity_manage_accounts">Gestisci Utenti</string>
+    <string name="title_activity_settings">Impostazioni</string>
+    <string name="title_activity_conference_details">Dettagli conferenza</string>
+    <string name="title_activity_contact_details">Dettagli del contatto</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Condividi con Conversation</string>
+    <string name="title_activity_start_conversation">Inizia una Conversazione</string>
+    <string name="title_activity_choose_contact">Scegli contatto</string>
+    <string name="just_now">adesso</string>
+    <string name="minute_ago">1 min fa</string>
+    <string name="minutes_ago">%d min fa</string>
+    <string name="unread_conversations">Conversazioni non lette</string>
+    <string name="sending">invio&#8230;</string>
+    <string name="encrypted_message">Decifrazione del messaggio. Attendere prego&#8230;</string>
+    <string name="nick_in_use">Nome utente già in uso</string>
+    <string name="admin">Amministratore</string>
+    <string name="owner">Proprietario</string>
+    <string name="moderator">Moderatore</string>
+    <string name="participant">Partecipante</string>
+    <string name="visitor">Visitatore</string>
+    <string name="remove_contact_text">Vuoi rimuovere %s dalla tua lista contatti? La conversazione associata con questo contatto non sarà rimossa.</string>
+    <string name="remove_bookmark_text">Vuoi rimuovere il segnalibro %s? La conversazione associata con questo contatto non sarà rimossa.</string>
+    <string name="register_account">Registra un nuovo account sul server</string>
+    <string name="share_with">Condividi con</string>
+    <string name="start_conversation">Inizia Conversazione</string>
+    <string name="invite_contact">Invita Contatto</string>
+    <string name="contacts">Contatti</string>
+    <string name="cancel">Cancella</string>
+    <string name="add">Aggiungi</string>
+    <string name="edit">Modifica</string>
+    <string name="delete">Elimina</string>
+    <string name="save">Salva</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Conversations è crashato</string>
+    <string name="crash_report_message">Se scegli di inviare una segnalazione dell\'errore aiuterai lo sviluppo di Conversations\n<b>Attenzione:</b> Questo utilizzerà il tuo account XMPP per inviare la segnalazione agli sviluppatori.</string>
+    <string name="send_now">Invia adesso</string>
+    <string name="send_never">Non chiedere mai più</string>
+    <string name="problem_connecting_to_account">Impossibile collegarsi all\'utente</string>
+    <string name="problem_connecting_to_accounts">Impossibile collegarsi a più utenti</string>
+    <string name="touch_to_fix">Tocca qui per gestire i tuoi utenti</string>
+    <string name="attach_file">Allega file</string>
+    <string name="not_in_roster">Il contatto non è nella tua lista. Vuoi aggiungerlo?</string>
+    <string name="add_contact">Aggiungi contatto</string>
+    <string name="send_failed">Invio fallito</string>
+    <string name="send_rejected">rifiutato</string>
+    <string name="receiving_image">Ricezione di un\'immagine. Attendere prego&#8230;</string>
+    <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
+    <string name="action_clear_history">Pulisci la cronologia</string>
+    <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
+    <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
+    <string name="delete_messages">Elimina messaggi</string>
+    <string name="also_end_conversation">Termina questa conversazione in seguito</string>
+    <string name="choose_presence">Choose presence to contact</string>
+    <string name="send_plain_text_message">Invia messaggio di testo semplice</string>
+    <string name="send_otr_message">Invia messaggio cifrato con OTR</string>
+    <string name="send_pgp_message">Invia messaggio cifrato con OpenPGP</string>
+    <string name="your_nick_has_been_changed">Il tuo nome utente èstato cambiato</string>
+    <string name="download_image">Scarica Immagine</string>
+    <string name="image_offered_for_download"><i>Immagine disponibile per il download</i></string>
+    <string name="send_unencrypted">Invia non cifrato</string>
+    <string name="decryption_failed">Decifrazione fallita. Forse non disponi della chiave privata corretta.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations usa una app di terze parti chiamata <b>OpenKeychain</b> per cifrare e decifrare i messaggi per gestire le tue chiavi pubbliche.\n\nOpenKeychain è rilasciato secondo i termini della GPLv3 ed è disponibile sia su F-Droid, che su Google Play.\n\n<small>(Riavvia Conversations in seguito.)</small></string>
+    <string name="restart">Riavvia</string>
+    <string name="install">Installa</string>
+    <string name="offering">offrendo&#8230;</string>
+    <string name="waiting">in attesa&#8230;</string>
+    <string name="no_pgp_key">Nessuna chiave OpenPGP trovata</string>
+    <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perchè il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
+    <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
+    <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perchè i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
+    <string name="encrypted_image_received"><i>Immagine cifrata ricevuta. Tocca per decifrare e mostrare.</i></string>
+    <string name="image_file"><i>Immagine ricevuta. Tocca per mostrare</i></string>
+    <string name="pref_general">Generale</string>
+    <string name="pref_xmpp_resource">Risorsa XMPP</string>
+    <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
+    <string name="pref_accept_files">Accetta i file</string>
+    <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di&#8230;</string>
+    <string name="pref_notification_settings">Impostazioni di Notifica</string>
+    <string name="pref_notifications">Notifiche</string>
+    <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
+    <string name="pref_vibrate">Vibra</string>
+    <string name="pref_vibrate_summary">Vibra anche quando arriva un nuovo messaggio</string>
+    <string name="pref_sound">Suono</string>
+    <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
+    <string name="pref_conference_notifications">Notifiche Conferenze</string>
+    <string name="pref_conference_notifications_summary">Notifica sempre quando arriva un nuovo messaggio da una conferenza, invece che solo quando in primo piano</string>
+    <string name="pref_notification_grace_period">Periodo tra notifiche</string>
+    <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
+    <string name="pref_advanced_options">Opzioni Avanzate</string>
+    <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
+    <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell\'errore aiuterai lo sviluppo di Conversations</string>
+    <string name="pref_confirm_messages">Conferma Messaggi</string>
+    <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto il messaggio e l\'hai letto</string>
+    <string name="pref_ui_options">Opzioni Interfaccia</string>
+    <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
+    <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
+    <string name="accept">Accetta</string>
+    <string name="error">Si è verificato un errore</string>
+    <string name="pref_grant_presence_updates">Concedi aggiornamenti della presenza</string>
+    <string name="pref_grant_presence_updates_summary">Concedi e chiedi preventivamente la sottoscrizione della presenza ai contatti che hai creato</string>
+    <string name="subscriptions">Sottoscrizioni</string>
+    <string name="your_account">Il tuo utente</string>
+    <string name="keys">Chiavi</string>
+    <string name="send_presence_updates">Invia aggiornamenti della presenza</string>
+    <string name="receive_presence_updates">Ricevi aggiornamenti della presenza</string>
+    <string name="ask_for_presence_updates">Chiedi aggiornamenti della presenza</string>
+    <string name="attach_choose_picture">Scegli un\'immagine</string>
+    <string name="attach_take_picture">Foto</string>
+    <string name="preemptively_grant">Concedi aggiornamenti della presenza preventivamente</string>
+    <string name="error_not_an_image_file">Il file selezionato non è un\'immagine</string>
+    <string name="error_compressing_image">Errore durante la conversione dell\'immagine</string>
+    <string name="error_file_not_found">File non trovato</string>
+    <string name="error_io_exception">Errore di I/O generico. Forse hai esaurito lo spazio?</string>
+    <string name="error_security_exception_during_image_copy">L\'app che hai usato per selezionare questa immagine non ci ha fornito permessi sufficienti per leggere il file.\n\n<small>Usa un file manager differente per scegliere un\'immagine</small></string>
+    <string name="account_status_unknown">Sconosciuto</string>
+    <string name="account_status_disabled">Disabilitato temporaneamente</string>
+    <string name="account_status_online">Online</string>
+    <string name="account_status_connecting">In connessione\u2026</string>
+    <string name="account_status_offline">Offline</string>
+    <string name="account_status_unauthorized">Non autorizzato</string>
+    <string name="account_status_not_found">Server non trovato</string>
+    <string name="account_status_no_internet">Connettività assente</string>
+    <string name="account_status_regis_fail">Registrazione fallita</string>
+    <string name="account_status_regis_conflict">Nome utente già in uso</string>
+    <string name="account_status_regis_success">Registrazione completata</string>
+    <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
+    <string name="encryption_choice_none">Testo semplice</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Modifica utente</string>
+    <string name="mgmt_account_delete">Elimina utente</string>
+    <string name="mgmt_account_disable">Disabilita temporaneamente</string>
+    <string name="mgmt_account_publish_avatar">Pubblica avatar</string>
+    <string name="mgmt_account_publish_pgp">Pubblica chiave pubblica OpenPGP</string>
+    <string name="mgmt_account_enable">Abilita utente</string>
+    <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
+    <string name="mgmt_account_delete_confirm_text">Se cancelli il tuo utente la cronologia delle tue conversazioni verrà persa</string>
+    <string name="attach_record_voice">Registra la voce</string>
+    <string name="account_settings_jabber_id">ID Jabber</string>
+    <string name="account_settings_password">Password</string>
+    <string name="account_settings_example_jabber_id">utente@esempio.com</string>
+    <string name="account_settings_confirm_password">Conferma password</string>
+    <string name="password">Password</string>
+    <string name="confirm_password">Conferma password</string>
+    <string name="passwords_do_not_match">Le Password non corrispondono</string>
+    <string name="invalid_jid">Questo non è un ID Jabber valido</string>
+    <string name="error_out_of_memory">Memoria esaurita. L\'immagine è tropppo grande</string>
+    <string name="add_phone_book_text">Vuoi aggiungere %s alla rubrica del telefono?</string>
+    <string name="contact_status_online">online</string>
+    <string name="contact_status_free_to_chat">vuole chattare</string>
+    <string name="contact_status_away">assente</string>
+    <string name="contact_status_extended_away">assenza prolungata</string>
+    <string name="contact_status_do_not_disturb">non disturbare</string>
+    <string name="contact_status_offline">offline</string>
+    <string name="muc_details_conference">Conferenza</string>
+    <string name="muc_details_other_members">Altri Membri</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">disponibile</string>
+    <string name="server_info_unavailable">non disponibile</string>
+    <string name="missing_public_keys">Annuncio chiave pubblica non effettuato</string>
+    <string name="last_seen_now">visto adesso</string>
+    <string name="last_seen_min">visto 1 minuto fa</string>
+    <string name="last_seen_mins">visto %d minuti fa</string>
+    <string name="last_seen_hour">visto 1 ora fa</string>
+    <string name="last_seen_hours">visto %d ore fa</string>
+    <string name="last_seen_day">visto 1 giorno fa</string>
+    <string name="last_seen_days">visto %d giorni fa</string>
+    <string name="never_seen">mai visto</string>
+    <string name="install_openkeychain">Messaggio cifrato. Installa OpenKeychain per decifrare.</string>
+    <string name="unknown_otr_fingerprint">Impronta OTR sconosciuta</string>
+    <string name="openpgp_messages_found">Messaggi cifrati con OpenPGP trovati</string>
+    <string name="reception_failed">Ricezione fallita</string>
+    <string name="your_fingerprint">La tua impronta</string>
+    <string name="otr_fingerprint">Impronta OTR</string>
+    <string name="verify">Verifica</string>
+    <string name="decrypt">Decripta</string>
+    <string name="conferences">Conferenze</string>
+    <string name="search">Cerca</string>
+    <string name="create_contact">Crea Contatto</string>
+    <string name="join_conference">Entra in Conferenza</string>
+    <string name="delete_contact">Elimina Contatto</string>
+    <string name="view_contact_details">Mostra dettagli contatto</string>
+    <string name="create">Crea</string>
+    <string name="contact_already_exists">Il contatto esiste già</string>
+    <string name="join">Entra</string>
+    <string name="conference_address">Indirizzo conferenza</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">Salva come segnalibro</string>
+    <string name="delete_bookmark">Elimina segnalibro</string>
+    <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
+    <string name="you">Tu</string>
+    <string name="action_edit_subject">Modifica soggetto conferenza</string>
+    <string name="conference_not_found">Conferenza non trovata</string>
+    <string name="leave">Abbandona</string>
+    <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
+    <string name="add_back">Add back</string>
+    <string name="contact_has_read_up_to_this_point">%s ha letto fino a questo punto</string>
+    <string name="publish">Pubblica</string>
+    <string name="touch_to_choose_picture">Tocca l\'avatar per selezionare l\'immagine dalla gallaria</string>
+    <string name="publish_avatar_explanation">Nota bene: tutti i contatti sottoscritti agli aggiornamenti della tua presenza avranno il permesso di vedere questa immagine.</string>
+    <string name="publishing">Pubblicazione&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Il server ha rifiutato la tua pubblicazione</string>
+    <string name="error_publish_avatar_converting">Qualcosa è andato storto durante la conversione della tua immagine</string>
+    <string name="error_saving_avatar">Impossibile salvare l\'avatar sulla memoria interna</string>
+    <string name="or_long_press_for_default">(O premi a lungo per ripristinare le impostazioni di default)</string>
+    <string name="error_publish_avatar_no_server_support">Il tuo server non supporta la pubblicazione degli avatar</string>
+    <string name="private_message">sussurrato</string>
+    <string name="private_message_to">a %s</string>
+    <string name="send_private_message_to">Invia messaggio privato a %s</string>
+    <string name="connect">Connetti</string>
+    <string name="account_already_exists">Questo utente esiste già</string>
+    <string name="next">Successivo</string>
+    <string name="server_info_session_established">Sessione corrente stabilita</string>
+    <string name="additional_information">Informazioni Aggiuntive</string>
+    <string name="skip">Salta</string>
+    <string name="disable_notifications">Disabilita le notifiche</string>
+    <string name="disable_notifications_for_this_conversation">Disabilita le notifiche per questa conversazione</string>
+    <string name="notifications_disabled">Le notifiche sono disabilitate</string>
+    <string name="enable">Abilita</string>
+    <string name="conference_requires_password">La conferenza richiede una password</string>
+    <string name="enter_password">Inserisci la password</string>
+    <string name="missing_presence_updates">Aggiornamenti della presenza del contatto mancanti</string>
+    <string name="request_presence_updates">Richiedi gli aggiornamenti della presenza dal tuo contatto.\n\n<small>Questo verrà usato per determinare quali client sta usando il tuo contatto.</small></string>
+    <string name="request_now">Rechiedi adesso</string>
+    <string name="delete_fingerprint">Elimina Impronta</string>
+    <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
+    <string name="ignore">Ignora</string>
+    <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
+    <string name="pref_encryption_settings">Impostazioni di cifratura</string>
+    <string name="pref_force_encryption">Forza cifratura end-to-end</string>
+    <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
+    <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
+    <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
+    <string name="pref_expert_options">Opzioni da Esperto</string>
+    <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
+    <string name="pref_use_larger_font">Aumenta la dimensione dei font</string>
+    <string name="pref_use_larger_font_summary">Usa font più grandi in tutta l\'app</string>
+    <string name="pref_use_send_button_to_indicate_status">Il pulsante di invio indica lo stato</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato di un contatto</string>
+
+</resources>
diff --git a/src/main/res/values-iw/arrays.xml b/src/main/res/values-iw/arrays.xml
new file mode 100644
index 00000000..28768d6c
--- /dev/null
+++ b/src/main/res/values-iw/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>נייד</item>
+        <item>טלפון</item>
+        <item>טאבלט</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>אף פעם</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000..fd8eaa0b
--- /dev/null
+++ b/src/main/res/values-iw/strings.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">הגדרות</string>
+    <string name="action_add">דיון חדש</string>
+    <string name="action_accounts">נהל חשבונות</string>
+    <string name="action_end_conversation">סיים את דיון זה</string>
+    <string name="action_contact_details">פרטי איש קשר</string>
+    <string name="action_muc_details">פרטי ועידה</string>
+    <string name="action_secure">דיון מאובטח</string>
+    <string name="action_add_account">הוסף חשבון</string>
+    <string name="action_edit_contact">ערוך שם</string>
+    <string name="action_add_phone_book">הוסף אל פנקס טלפונים</string>
+    <string name="action_delete_contact">מחק מתוך רשימה</string>
+    <string name="title_activity_manage_accounts">נהל חשבונות</string>
+    <string name="title_activity_settings">הגדרות</string>
+    <string name="title_activity_conference_details">פרטי ועידה</string>
+    <string name="title_activity_contact_details">פרטי איש קשר</string>
+    <string name="title_activity_conversations">דיונים</string>
+    <string name="title_activity_sharewith">שתף בעזרת Conversations</string>
+    <string name="title_activity_start_conversation">התחל דיון</string>
+    <string name="title_activity_choose_contact">בחר איש קשר</string>
+    <string name="just_now">רק כעת</string>
+    <string name="minute_ago">לפני דקה 1</string>
+    <string name="minutes_ago">לפני %d דקות</string>
+    <string name="unread_conversations">דיונים שלא נקראו</string>
+    <string name="sending">כעת שולח&#8230;</string>
+    <string name="encrypted_message">כעת מפענח הודעה. אנא המתן&#8230;</string>
+    <string name="nick_in_use">שם כינוי כבר מצוי בשימוש</string>
+    <string name="admin">מנהל</string>
+    <string name="owner">בעלים</string>
+    <string name="moderator">אחראי</string>
+    <string name="participant">משתתף</string>
+    <string name="visitor">מבקר</string>
+    <string name="remove_contact_text">האם ברצונך להסיר את %s מתןך הרשימה שלך? הדיונים אשר משוייכים עם חשבון זה לא יוסרו.</string>
+    <string name="remove_bookmark_text">האם ברצונך להסיר את %s בתוור סימנייה? הדיונים אשר משוייכים עם סימנייה זו לא יוסרו.</string>
+    <string name="register_account">רשום חשבון חדש על שרת</string>
+    <string name="share_with">שתף בעזרת</string>
+    <string name="start_conversation">התחל דיון</string>
+    <string name="invite_contact">הזמן איש קשר</string>
+    <string name="contacts">אנשי קשר</string>
+    <string name="cancel">ביטול</string>
+    <string name="add">הוסף</string>
+    <string name="edit">ערוך</string>
+    <string name="delete">מחק</string>
+    <string name="save">שמור</string>
+    <string name="ok">אישור</string>
+    <string name="crash_report_title">Conversations קרסה</string>
+    <string name="crash_report_message">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations\n<b>אזהרה:</b> זו תעשה שימוש בחשבון XMPP שלך כדי לשלוח עקבות מחסנית אל המפתח.</string>
+    <string name="send_now">שלח עכשיו</string>
+    <string name="send_never">לעולם אל תשאל שוב</string>
+    <string name="problem_connecting_to_account">לא מסוגל להתחבר אל חשבון</string>
+    <string name="problem_connecting_to_accounts">לא מסוגל להתחבר אל חשבונות מרובים</string>
+    <string name="touch_to_fix">לחץ כאן כדי לנהל את החשבונות שלך</string>
+    <string name="attach_file">צרף קובץ</string>
+    <string name="not_in_roster">איש קשר אינו מצוי בתוך הרשימה שלך. האם ברצונך להוסיפו?</string>
+    <string name="add_contact">הוסף איש קשר</string>
+    <string name="send_failed">מסירה נכשלה</string>
+    <string name="send_rejected">סורב</string>
+    <string name="receiving_image">כעת מקבל קובץ תצלום. אנא המתן&#8230;</string>
+    <string name="preparing_image">כעת מכין תצלום לשם תמסורת</string>
+    <string name="action_clear_history">טהר היסטוריה</string>
+    <string name="clear_conversation_history">טהר היסטוריית דיונים</string>
+    <string name="clear_histor_msg">האם ברצונך למחוק את כל ההודעות בתוך דיון זה?\n\n<b>אזהרה:</b> זו לא תשפיע על הודעות מאוחסנות על מכשירים או שרתים אחרים.</string>
+    <string name="delete_messages">מחק הודעות</string>
+    <string name="also_end_conversation">סיים את דיון זה לאחר מכן</string>
+    <string name="choose_presence">בחר נוכחות לאיש קשר</string>
+    <string name="send_plain_text_message">שלח הודעת טקסט גלוי</string>
+    <string name="send_otr_message">שלח הודעה מוצפנת OTR</string>
+    <string name="send_pgp_message">שלח הודעה מוצפנת OpenPGP</string>
+    <string name="your_nick_has_been_changed">שם כינוי שלך השתנה</string>
+    <string name="download_image">הורד תצלום</string>
+    <string name="image_offered_for_download"><i>קובץ תצלום מוצע להורדה</i></string>
+    <string name="send_unencrypted">שלח לא מוצפנת</string>
+    <string name="decryption_failed">פענוח נכשל. אולי אין לך את המפתח הפרטי המתאים.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations מפיקה תועלת מן אפליקציית צד-שלישי הקרויה <b>OpenKeychain</b> כדי להצפין ולפענח הודעות וגם כדי לנהל את המפתחות הפומביים שלך.\n\nOpenKeychain הינה רשויה תחת GPLv3 וזמינה אצל F-Droid וגם Google Play.\n\n<small>(אנא התחל מחדש את Conversations לאחר מכן.)</small></string>
+    <string name="restart">התחל מחדש</string>
+    <string name="install">התקן</string>
+    <string name="offering">כעת מציע&#8230;</string>
+    <string name="waiting">כעת ממתין&#8230;</string>
+    <string name="no_pgp_key">לא נמצא מפתח OpenPGP</string>
+    <string name="contact_has_no_pgp_key">Conversations אינה מסוגלת להצפין את הודעותיך משום שאיש הקשר שלך אינו מכריז על המפתח הפומבי שלו או שלה.\n\n<small>אנא בקש מאיש הקשר שלך לארגן OpenPGP.</small></string>
+    <string name="no_pgp_keys">לא נמצאו מפתחות OpenPGP</string>
+    <string name="contacts_have_no_pgp_keys">Conversations אינה מסוגלת להצפין את הודעותיך משום שאנשי הקשר שלך אינם מכריזים על המפתח הפומבי שלהם.\n\n<small>אנא בקש מאנשי הקשר שלך לארגן OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>הודעה מוצפנת התקבלה. לחץ כדי לצפות ולפענח.</i></string>
+    <string name="encrypted_image_received"><i>תצלום מוצפן התקבל. לחץ כדי לצפות ולפענח.</i></string>
+    <string name="image_file"><i>תצלום התקבל. לחץ כדי לצפות</i></string>
+    <string name="pref_xmpp_resource">משאב XMPP</string>
+    <string name="pref_xmpp_resource_summary">השם שלקוח זה מזהה את עצמו עם</string>
+    <string name="pref_accept_files">קבל קבצים</string>
+    <string name="pref_accept_files_summary">קבל אוטומטית קבצים קטנים יותר מאשר&#8230;</string>
+    <string name="pref_notification_settings">הגדרות התראה</string>
+    <string name="pref_notifications">התראות</string>
+    <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string>
+    <string name="pref_vibrate">הרטט</string>
+    <string name="pref_vibrate_summary">הרטט גם כאשר הודעה חדשה מגיעה</string>
+    <string name="pref_sound">צליל</string>
+    <string name="pref_sound_summary">נגן צלצול עם התראה</string>
+    <string name="pref_conference_notifications">התראות ועידה</string>
+    <string name="pref_conference_notifications_summary">תמיד תודיע כאשר הודעת ועידה חדשה מגיעה במקום רק כאשר מודגשת</string>
+    <string name="pref_notification_grace_period">משך ארכת התראה</string>
+    <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת פחם התקבלה</string>
+    <string name="pref_advanced_options">אפשרויות מתקדמות</string>
+    <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
+    <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
+    <string name="pref_confirm_messages">אשר הודעות</string>
+    <string name="pref_confirm_messages_summary">אפשר לאיש קשר שלך לדעת מתי קיבלת וקראת הודעה</string>
+    <string name="openpgp_error">OpenKeychain דיווח שגיאה</string>
+    <string name="error_decrypting_file">שגיאת I/O פענוח קובץ</string>
+    <string name="accept">קבל</string>
+    <string name="error">אירעה שגיאה</string>
+    <string name="pref_grant_presence_updates">הענק עדכוני נוכחות</string>
+    <string name="pref_grant_presence_updates_summary">הענק ובקש הרשמות נוכחות מראש עבור אנשי קשר שיצרת</string>
+    <string name="subscriptions">הרשמות</string>
+    <string name="your_account">החשבון שלך</string>
+    <string name="keys">מפתחות</string>
+    <string name="send_presence_updates">שלח עדכוני נוכחות</string>
+    <string name="receive_presence_updates">קבל עדכוני נוכחות</string>
+    <string name="ask_for_presence_updates">בקש עדכוני נוכחות</string>
+    <string name="attach_choose_picture">בחר תמונה</string>
+    <string name="attach_take_picture">קח תמונה</string>
+    <string name="preemptively_grant">הענק בקשת הרשמה מראש</string>
+    <string name="error_not_an_image_file">הקובץ שבחרת אינו תצלום</string>
+    <string name="error_compressing_image">שגיאה במהלך המרת קובץ תצלום</string>
+    <string name="error_file_not_found">קובץ לא נמצא</string>
+    <string name="error_io_exception">שגיאת I/O כללית. אולי אזל לך נפח אחסון?</string>
+    <string name="error_security_exception_during_image_copy">האפליקציה בה השתמשת כדי לבחור את תצלום זה לא סיפקה לנו מספיק הרשאות כדי לקרוא את הקובץ.\n\n<small>השתמש במנהל קבצים אחר כדי לבחור תצלום</small></string>
+    <string name="account_status_unknown">לא ידוע</string>
+    <string name="account_status_disabled">מנוטרל זמנית</string>
+    <string name="account_status_online">מקוון</string>
+    <string name="account_status_connecting">כעת מתחבר\u2026</string>
+    <string name="account_status_offline">לא מקוון</string>
+    <string name="account_status_unauthorized">לא מורשה</string>
+    <string name="account_status_not_found">שרת לא נמצא</string>
+    <string name="account_status_no_internet">אין חיבוריות</string>
+    <string name="account_status_regis_fail">הרשמה נכשלה</string>
+    <string name="account_status_regis_conflict">שם משתמש כבר מצוי בשימוש</string>
+    <string name="account_status_regis_success">הרשמה הושלמה</string>
+    <string name="account_status_regis_not_sup">שרת לא תומך הרשמה</string>
+    <string name="encryption_choice_none">טקסט גלוי</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">ערוך חשבון</string>
+    <string name="mgmt_account_delete">מחק</string>
+    <string name="mgmt_account_disable">נטרל זמנית</string>
+    <string name="mgmt_account_publish_avatar">פרסם אווטאר</string>
+    <string name="mgmt_account_enable">אפשר</string>
+    <string name="mgmt_account_are_you_sure">האם אתה בטוח?</string>
+    <string name="mgmt_account_delete_confirm_text">אם אתה מוחק את חשבונך כל היסטוריית הדיון שלך תאבד</string>
+    <string name="attach_record_voice">הקלט קול</string>
+    <string name="account_settings_jabber_id">מזהה Jabber</string>
+    <string name="account_settings_password">סיסמה</string>
+    <string name="account_settings_example_jabber_id">username@example.com</string>
+    <string name="account_settings_confirm_password">אמת סיסמה</string>
+    <string name="password">סיסמה</string>
+    <string name="confirm_password">אמת סיסמה</string>
+    <string name="passwords_do_not_match">סיסמאות לא תואמות</string>
+    <string name="invalid_jid">זה אינו מזהה Jabber תקף</string>
+    <string name="error_out_of_memory">חסר זיכרון. תצלום גדול מדי</string>
+    <string name="add_phone_book_text">האם ברצונך להוסיף את %s אל רשימת קשר טלפונית?</string>
+    <string name="contact_status_online">מקוון</string>
+    <string name="contact_status_free_to_chat">חופשי לשיחה</string>
+    <string name="contact_status_away">נעדר</string>
+    <string name="contact_status_extended_away">נעדר לזמן מה</string>
+    <string name="contact_status_do_not_disturb">אל תפריעו</string>
+    <string name="contact_status_offline">לא מקוון</string>
+    <string name="muc_details_conference">ועידה</string>
+    <string name="muc_details_other_members">חברים אחרים</string>
+    <string name="server_info_carbon_messages">הודעות פחם</string>
+    <string name="server_info_stream_management">ניהול זרם</string>
+    <string name="missing_public_keys">הכרזות מפתח פומבי חסרות</string>
+    <string name="last_seen_now">נראה לאחרונה ממש עכשיו</string>
+    <string name="last_seen_min">נראה לאחרונה לפני דקה 1</string>
+    <string name="last_seen_mins">נראה לאחרונה לפני %d דקות</string>
+    <string name="last_seen_hour">נראה לאחרונה לפני שעה 1</string>
+    <string name="last_seen_hours">נראה לאחרונה לפני %d שעות ago</string>
+    <string name="last_seen_day">נראה לאחרונה לפני יום 1</string>
+    <string name="last_seen_days">נראה לאחרונה לפני %d ימים</string>
+    <string name="never_seen">לא נראה מעולם</string>
+    <string name="install_openkeychain">הודעה מוצפנת. אנא התקן OpenKeychain כדי לפענח.</string>
+    <string name="unknown_otr_fingerprint">טביעת אצבע OTR לא מוכרת</string>
+    <string name="openpgp_messages_found">הודעות מוצפנות OpenPGP נמצאו</string>
+    <string name="reception_failed">קבלה נכשלה</string>
+    <string name="your_fingerprint">טביעת אצבע שלך</string>
+    <string name="otr_fingerprint">טביעת אצבע OTR</string>
+    <string name="verify">אמת</string>
+    <string name="decrypt">פענח</string>
+    <string name="conferences">ועידות</string>
+    <string name="search">חפש</string>
+    <string name="create_contact">צור איש קשר</string>
+    <string name="join_conference">הצטרף לועידה</string>
+    <string name="delete_contact">מחק איש קשר</string>
+    <string name="view_contact_details">צפה בפרטי איש קשר</string>
+    <string name="create">צור</string>
+    <string name="contact_already_exists">איש קשר כבר קיים</string>
+    <string name="join">הצטרף</string>
+    <string name="conference_address">כתובת ועידה</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">שמור בתור סימנייה</string>
+    <string name="delete_bookmark">מחק סימנייה</string>
+    <string name="bookmark_already_exists">סימנייה זו כבר קיימת</string>
+    <string name="you">אני</string>
+    <string name="action_edit_subject">ערוך נושא ועידה</string>
+    <string name="conference_not_found">ועידה לא נמצאה</string>
+    <string name="leave">עזוב</string>
+    <string name="contact_added_you">איש קשר הוסיף אותך אל רשימת קשר</string>
+    <string name="add_back">הוסף בחזרה</string>
+    <string name="contact_has_read_up_to_this_point">%s קרא עד לנקודה זו</string>
+    <string name="touch_to_choose_picture">לחץ על אווטאר כדי לבחור תמונה מתוך גלריה</string>
+    <string name="publish_avatar_explanation">לתשומת לבך: כל מי אשר רשום לעדכוני נוכחות שלך יורשה לראות את תמונה זו.</string>
+    <string name="publishing">כעת מפרסם&#8230;</string>
+    <string name="error_publish_avatar_server_reject">השרת פסל פרסום</string>
+    <string name="error_publish_avatar_converting">משהו השתבש במהלך המרת תמונה</string>
+    <string name="error_saving_avatar">לא היה מסוגל לשמור אווטאר אל כונן</string>
+    <string name="or_long_press_for_default">(או לחיצה ארוכה כדי להחזיר לשגרה)</string>
+    <string name="error_publish_avatar_no_server_support">שרתך לא תומך בפרסום של אווטארים</string>
+    <string name="private_message">בפרטי</string>
+    <string name="private_message_to">בפרטי אל %s</string>
+    <string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
+    <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-nl/arrays.xml b/src/main/res/values-nl/arrays.xml
new file mode 100644
index 00000000..9ced79f4
--- /dev/null
+++ b/src/main/res/values-nl/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mobiel</item>
+        <item>Telefoon</item>
+        <item>Tablet</item>
+        <item>Conversaties</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>nooit</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000..7b3faca9
--- /dev/null
+++ b/src/main/res/values-nl/strings.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversaties</string>
+    <string name="action_settings">Instellingen</string>
+    <string name="action_add">Nieuwe conversatie</string>
+    <string name="action_accounts">Beheer account</string>
+    <string name="action_end_conversation">Beëindig conversatie</string>
+    <string name="action_contact_details">Contact details</string>
+    <string name="action_muc_details">Gesprek details</string>
+    <string name="action_secure">Beveiligde conversatie</string>
+    <string name="action_add_account">Voeg account toe</string>
+    <string name="action_edit_contact">Verander naam</string>
+    <string name="action_add_phone_book">Voeg aan telefoonboek toe</string>
+    <string name="action_delete_contact">Verwijder uit lijst</string>
+    <string name="title_activity_manage_accounts">Beheer Accounts</string>
+    <string name="title_activity_settings">Instellingen</string>
+    <string name="title_activity_conference_details">Groepsconversatie Details</string>
+    <string name="title_activity_contact_details">Contact Details</string>
+    <string name="title_activity_conversations">Conversaties</string>
+    <string name="title_activity_sharewith">Delen met Conversatie</string>
+    <string name="just_now">net</string>
+    <string name="minute_ago">1 min geleden</string>
+    <string name="minutes_ago">%d min geleden</string>
+    <string name="unread_conversations">ongelezen Conversaties</string>
+    <string name="sending">versturen&#8230;</string>
+    <string name="encrypted_message">Bericht aan het ontsleutelen. Een moment geduld a.u.b.&#8230;</string>
+    <string name="nick_in_use">Naam is al in gebruik</string>
+    <string name="admin">Beheerder</string>
+    <string name="owner">Eigenaar</string>
+    <string name="moderator">Moderator</string>
+    <string name="participant">Deelnemer</string>
+    <string name="visitor">Bezoeker</string>
+    <string name="remove_contact_text">Wilt u %s uit uw lijst verwijderen? De conversatie met deze account zal niet worden verwijderd.</string>
+    <string name="register_account">Registreer nieuwe account op server</string>
+    <string name="share_with">Deel met</string>
+    <string name="start_conversation">Start Conversatie</string>
+    <string name="contacts">Contacten</string>
+    <string name="cancel">Annuleer</string>
+    <string name="add">Voeg toe</string>
+    <string name="edit">Bewerk</string>
+    <string name="delete">Verwijder</string>
+    <string name="save">Sla op</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Conversaties is gecrashed</string>
+    <string name="crash_report_message">Door het versturen van crash rapportages helpt u mee met de ontwikkeling van Conversaties.\n<b>Waarschuwing:</b> Deze app zal uw XMPP account gebruiken om de crash rapportages te versturen naar de ontwikkelaars.</string>
+    <string name="send_now">Nu versturen</string>
+    <string name="send_never">Niet opnieuw vragen</string>
+    <string name="problem_connecting_to_account">Account verbinden mislukt</string>
+    <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string>
+    <string name="touch_to_fix">Raak hier aan om accounts te beheren</string>
+    <string name="attach_file">Voeg bestand bij</string>
+    <string name="not_in_roster">Het contact is geen onderdeel van uw lijst. Wilt u het toevoegen?</string>
+    <string name="add_contact">Voeg contact toe</string>
+    <string name="send_failed">afleveren mislukt</string>
+    <string name="send_rejected">geweigerd</string>
+    <string name="receiving_image">Bezig met ontvangen van afbeelding. Een moment geduld a.u.b.&#8230;</string>
+    <string name="preparing_image">Bezig met voorbereiden van het versturen van afbeelding</string>
+    <string name="action_clear_history">Wis geschiedenis</string>
+    <string name="clear_conversation_history">Wis conversatie geschiedenis</string>
+    <string name="clear_histor_msg">Wilt U alle berichten in deze Conversatie verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
+    <string name="delete_messages">Verwijder berichten</string>
+    <string name="also_end_conversation">Beëindig deze conversatie na afloop</string>
+    <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
+    <string name="send_plain_text_message">Verstuur eenvoudig tekst bericht</string>
+    <string name="send_otr_message">Verstuur OTR versleuteld bericht</string>
+    <string name="send_pgp_message">Verstuur OpenPGP versleuteld bericht</string>
+    <string name="your_nick_has_been_changed">Uw naam is veranderd</string>
+    <string name="download_image">Download Afbeelding</string>
+    <string name="image_offered_for_download"><i>Afbeelding aangeboden voor downloaden</i></string>
+    <string name="send_unencrypted">Verstuur onversleuteld</string>
+    <string name="decryption_failed">Ontsleutelen mislukt. Misschien hebt U niet de juiste private sleutel.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversaties gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversaties na installatie.)</small></string>
+    <string name="restart">Herstart</string>
+    <string name="install">Installeer</string>
+    <string name="offering">offering&#8230;</string>
+    <string name="waiting">wachten&#8230;</string>
+    <string name="no_pgp_key">Geen OpenPGP sleutel gevonden</string>
+    <string name="contact_has_no_pgp_key">Conversaties kan Uw berichten niet versleutelen omdat uw contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag uw contact om OpenPGP te configureren.</small></string>
+    <string name="no_pgp_keys">Geen OpenPGP sleutels gevonden</string>
+    <string name="contacts_have_no_pgp_keys">Conversaties kan uw berichten niet versleutelen omdat uw contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag uw contacten om OpenPGP te configureren.</small></string>
+    <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
+    <string name="encrypted_image_received"><i>Versleutelde afbeelding ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string>
+    <string name="image_file"><i>Afbeelding ontvangen. Raak aan om te bekijken.</i></string>
+    <string name="pref_xmpp_resource">XMPP resource</string>
+    <string name="pref_xmpp_resource_summary">De naam waarmee deze client zich identificeert</string>
+    <string name="pref_accept_files">Accepteer bestanden</string>
+    <string name="pref_accept_files_summary">Accepteer automatisch bestanden kleiner dan&#8230;</string>
+    <string name="pref_notification_settings">Notificatie Instellingen</string>
+    <string name="pref_notifications">Notificaties</string>
+    <string name="pref_notifications_summary">Notificatie als een nieuw bericht arriveert</string>
+    <string name="pref_vibrate">Trillen</string>
+    <string name="pref_vibrate_summary">Tril ook wanneer een nieuw bericht arriveert</string>
+    <string name="pref_sound">Geluid</string>
+    <string name="pref_sound_summary">Speel ringtone af bij notificatie</string>
+    <string name="pref_conference_notifications">Groepsconversatie notificaties</string>
+    <string name="pref_conference_notifications_summary">Toon altijd notificaties als er nieuwe berichten arriveren in groepsconversaties in plaats van alleen bij highlighting</string>
+    <string name="pref_notification_grace_period">Notificatie uitstel periode</string>
+    <string name="pref_notification_grace_period_summary">Zet notificaties voor korte tijd uit als er een carbon copy wordt ontvangen</string>
+    <string name="pref_advanced_options">Geadvanceerde Opties</string>
+    <string name="pref_never_send_crash">Verstuur nooit crash rapportages</string>
+    <string name="pref_never_send_crash_summary">Door crash rapportages te versturen helpt U mee aan de ontwikkeling van Conversaties</string>
+    <string name="pref_confirm_messages">Bevestig Berichten</string>
+    <string name="pref_confirm_messages_summary">Laat uw contacten weten waneer U berichten hebt ontvangen en gelezen</string>
+    <string name="openpgp_error">OpenKeychain rapporteerde een fout</string>
+    <string name="error_decrypting_file">I/O Fout tijdens ontsleutelen bestand</string>
+    <string name="accept">Accepteer</string>
+    <string name="error">Er is een fout opgetreden</string>
+    <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheid updates</string>
+    <string name="pref_grant_presence_updates_summary">Vantevoren toestemming verlenen en vragen aan contacten die U hebt aangemaakt</string>
+    <string name="subscriptions">Abonnementen</string>
+    <string name="your_account">Uw account</string>
+    <string name="keys">Sleutels</string>
+    <string name="send_presence_updates">Verstuur aanwezigheid updates</string>
+    <string name="receive_presence_updates">Ontvang aanwezigheid updates</string>
+    <string name="ask_for_presence_updates">Vraag naar aanwezigheid updates</string>
+    <string name="attach_choose_picture">Kies afbeelding</string>
+    <string name="attach_take_picture">Neem foto</string>
+    <string name="preemptively_grant">Vantevoren toestemming verlenen voor abonneren</string>
+    <string name="error_not_an_image_file">Het bestand dat U gekozen hebt is geen afbeelding</string>
+    <string name="error_compressing_image">Fout tijdens converteren van afbeelding</string>
+    <string name="error_file_not_found">Bestand niet gevonden</string>
+    <string name="error_io_exception">Generieke I/O fout. Misschien is er geen opslagruimte meer beschikbaar?</string>
+    <string name="error_security_exception_during_image_copy">De app die U gebruikte om de afbeelding te selecteren heeft niet voldoende toegang geleverd om het bestand te lezen.\n\n<small>Gebruik een andere app om een afbeelding te kiezen</small></string>
+    <string name="account_status_unknown">Onbekend</string>
+    <string name="account_status_disabled">Tijdelijk uitgezet</string>
+    <string name="account_status_online">Online</string>
+    <string name="account_status_connecting">Verbinden\u2026</string>
+    <string name="account_status_offline">Offline</string>
+    <string name="account_status_unauthorized">Niet gemachtigd</string>
+    <string name="account_status_not_found">Server niet gevonden</string>
+    <string name="account_status_no_internet">Geen verbinding</string>
+    <string name="account_status_regis_fail">Registratie mislukt</string>
+    <string name="account_status_regis_conflict">Gebruikersnaam bezet</string>
+    <string name="account_status_regis_success">Registratie compleet</string>
+    <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
+    <string name="encryption_choice_none">Onversleuteld</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Bewerk account</string>
+    <string name="mgmt_account_delete">Verwijder</string>
+    <string name="mgmt_account_disable">Tijdelijk uitzetten</string>
+    <string name="mgmt_account_enable">Aanzetten</string>
+    <string name="mgmt_account_are_you_sure">Weet U het zeker?</string>
+    <string name="mgmt_account_delete_confirm_text">Als U uw account verwijderd wordt Uw volledige conversatie geschiedenis gewist</string>
+    <string name="attach_record_voice">Neem stem op</string>
+    <string name="account_settings_jabber_id">Jabber ID:</string>
+    <string name="account_settings_password">Wachtwoord:</string>
+    <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string>
+    <string name="account_settings_confirm_password">Bevestig wachtwoord:</string>
+    <string name="password">Wachtwoord</string>
+    <string name="confirm_password">Bevestig wachtwoord</string>
+    <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
+    <string name="invalid_jid">Dit is geen geldig Jabber ID</string>
+    <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
+    <string name="add_phone_book_text">Wilt U %s toevoegen aan de contactenlijst op uw telefoon?</string>
+    <string name="contact_status_online">online</string>
+    <string name="contact_status_free_to_chat">beschikbaar</string>
+    <string name="contact_status_away">weg</string>
+    <string name="contact_status_extended_away">langdurig weg</string>
+    <string name="contact_status_do_not_disturb">niet storen</string>
+    <string name="contact_status_offline">offline</string>
+    <string name="muc_details_conference">groepsconversatie</string>
+    <string name="muc_details_other_members">Andere Leden</string>
+    <string name="server_info_carbon_messages">Carbon Berichten</string>
+    <string name="server_info_stream_management">Stream Management</string>
+    <string name="missing_public_keys">Ontbrekende publieke sleutel aankondigingen</string>
+    <string name="last_seen_now">zonet voor het laatst gezien</string>
+    <string name="last_seen_min">1 minuut geleden voor het laatst gezien</string>
+    <string name="last_seen_mins">%d minuten geleden voor het laatst gezien</string>
+    <string name="last_seen_hour">1 uur geleden voor het laatst gezien</string>
+    <string name="last_seen_hours">%d uur geleden voor het laatst gezien</string>
+    <string name="last_seen_day">1 dag geleden voor het laatst gezien</string>
+    <string name="last_seen_days">%d dagen geleden voor het laatst gezien</string>
+    <string name="never_seen">nog nooit gezien</string>
+    <string name="install_openkeychain">Versleuteld bericht. Installeer OpenKeychain om te ontsleutelen.</string>
+    <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string>
+    <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
+    <string name="reception_failed">Ontvangen mislukt</string>
+    <string name="join_conference">Aan groepsconversatie deelnemen</string>
+    <string name="invite_contact">Contact uitnodigen</string>
+    <string name="your_fingerprint">Uw vingerafdruk</string>
+    <string name="delete_bookmark">Bladwijzer verwijderen</string>
+    <string name="join">Deelnemen</string>
+    <string name="otr_fingerprint">OTR vingerafdruk</string>
+    <string name="you">U</string>
+    <string name="conference_not_found">Groepsconversatie niet gevonden</string>
+    <string name="search">Zoeken</string>
+    <string name="contact_already_exists">Het contact bestaat al</string>
+    <string name="title_activity_start_conversation">Start Groepsconversatie</string>
+    <string name="title_activity_choose_contact">Kies contact</string>
+    <string name="contact_added_you">Contact added you to contact list</string>
+    <string name="view_contact_details">Contactdetails bekijken</string>
+    <string name="conferences">Groepsconversaties</string>
+    <string name="verify">Controleren</string>
+    <string name="create_contact">Contact Aanmaken</string>
+    <string name="remove_bookmark_text">Wilt u %s als bladwijzer verwijderen? De groepsconversatie die verbonden is met deze bladwijzer zal niet verwijderd worden.</string>
+    <string name="action_edit_subject">Onderwerp van groepsconversatie veranderen</string>
+    <string name="delete_contact">Contact Verwijderen</string>
+    <string name="create">Aanmaken</string>
+    <string name="leave">Verlaten</string>
+    <string name="conference_address">Groepsconversatie adres</string>
+    <string name="save_as_bookmark">Bladwijzer toevoegen</string>
+    <string name="conference_address_example">kamer@groepsconversatie.voorbeeld.nl</string>
+    <string name="add_back">Terug toevoegen</string>
+    <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
+    <string name="decrypt">Ontsleutelen</string>
+    <string name="contact_has_read_up_to_this_point">%s heeft tot hier gelezen</string>
+    <string name="next">Volgende</string>
+    <string name="publish_avatar_explanation">N.B.: Iedereen die uw aanwezigheid kan zien kan deze afbeelding zien.</string>
+    <string name="server_info_unavailable">niet beschikbaar</string>
+    <string name="mgmt_account_publish_pgp">Publiceer publieke OpenPGP sleutel</string>
+    <string name="additional_information">Extra informatie</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="skip">Overslaan</string>
+    <string name="connect">Verbinden</string>
+    <string name="account_already_exists">Dit account bestaat al</string>
+    <string name="private_message_to">naar %s</string>
+    <string name="send_private_message_to">Verstuur privé bericht aan %s</string>
+    <string name="touch_to_choose_picture">Klik op avatar om een afbeelding te selecteren uit de gallerij</string>
+    <string name="mgmt_account_publish_avatar">Publiceer avatar</string>
+    <string name="error_publish_avatar_server_reject">De server weigerde uw publicatie</string>
+    <string name="error_publish_avatar_converting">Er ging iets mis bij het converteren van uw afbeelding</string>
+    <string name="error_publish_avatar_no_server_support">Uw server ondersteunt de publicatie van avatars niet</string>
+    <string name="publishing">Publiceren&#8230;</string>
+    <string name="error_saving_avatar">Kon de avatar niet opslaan</string>
+    <string name="server_info_session_established">Huidige sessie opgezet</string>
+    <string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string>
+    <string name="server_info_available">beschikbaar</string>
+    <string name="pref_ui_options">UI Opties</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ru/arrays.xml b/src/main/res/values-ru/arrays.xml
new file mode 100644
index 00000000..d01d4eb9
--- /dev/null
+++ b/src/main/res/values-ru/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Мобильный</item>
+        <item>Телефон</item>
+        <item>Планшет</item>
+        <item>Conversations</item>
+        <item>Андроид</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>никогда</item>
+        <item>256 Кб</item>
+        <item>512 Кб</item>
+        <item>1 Мб</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..2aa26b0b
--- /dev/null
+++ b/src/main/res/values-ru/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Настройки</string>
+    <string name="action_add">Новая беседа</string>
+    <string name="action_accounts">Управление аккаунтами</string>
+    <string name="action_end_conversation">Закончить текущую беседу</string>
+    <string name="action_contact_details">Сведения о контакте</string>
+    <string name="action_muc_details">Сведения о конференции</string>
+    <string name="action_secure">Защищенная беседа</string>
+    <string name="action_add_account">Добавить аккаунт</string>
+    <string name="action_edit_contact">Редактировать контакт</string>
+    <string name="action_add_phone_book">Добавить в телефонную книгу</string>
+    <string name="action_delete_contact">Удалить из списка</string>
+    <string name="title_activity_manage_accounts">Управление Аккаунтами</string>
+    <string name="title_activity_settings">Настройки</string>
+    <string name="title_activity_conference_details">Сведения о Конференции</string>
+    <string name="title_activity_contact_details">Сведения о Контакте</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Поделиться</string>
+    <string name="title_activity_start_conversation">Начать беседу</string>
+    <string name="title_activity_choose_contact">Выберите собеседника</string>
+    <string name="just_now">только что</string>
+    <string name="minute_ago">1 минуту назад</string>
+    <string name="minutes_ago">%d мин. назад</string>
+    <string name="unread_conversations">непрочитанных сообщений</string>
+    <string name="sending">отправка&#8230;</string>
+    <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите&#8230;</string>
+    <string name="nick_in_use">Имя уже используется</string>
+    <string name="admin">Администратор</string>
+    <string name="owner">Владелец</string>
+    <string name="moderator">Модератор</string>
+    <string name="participant">Участник</string>
+    <string name="visitor">Посетитель</string>
+    <string name="remove_contact_text">Вы хотите удалить %s из своего списка? Беседы, связанные с этим аккаунтом будут сохранены.</string>
+    <string name="remove_bookmark_text">Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой будут сохранены</string>
+    <string name="register_account">Создать новый аккаунт на сервере</string>
+    <string name="share_with">Поделиться с</string>
+    <string name="start_conversation">Начать беседу</string>
+    <string name="invite_contact">Пригласить собеседника</string>
+    <string name="contacts">Контакты</string>
+    <string name="cancel">Отмена</string>
+    <string name="add">Добавить</string>
+    <string name="edit">Редактировать</string>
+    <string name="delete">Удалить</string>
+    <string name="save">Сохранить</string>
+    <string name="ok">ОК</string>
+    <string name="crash_report_title">Conversations был неожиданно остановлен</string>
+    <string name="crash_report_message">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить программу, поддерживая дальнейшее развитие программы\n<b>Предупреждение:</b>Отчет об ошибке будет отправлен разработчику, используя ваш аккаунт XMPP.</string>
+    <string name="send_now">Отправить сейчас</string>
+    <string name="send_never">Больше не спрашивать</string>
+    <string name="problem_connecting_to_account">Не удается подключиться к аккаунту</string>
+    <string name="problem_connecting_to_accounts">Не удается подключиться к аккаунтам</string>
+    <string name="touch_to_fix">Нажмите здесь, чтобы настроить свои аккаунты</string>
+    <string name="attach_file">Прикрепить файл</string>
+    <string name="not_in_roster">Контакт не находится в вашем списке. Хотите добавить его?</string>
+    <string name="add_contact">Добавить контакт</string>
+    <string name="send_failed">доставка не удалась</string>
+    <string name="send_rejected">отклонено</string>
+    <string name="receiving_image">Получение изображения. Пожалуйста подождите&#8230;</string>
+    <string name="preparing_image">Подготовка изображения к передаче</string>
+    <string name="action_clear_history">Очистить историю</string>
+    <string name="clear_conversation_history">Очистить историю</string>
+    <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах.</string>
+    <string name="delete_messages">Удалить сообщения</string>
+    <string name="also_end_conversation">Завершить беседу</string>
+    <string name="choose_presence">Укажите статус для контакта</string>
+    <string name="send_plain_text_message">Отправить незашифрованное текстовое сообщение</string>
+    <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
+    <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
+    <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
+    <string name="download_image">Загрузить изображение</string>
+    <string name="image_offered_for_download"><i>Изображение предложено для загрузки</i></string>
+    <string name="send_unencrypted">Отправить в незашифрованном виде</string>
+    <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
+    <string name="openkeychain_required">Установите OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations использует стороннее приложение под названием <b>OpenKeychain</b> для шифрования и расшифрования сообщений и управления открытыми ключами.\nПрограмма OpenKeychain распространяется под лицензией GPLv3 и доступна для загрузки через F-Droid или Google Play.\n\n<small>(Потребуется перезапуск Conversations после установки.)</small></string>
+    <string name="restart">Перезапуск</string>
+    <string name="install">Установка</string>
+    <string name="offering">предложение&#8230;</string>
+    <string name="waiting">ожидание&#8230;</string>
+    <string name="no_pgp_key">Нет OpenPGP ключа</string>
+    <string name="contact_has_no_pgp_key">Conversations не может зашифровать сообщение, потому что удаленный пользователь не анонсирует свой открытый ключ.\n\n<small>Пожалуйста, попросите удаленного пользователя тоже установить OpenPGP.</small></string>
+    <string name="no_pgp_keys">Нет OpenPGP ключей</string>
+    <string name="contacts_have_no_pgp_keys">Conversations не может зашифровать сообщения, потому что удаленные пользователи не анонсируют свои открытые ключи.\n\n<small>Пожалуйста, попросите удаленных пользователей тоже установить OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Зашифрованное сообщение получено. Нажмите здесь, чтобы расшифровать и посмотреть сообщение.</i></string>
+    <string name="encrypted_image_received"><i>Зашифрованное изображение получено. Нажмите здесь, чтобы расшифровать и посмотреть изображение.</i></string>
+    <string name="image_file"><i>Изображение получено. Нажмите здесь, чтобы посмотреть.</i></string>
+    <string name="pref_general">Общие</string>
+    <string name="pref_xmpp_resource">Название ресурса</string>
+    <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
+    <string name="pref_accept_files">Принимать файлы</string>
+    <string name="pref_accept_files_summary">Автоматический прием файлов&#8230;</string>
+    <string name="pref_notification_settings">Настройки Уведомлений</string>
+    <string name="pref_notifications">Уведомление</string>
+    <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
+    <string name="pref_vibrate">Вибрация</string>
+    <string name="pref_vibrate_summary">Использовать вибрацию когда приходят новые сообщения</string>
+    <string name="pref_sound">Звуковой сигнал</string>
+    <string name="pref_sound_summary">Выберите звуковой сигнал для сообщений</string>
+    <string name="pref_conference_notifications">Уведомления конференции</string>
+    <string name="pref_conference_notifications_summary">Всегда сообщать при получении нового сообщения в конференции</string>
+    <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
+    <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
+    <string name="pref_advanced_options">Дополнительные параметры</string>
+    <string name="pref_never_send_crash">Отчеты об ошибках</string>
+    <string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
+    <string name="pref_confirm_messages">Отчеты о получении</string>
+    <string name="pref_confirm_messages_summary">Разрешить уведомлять отправителя, когда вы получили и прочитали сообщение</string>
+    <string name="pref_ui_options">Параметры интерфейса</string>
+    <string name="openpgp_error">Возникла ошибка в OpenKeychain</string>
+    <string name="error_decrypting_file">Ошибка расшифровки файла</string>
+    <string name="accept">Принять</string>
+    <string name="error">Произошла ошибка</string>
+    <string name="pref_grant_presence_updates">Предоставлять обновления</string>
+    <string name="pref_grant_presence_updates_summary">Разрешить и запрашивать статус присутствия для созданных вами контактов</string>
+    <string name="subscriptions">Подписки</string>
+    <string name="your_account">Ваш аккаунт</string>
+    <string name="keys">Ключи</string>
+    <string name="send_presence_updates">Анонсировать статус присутствия</string>
+    <string name="receive_presence_updates">Получать обновления статусов присутствия</string>
+    <string name="ask_for_presence_updates">Запрашивать обновления статусов присутствия</string>
+    <string name="attach_choose_picture">Выберите изображение</string>
+    <string name="attach_take_picture">Снимите изображение</string>
+    <string name="preemptively_grant">Удовлетворять запросы на подписки</string>
+    <string name="error_not_an_image_file">Выбранный файл не является изображением</string>
+    <string name="error_compressing_image">Ошибка при преобразовании изображения</string>
+    <string name="error_file_not_found">Файл не найден</string>
+    <string name="error_io_exception">Общая ошибка ввода/вывода. Возможно, на устройстве недостаточно свободного места?</string>
+    <string name="error_security_exception_during_image_copy">Приложение, которое было использовано для выбора изображения не имеет достаточных прав для чтения файла.\n\n<small>Используйте другой файловый менеджер, чтобы выбрать изображение</small></string>
+    <string name="account_status_unknown">Неизвестен</string>
+    <string name="account_status_disabled">Временно отключен</string>
+    <string name="account_status_online">В сети</string>
+    <string name="account_status_offline">Не в сети</string>
+    <string name="account_status_connecting">Соединение\u2026</string>
+    <string name="account_status_unauthorized">Неавторизован</string>
+    <string name="account_status_not_found">Сервер не найден</string>
+    <string name="account_status_no_internet">Нет подключения к сети</string>
+    <string name="account_status_regis_fail">Регистрация не удалась</string>
+    <string name="account_status_regis_conflict">Имя пользователя уже используется</string>
+    <string name="account_status_regis_success">Регистрация завершена</string>
+    <string name="account_status_regis_not_sup">Сервер не поддерживает регистрацию</string>
+    <string name="encryption_choice_none">Без шифрования</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Редактировать аккаунт</string>
+    <string name="mgmt_account_delete">Удалить</string>
+    <string name="mgmt_account_disable">Отключить</string>
+    <string name="mgmt_account_publish_avatar">Разместить аватар</string>
+    <string name="mgmt_account_publish_pgp">Анонсировать OpenPGP ключ</string>
+    <string name="mgmt_account_enable">Включить</string>
+    <string name="mgmt_account_are_you_sure">Вы уверены?</string>
+    <string name="mgmt_account_delete_confirm_text">Если вы удалите свой аккаунт, вся ваша история будет потеряна</string>
+    <string name="attach_record_voice">Запись голоса</string>
+    <string name="account_settings_jabber_id">JID (Джаббер ID)</string>
+    <string name="account_settings_password">Пароль</string>
+    <string name="account_settings_example_jabber_id">username@example.com</string>
+    <string name="account_settings_confirm_password">Подтвердите пароль</string>
+    <string name="password">Пароль</string>
+    <string name="confirm_password">Подтвердите пароль</string>
+    <string name="passwords_do_not_match">Пароли не совпадают</string>
+    <string name="invalid_jid">Недопустимый JID (Джаббер ID)</string>
+    <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
+    <string name="add_phone_book_text">Вы хотите добавить %s в свою телефонную книгу?</string>
+    <string name="contact_status_online">в сети</string>
+    <string name="contact_status_free_to_chat">свободен для общения</string>
+    <string name="contact_status_away">скоро буду</string>
+    <string name="contact_status_extended_away">буду не скоро</string>
+    <string name="contact_status_do_not_disturb">не беспокоить</string>
+    <string name="contact_status_offline">не в сети</string>
+    <string name="muc_details_conference">Конференция</string>
+    <string name="muc_details_other_members">Другие участники</string>
+    <string name="server_info_carbon_messages">Дублирование сообщений</string>
+    <string name="server_info_stream_management">Управление потоками</string>
+    <string name="server_info_pep">XEP-0163: PEP (Аватары)</string>
+    <string name="server_info_available">доступен</string>
+    <string name="server_info_unavailable">недоступен</string>
+    <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
+    <string name="last_seen_now">Присутствие: только что</string>
+    <string name="last_seen_min">Присутствие: 1 минуту назад</string>
+    <string name="last_seen_mins">Присутствие: %d мин. назад</string>
+    <string name="last_seen_hour">Присутствие: 1 час назад</string>
+    <string name="last_seen_hours">Присутствие: %d час. назад</string>
+    <string name="last_seen_day">Присутствие: 1 день назад</string>
+    <string name="last_seen_days">Присутствие: %d дн. назад</string>
+    <string name="never_seen">Никогда</string>
+    <string name="install_openkeychain">Зашифрованное сообщение. Пожалуйста, установите OpenKeychain для дешифрования.</string>
+    <string name="unknown_otr_fingerprint">Неизвестная контрольная сумма криптографического протокола OTR</string>
+    <string name="openpgp_messages_found">Найдены OpenPGP зашифрованые сообщения</string>
+    <string name="reception_failed">Прием не удался</string>
+    <string name="your_fingerprint">Контрольная сумма</string>
+    <string name="otr_fingerprint">OTR контрольная сумма</string>
+    <string name="verify">Подтвердить</string>
+    <string name="decrypt">Дешифровать</string>
+    <string name="conferences">Конференции</string>
+    <string name="search">Поиск</string>
+    <string name="create_contact">Создать контакт</string>
+    <string name="join_conference">Присоединиться к конференции</string>
+    <string name="delete_contact">Удалить Контакт</string>
+    <string name="view_contact_details">Посмотреть данные контакта</string>
+    <string name="create">Создать</string>
+    <string name="contact_already_exists">Контакт уже существует</string>
+    <string name="join">Присоединиться</string>
+    <string name="conference_address">Адрес конференции</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">Сохранить закладку</string>
+    <string name="delete_bookmark">Удалить закладку</string>
+    <string name="bookmark_already_exists">Такая закладка уже существует</string>
+    <string name="you">Вы</string>
+    <string name="action_edit_subject">Редактировать тему конференции</string>
+    <string name="conference_not_found">Конференция не найдена</string>
+    <string name="leave">Покинуть</string>
+    <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
+    <string name="add_back">Добавить в ответ</string>
+    <string name="contact_has_read_up_to_this_point">%s прочит. сообщ. до этого момента</string>
+    <string name="publish">Опубликовать</string>
+    <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
+    <string name="publish_avatar_explanation">Пожалуйста, обратите внимание, что этот аватар смогут увидеть все ваши подписчики</string>
+    <string name="publishing">Установка&#8230;</string>
+    <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
+    <string name="error_publish_avatar_converting">В процессе преобразования фотографии возникла ошибка</string>
+    <string name="error_saving_avatar">Не удалось сохранить аватар</string>
+    <string name="or_long_press_for_default">(Или долгое прикосновение, чтобы вернуть значения по умолчанию)</string>
+    <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
+    <string name="private_message">Отправить личное сообщение для %s</string>
+    <string name="private_message_to">отправить %s</string>
+    <string name="send_private_message_to">Отправить личное сообщение для %s</string>
+    <string name="connect">Подключиться</string>
+    <string name="account_already_exists">Эта учетная запись уже существует</string>
+    <string name="next">Далее</string>
+    <string name="server_info_session_established">Текущий сеанс установлен</string>
+    <string name="additional_information">Дополнительная информация</string>
+    <string name="skip">Пропустить</string>
+    <string name="disable_notifications">Отключить уведомления</string>
+    <string name="disable_notifications_for_this_conversation">Отключить уведомления для текущей беседы</string>
+    <string name="notifications_disabled">Уведомления отключены</string>
+    <string name="enable">Включить</string>
+    <string name="conference_requires_password">Конференция требует авторизации</string>
+    <string name="enter_password">Введите пароль</string>
+    <string name="missing_presence_updates">Обновления присутствия недоступны</string>
+    <string name="request_presence_updates">Пожалуйста, прежде запросите обновления присутствия у вашего собеседника.\n\n<small>Эта информация будет использоваться для определения того, каким клиентом(ами) пользуетя ваш собеседник.</small></string>
+    <string name="request_now">Запросить сейчас</string>
+    <string name="delete_fingerprint">Удалить Контрольную Сумму</string>
+    <string name="sure_delete_fingerprint">Вы уверены, что хотите удалить данную контрольную сумму?</string>
+    <string name="ignore">Отменить</string>
+    <string name="without_mutual_presence_updates"><b>Внимание:</b> Если обновления присутствия не включены на обеих сторонах, это может привести к возникновению неожиданных проблемам.\n\n<small>Уточните сведения о контакте, проверив настройки обновлений присутствия.</small></string>
+    <string name="pref_encryption_settings">Настройки шифрования</string>
+    <string name="pref_force_encryption">Обязательное сквозное шифрование</string>
+    <string name="pref_force_encryption_summary">Всегда отправлять сообщения зашифрованными (за исключением конференций)</string>
+    <string name="pref_dont_save_encrypted">Не сохранять зашифрованные сообщения</string>
+    <string name="pref_dont_save_encrypted_summary">Внимание: Это может привести к потере сообщений</string>
+    <string name="pref_expert_options">Расширенные настройки</string>
+    <string name="pref_expert_options_summary">Пожалуйста, будьте осторожны с данными настройками</string>
+    <string name="pref_use_larger_font">Увеличить размер шрифта</string>
+    <string name="pref_use_larger_font_summary">Установите больший размер шрифта по всей программе</string>
+    <string name="pref_use_send_button_to_indicate_status">Использовать кнопку-индикатор</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отправить, указывая текущий статус собеседника</string>
+
+</resources>
diff --git a/src/main/res/values-sv/arrays.xml b/src/main/res/values-sv/arrays.xml
new file mode 100644
index 00000000..890e2915
--- /dev/null
+++ b/src/main/res/values-sv/arrays.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mobile</item>
+        <item>Phone</item>
+        <item>Tablet</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>aldrig</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000..a3ed9112
--- /dev/null
+++ b/src/main/res/values-sv/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Inställningar</string>
+    <string name="action_add">Ny konversation</string>
+    <string name="action_accounts">Kontoinställningar</string>
+    <string name="action_end_conversation">Avsluta denna konversation</string>
+    <string name="action_contact_details">Kontaktdetaljer</string>
+    <string name="action_muc_details">Konferensdetaljer</string>
+    <string name="action_secure">Skyddad konversation</string>
+    <string name="action_add_account">Lägg till konto</string>
+    <string name="action_edit_contact">Ändra namn</string>
+    <string name="action_add_phone_book">Lägg till i telefonbok</string>
+    <string name="action_delete_contact">Ta bort kontakt</string>
+    <string name="title_activity_manage_accounts">Hantera konton</string>
+    <string name="title_activity_settings">Inställningar</string>
+    <string name="title_activity_conference_details">Konferensdetaljer</string>
+    <string name="title_activity_contact_details">Kontaktdetaljer</string>
+    <string name="title_activity_sharewith">Dela med konversation</string>
+    <string name="title_activity_start_conversation">Starta konversation</string>
+    <string name="title_activity_choose_contact">Välj kontakt</string>
+    <string name="just_now">just nu</string>
+    <string name="minute_ago">1 min sedan</string>
+    <string name="minutes_ago">%d min sedan</string>
+    <string name="unread_conversations">olästa konversationer</string>
+    <string name="sending">skickar&#8230;</string>
+    <string name="encrypted_message">Avkrypterar meddelande. Vänta&#8230;</string>
+    <string name="nick_in_use">Nick används redan</string>
+    <string name="admin">Admin</string>
+    <string name="owner">Ägare</string>
+    <string name="moderator">Moderator</string>
+    <string name="participant">Deltagare</string>
+    <string name="visitor">Besökare</string>
+    <string name="remove_contact_text">Vill du ta bort %s från din kontaktlista? Konversationer associerade med denna kontakt kommer inte tas bort.</string>
+    <string name="remove_bookmark_text">Vill du ta bort %s som bokmärke? Konversationer associerade med detta bokmärke kommer inte tas bort.</string>
+    <string name="register_account">Registrera nytt konto på servern</string>
+    <string name="share_with">Dela med</string>
+    <string name="start_conversation">Starta konversation</string>
+    <string name="invite_contact">Bjud in kontakt</string>
+    <string name="contacts">Kontakter</string>
+    <string name="cancel">Avbryt</string>
+    <string name="add">Lägg till</string>
+    <string name="edit">Ändra</string>
+    <string name="delete">Ta bort</string>
+    <string name="save">Spara</string>
+    <string name="ok">Ok</string>
+    <string name="crash_report_title">Conversations har kraschat</string>
+    <string name="crash_report_message">Genom att skicka in stack traces hjälper du utvecklarna av Conversations\n<b>Varning:</b> Detta använder ditt XMPP konto för att skicka informationen till utvecklarna.</string>
+    <string name="send_now">Skicka nu</string>
+    <string name="send_never">Fråga aldrig igen</string>
+    <string name="problem_connecting_to_account">Kan inte ansluta till konto</string>
+    <string name="problem_connecting_to_accounts">Kan inte ansluta till flera konton</string>
+    <string name="touch_to_fix">Tryck här för att hantera dina konton</string>
+    <string name="attach_file">Bifoga fil</string>
+    <string name="not_in_roster">Kontakten är inte i din kontaktlista. Vill du lägga till den?</string>
+    <string name="add_contact">Lägg till kontakt</string>
+    <string name="send_failed">sändning misslyckades</string>
+    <string name="send_rejected">avvisad</string>
+    <string name="receiving_image">Tar emot bildfil. Vänta&#8230;</string>
+    <string name="preparing_image">Förbereder bild för sändning</string>
+    <string name="action_clear_history">Rensa historik</string>
+    <string name="clear_conversation_history">Rensa konversationshistorik</string>
+    <string name="clear_histor_msg">Vill du ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar.</string>
+    <string name="delete_messages">Ta bort meddelanden</string>
+    <string name="also_end_conversation">Avsluta denna konversation efter</string>
+    <string name="send_plain_text_message">Skicka meddelande i klartext</string>
+    <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
+    <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
+    <string name="your_nick_has_been_changed">Ditt nick har ändrats</string>
+    <string name="download_image">Ladda ner bild</string>
+    <string name="image_offered_for_download"><i>Bildfil erbjuds för nedladdning</i></string>
+    <string name="send_unencrypted">Skicka okrypterat</string>
+    <string name="decryption_failed">Avkryptering gick fel. Du kanske inte har rätt privat nyckel.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations använder en tredjeparts applikation som heter <b>OpenKeychain</b> för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierat under GPLv3 och tillgängligt på F-Droid och Google Play.\n\n<small>(Starta om Conversations efter.)</small></string>
+    <string name="restart">Starta om</string>
+    <string name="install">Installera</string>
+    <string name="offering">erbjuder&#8230;</string>
+    <string name="waiting">väntar&#8230;</string>
+    <string name="no_pgp_key">Ingen OpenPGP-nyckel funnen</string>
+    <string name="contact_has_no_pgp_key">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
+    <string name="no_pgp_keys">Inga OpenPGP-nycklar funna</string>
+    <string name="contacts_have_no_pgp_keys">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Krypterat meddelande mottaget. Tryck för att se och avkryptera.</i></string>
+    <string name="encrypted_image_received"><i>Krypterad bild mottagen. Tryck för att se och avkryptera.</i></string>
+    <string name="image_file"><i>Bild mottagen. Tryck för att se</i></string>
+    <string name="pref_xmpp_resource">XMPP resurs</string>
+    <string name="pref_xmpp_resource_summary">Namnet som klienten identifierar sig med</string>
+    <string name="pref_accept_files">Acceptera filer</string>
+    <string name="pref_accept_files_summary">Acceptera automatistk filer som är mindre än&#8230;</string>
+    <string name="pref_notification_settings">Notifieringsinställningar</string>
+    <string name="pref_notifications">Notifieringar</string>
+    <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
+    <string name="pref_vibrate">Vibrera</string>
+    <string name="pref_vibrate_summary">Vibrera när meddelande tagits emot</string>
+    <string name="pref_sound">Ljud</string>
+    <string name="pref_sound_summary">Spela ljud med notifiering</string>
+    <string name="pref_conference_notifications">Konferensnotifieringar</string>
+    <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight</string>
+    <string name="pref_notification_grace_period">Notifieringsfrist</string>
+    <string name="pref_advanced_options">Avancerade inställningar</string>
+    <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
+    <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
+    <string name="pref_confirm_messages">Bekräfta meddelanden</string>
+    <string name="pref_confirm_messages_summary">Låter dina kontakter veta när du har tagit emot och läst ett meddelande</string>
+    <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
+    <string name="error_decrypting_file">I/O-fel vid avkryptering av fil</string>
+    <string name="accept">Acceptera</string>
+    <string name="error">Ett fel har inträffat</string>
+    <string name="pref_grant_presence_updates">Tillåt tillänglighetsuppdateringar</string>
+    <string name="pref_grant_presence_updates_summary">Tillåt i förväg och be om tillgänglighetsuppdateringar för kontakter du skapat</string>
+    <string name="subscriptions">Abonnemang</string>
+    <string name="your_account">Ditt konto</string>
+    <string name="keys">Nycklar</string>
+    <string name="send_presence_updates">Skicka tillgänglighetsuppdatering</string>
+    <string name="receive_presence_updates">Ta emot tillgänglighetsuppdateringar</string>
+    <string name="ask_for_presence_updates">Be om tillgänglighetsuppdateringar</string>
+    <string name="attach_choose_picture">Välj bild</string>
+    <string name="attach_take_picture">Ta ny bild</string>
+    <string name="preemptively_grant">Tillåt abonnemangsbegäran i förväg</string>
+    <string name="error_not_an_image_file">Filen du valt är inte en bild</string>
+    <string name="error_compressing_image">Fel vid konvertering av bildfilen</string>
+    <string name="error_file_not_found">Filen hittas ej</string>
+    <string name="error_io_exception">Generellt I/O-fel. Du kanske fick slut på plats?</string>
+    <string name="error_security_exception_during_image_copy">Applikationen du använde för att välja bilden gav inte tillräckliga rättigheter för att läsa filen.\n\n<small>Använd en annan filhanterare för att välja bild</small></string>
+    <string name="account_status_unknown">Okänd</string>
+    <string name="account_status_online">Online</string>
+    <string name="account_status_connecting">Ansluter\u2026</string>
+    <string name="account_status_offline">Offline</string>
+    <string name="account_status_unauthorized">Otillåten</string>
+    <string name="account_status_not_found">Server ej funnen</string>
+    <string name="account_status_no_internet">Ingen anslutning</string>
+    <string name="account_status_regis_fail">Registreringsfel</string>
+    <string name="account_status_regis_conflict">Användarnamn används redan</string>
+    <string name="account_status_regis_success">Registrering klar</string>
+    <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
+    <string name="encryption_choice_none">Klartext</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Ändra konto</string>
+    <string name="mgmt_account_delete">Ta bort</string>
+    <string name="mgmt_account_enable">Aktivera</string>
+    <string name="mgmt_account_are_you_sure">Är du säker?</string>
+    <string name="mgmt_account_delete_confirm_text">Om du tar bort kontot kommer all konversationshistorik att försvinna</string>
+    <string name="attach_record_voice">Spela in röst</string>
+    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_password">Lösenord</string>
+    <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
+    <string name="account_settings_confirm_password">Bekräfta lösenord</string>
+    <string name="password">Lösenord</string>
+    <string name="confirm_password">Bekräfta lösenord</string>
+    <string name="passwords_do_not_match">Lösenorden är inte lika</string>
+    <string name="invalid_jid">Detta är inte ett korrekt Jabber ID</string>
+    <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
+    <string name="add_phone_book_text">Vill du lägga till %s i din telefons kontaktlista?</string>
+    <string name="contact_status_online">online</string>
+    <string name="contact_status_free_to_chat">tillgänglig</string>
+    <string name="contact_status_away">borta</string>
+    <string name="contact_status_extended_away">borta (förlängt)</string>
+    <string name="contact_status_do_not_disturb">stör ej</string>
+    <string name="contact_status_offline">offline</string>
+    <string name="muc_details_conference">Konferens</string>
+    <string name="muc_details_other_members">Andra medlemmar</string>
+    <string name="server_info_carbon_messages">Carbon Messages</string>
+    <string name="server_info_stream_management">Stream Management</string>
+    <string name="missing_public_keys">Annonsering om publik nyckel saknas</string>
+    <string name="last_seen_now">senast sedd just nu</string>
+    <string name="last_seen_min">senast sedd 1 minut sedan</string>
+    <string name="last_seen_mins">senast sedd %d minuter sedan</string>
+    <string name="last_seen_hour">senast sedd 1 timme sedan</string>
+    <string name="last_seen_hours">senast sedd %d timmar sedan</string>
+    <string name="last_seen_day">senast sedd 1 dag sedan</string>
+    <string name="last_seen_days">senast sedd %d dagar sedan</string>
+    <string name="never_seen">aldrig sedd</string>
+    <string name="install_openkeychain">Krypterat meddelande. Installera OpenKeychain för att avkryptera.</string>
+    <string name="unknown_otr_fingerprint">Okänt OTR-fingeravtryck</string>
+    <string name="openpgp_messages_found">OpenPGP-krypterat meddelande funnet</string>
+    <string name="reception_failed">Mottagning misslyckades</string>
+    <string name="your_fingerprint">Ditt fingeravtryck</string>
+    <string name="otr_fingerprint">OTR-fingeravtryck</string>
+    <string name="verify">Verifiera</string>
+    <string name="decrypt">Avkryptera</string>
+    <string name="conferences">Konferenser</string>
+    <string name="search">Sök</string>
+    <string name="create_contact">Skapa kontakt</string>
+    <string name="join_conference">Gå med i konferens</string>
+    <string name="delete_contact">Ta bort kontakt</string>
+    <string name="view_contact_details">Se kontaktdetaljer</string>
+    <string name="create">Skapa</string>
+    <string name="contact_already_exists">Kontakten finns redan</string>
+    <string name="join">Gå med</string>
+    <string name="conference_address">Konferensadress</string>
+    <string name="conference_address_example">rum@conference.exempel.se</string>
+    <string name="save_as_bookmark">Spara som bokmärke</string>
+    <string name="delete_bookmark">Ta bort bokmärke</string>
+    <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
+    <string name="you">Du</string>
+    <string name="action_edit_subject">Ändra konferensämne</string>
+    <string name="conference_not_found">Konferens hittades inte</string>
+    <string name="leave">Lämna</string>
+    <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
+    <string name="add_back">Addera tillbaks</string>
+    <string name="contact_has_read_up_to_this_point">%s har läst fram hit</string>
+    <string name="next">Nästa</string>
+    <string name="server_info_unavailable">otillgänglig</string>
+    <string name="mgmt_account_publish_pgp">Publisera OpenPGP publik nyckel</string>
+    <string name="additional_information">Ytterligare information</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatarbilder)</string>
+    <string name="skip">skippa</string>
+    <string name="connect">Anslut</string>
+    <string name="account_already_exists">Detta konto finns redan</string>
+    <string name="private_message_to">till %s</string>
+    <string name="send_private_message_to">Skicka privat meddelande till %s</string>
+    <string name="touch_to_choose_picture">Tryck på avatarbild för att välja en bild från bildgalleriet</string>
+    <string name="mgmt_account_publish_avatar">Publisera avatarbild</string>
+    <string name="error_publish_avatar_server_reject">Servern kunde inte publisera</string>
+    <string name="error_publish_avatar_converting">Något gick fel vid konvertering av din bild</string>
+    <string name="error_publish_avatar_no_server_support">Din server stödjer inte publisering av avatarbilder</string>
+    <string name="publishing">Publiserar&#8230;</string>
+    <string name="error_saving_avatar">Kunde inte spara avatarbild till disk</string>
+    <string name="server_info_session_established">Nuvarande session upprättad</string>
+    <string name="or_long_press_for_default">(Eller tryck länge för att få tillbaks förvald)</string>
+    <string name="server_info_available">tillgänglig</string>
+    <string name="pref_general">Generellt</string>
+    <string name="publish">Publicera</string>
+    <string name="private_message">privat meddelande</string>
+    <string name="pref_ui_options">UI inställningar</string>
+    <string name="enable">Aktivera</string>
+    <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
+    <string name="disable_notifications">Inaktivera notifieringar</string>
+    <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
+    <string name="conference_requires_password">Konferensen kräver lösenord</string>
+    <string name="pref_dont_save_encrypted">Spara in krypterade meddelanden</string>
+    <string name="pref_encryption_settings">Krypteringsinställningar</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
+    <string name="missing_presence_updates">Saknar tillgänglighetsuppdateringar från kontakt</string>
+    <string name="pref_expert_options">Expertinställningar</string>
+    <string name="pref_force_encryption_summary">Sänd alltid krypterade meddelanden (utom för konferenser)</string>
+    <string name="pref_expert_options_summary">Var försiktig med dem</string>
+    <string name="disable_notifications_for_this_conversation">Inaktivera notifieringar för denna konversation</string>
+    <string name="pref_use_send_button_to_indicate_status">Skickaknappen indikerar status</string>
+    <string name="enter_password">Fyll i lösenord</string>
+    <string name="notifications_disabled">Notifieringar är inaktiverade</string>
+    <string name="pref_force_encryption">Tvinga kryptering</string>
+    <string name="sure_delete_fingerprint">Är du säker på att du vill ta bort detta fingeravtryck?</string>
+    <string name="ignore">Ignorera</string>
+    <string name="pref_use_larger_font_summary">Använd större teckenstorlek för hela applikationen</string>
+    <string name="pref_use_larger_font">Öka teckenstorlek</string>
+    <string name="pref_dont_save_encrypted_summary">Varning: Detta kan leda till att meddelanden förloras</string>
+    <string name="delete_fingerprint">Ta bort fingeravtryck</string>
+    <string name="request_now">Begär nu</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="publish_avatar_explanation">Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild.</string>
+    <string name="choose_presence">Välj tillgänglighet till kontakt</string>
+    <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
+    <string name="account_status_disabled">Tillfälligt inaktiverad</string>
+    <string name="mgmt_account_disable">Inaktivera tillfälligt</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml
new file mode 100644
index 00000000..1a243079
--- /dev/null
+++ b/src/main/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>手机</item>
+        <item>电话</item>
+        <item>平板电脑</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>永不</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 分钟</item>
+        <item>1 小时</item>
+        <item>2 小时</item>
+        <item>8 小时</item>
+        <item>直至另行取消</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..a7898425
--- /dev/null
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">设置</string>
+    <string name="action_add">新会话</string>
+    <string name="action_accounts">管理账户</string>
+    <string name="action_end_conversation">结束会话</string>
+    <string name="action_contact_details">联系人详情</string>
+    <string name="action_muc_details">讨论组详情</string>
+    <string name="action_secure">安全对话</string>
+    <string name="action_add_account">添加账号</string>
+    <string name="action_edit_contact">编辑姓名</string>
+    <string name="action_add_phone_book">添加到手机通讯录</string>
+    <string name="action_delete_contact">从列表中删除</string>
+    <string name="title_activity_manage_accounts">管理账户</string>
+    <string name="title_activity_settings">设置</string>
+    <string name="title_activity_conference_details">讨论组详情</string>
+    <string name="title_activity_contact_details">联系人详情</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">分享会话</string>
+    <string name="title_activity_start_conversation">开始会话</string>
+    <string name="title_activity_choose_contact">选择联系人</string>
+    <string name="just_now">刚刚</string>
+    <string name="minute_ago">1 分钟前</string>
+    <string name="minutes_ago">%d分钟前</string>
+    <string name="unread_conversations">未读会话</string>
+    <string name="sending">正在发送&#8230;</string>
+    <string name="encrypted_message">解密信息中. 请稍候&#8230;</string>
+    <string name="nick_in_use">该名称已存在</string>
+    <string name="admin">管理员</string>
+    <string name="owner">所有者</string>
+    <string name="moderator">版主</string>
+    <string name="participant">参与者</string>
+    <string name="visitor">访客</string>
+    <string name="remove_contact_text">将 %s从列表中移除? 与该联系人的会话消息不会清除.</string>
+    <string name="remove_bookmark_text">从书签中移除 %s?相关会话消息不会被清除 .</string>
+    <string name="register_account">在服务器上注册新账户</string>
+    <string name="share_with">分享</string>
+    <string name="start_conversation">开始会话</string>
+    <string name="invite_contact">邀请联系人</string>
+    <string name="contacts">联系人</string>
+    <string name="cancel">取消</string>
+    <string name="add">添加</string>
+    <string name="edit">编辑</string>
+    <string name="delete">删除</string>
+    <string name="save">保存</string>
+    <string name="ok">完成</string>
+    <string name="crash_report_title">Conversations停止运行</string>
+    <string name="crash_report_message">发送堆栈跟踪到正在开发Conversations的人员\n<b>警告:</b> 该操作将用您的 XMPP账户发送堆栈跟踪到开发人员.</string>
+    <string name="send_now">现在发送</string>
+    <string name="send_never">不再询问</string>
+    <string name="problem_connecting_to_account">无法连接至账户</string>
+    <string name="problem_connecting_to_accounts">无法连接至多个账户</string>
+    <string name="touch_to_fix">点击此处管理账户</string>
+    <string name="attach_file">附件</string>
+    <string name="not_in_roster">该联系人不在您的列表.需要加为联系人吗 ?</string>
+    <string name="add_contact">添加联系人</string>
+    <string name="send_failed">传递失败</string>
+    <string name="send_rejected">拒绝</string>
+    <string name="receiving_image">接收图片文件中. 请稍候&#8230;</string>
+    <string name="preparing_image">准备传输图像</string>
+    <string name="action_clear_history">清除历史记录</string>
+    <string name="clear_conversation_history">清除会话记录</string>
+    <string name="clear_histor_msg">删除该会话中所有信息?\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息.</string>
+    <string name="delete_messages">删除消息</string>
+    <string name="also_end_conversation">之后结束该会话</string>
+    <string name="choose_presence">添加在线用户至联系人</string>
+    <string name="send_plain_text_message">发送纯文本信息</string>
+    <string name="send_otr_message">发送 OTR 加密信息</string>
+    <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
+    <string name="your_nick_has_been_changed">用户名修改成功</string>
+    <string name="download_image">下载图片</string>
+    <string name="image_offered_for_download"><i>供下载的图像文件</i></string>
+    <string name="send_unencrypted">不加密发送</string>
+    <string name="decryption_failed">解密失败，可能是私钥不正确.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解码信息以及管理您的公钥.\n\nOpenKeychain 遵循 GPLv3 并且在 F-Droid和Google Play上可操作.\n\n<small>(之后请重启conversations.)</small></string>
+    <string name="restart">重启</string>
+    <string name="install">安装</string>
+    <string name="offering">输入&#8230;</string>
+    <string name="waiting">等待&#8230;</string>
+    <string name="no_pgp_key">未发现OpenPGP 密码</string>
+    <string name="contact_has_no_pgp_key">会话加密信息失败，因为联系人未告知他/她的公钥.\n\n<small>请通知联系人设置 OpenPGP.</small></string>
+    <string name="no_pgp_keys">未找到 OpenPGP 密码</string>
+    <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>加密信息已接收.点击进行解密和查看.</i></string>
+    <string name="encrypted_image_received"><i>加密图像已接收.点击进行解密和查看.</i></string>
+    <string name="image_file"><i>图片已成功接收，点击查看</i></string>
+    <string name="pref_general">常规</string>
+    <string name="pref_xmpp_resource">XMPP 资源</string>
+    <string name="pref_xmpp_resource_summary">客户端标识名称</string>
+    <string name="pref_accept_files">接收文件</string>
+    <string name="pref_accept_files_summary">自动接收小于 &#8230; 的文件</string>
+    <string name="pref_notification_settings">通知设置</string>
+    <string name="pref_notifications">通知</string>
+    <string name="pref_notifications_summary">收到新消息时通知</string>
+    <string name="pref_vibrate">震动</string>
+    <string name="pref_vibrate_summary">收到新消息时震动</string>
+    <string name="pref_sound">声音</string>
+    <string name="pref_sound_summary">收到新消息时播放铃声</string>
+    <string name="pref_conference_notifications">讨论组通知</string>
+    <string name="pref_conference_notifications_summary">当有新的消息时总是通知而不是亮屏时才通知</string>
+    <string name="pref_notification_grace_period">通知限期</string>
+    <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
+    <string name="pref_advanced_options">高级选项</string>
+    <string name="pref_never_send_crash">总不发送故障报告</string>
+    <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助Conversations开发人员</string>
+    <string name="pref_confirm_messages">确认消息</string>
+    <string name="pref_confirm_messages_summary">当你已收到消息并且已阅时通知好友</string>
+    <string name="pref_ui_options">UI选项</string>
+    <string name="openpgp_error">OpenKeychain 报告了一个错误</string>
+    <string name="error_decrypting_file">解码文件时出现I/O错误</string>
+    <string name="accept">接受</string>
+    <string name="error">产生了一个错误</string>
+    <string name="pref_grant_presence_updates">同意更新在线联系人</string>
+    <string name="pref_grant_presence_updates_summary">预先同意并请求您的联系人进行更新</string>
+    <string name="subscriptions">关注</string>
+    <string name="your_account">你的账号</string>
+    <string name="keys">Keys</string>
+    <string name="send_presence_updates">发送在线联系人更新列表</string>
+    <string name="receive_presence_updates">接收在线联系人更新列表</string>
+    <string name="ask_for_presence_updates">请求在线联系人更新列表</string>
+    <string name="attach_choose_picture">选择图片</string>
+    <string name="attach_take_picture">照相</string>
+    <string name="preemptively_grant">预先同意订阅请求</string>
+    <string name="error_not_an_image_file">您选择的文件不是图像文件</string>
+    <string name="error_compressing_image">转换图像出错</string>
+    <string name="error_file_not_found">未找到文件</string>
+    <string name="error_io_exception">常规的I/O错误.可能是存储空间不足的原因？</string>
+    <string name="error_security_exception_during_image_copy">您用来选择图片的app没有给予足够权限支持我们读取文件.\n\n<small>请使用另一文件管理器选择图片</small></string>
+    <string name="account_status_unknown">未知</string>
+    <string name="account_status_disabled">暂时不可用</string>
+    <string name="account_status_online">在线</string>
+    <string name="account_status_connecting">Connecting\u2026</string>
+    <string name="account_status_offline">离线</string>
+    <string name="account_status_unauthorized">未授权</string>
+    <string name="account_status_not_found">未找到服务器</string>
+    <string name="account_status_no_internet">未连接网络</string>
+    <string name="account_status_regis_fail">注册失败</string>
+    <string name="account_status_regis_conflict"> 用户名已存在</string>
+    <string name="account_status_regis_success">注册完成</string>
+    <string name="account_status_regis_not_sup">服务器不支持注册</string>
+    <string name="encryption_choice_none">纯文本内容</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">编辑账号</string>
+    <string name="mgmt_account_delete">删除账号</string>
+    <string name="mgmt_account_disable">暂时不可用</string>
+    <string name="mgmt_account_publish_avatar">发布头像</string>
+    <string name="mgmt_account_publish_pgp">发布 OpenPGP 公共秘钥</string>
+    <string name="mgmt_account_enable">启用账户</string>
+    <string name="mgmt_account_are_you_sure">确定?</string>
+    <string name="mgmt_account_delete_confirm_text">如果删除用户，所有会话信息将会丢失</string>
+    <string name="attach_record_voice">Record voice 录音</string>
+    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_password">密码</string>
+    <string name="account_settings_example_jabber_id">username@example.com</string>
+    <string name="account_settings_confirm_password">确认密码</string>
+    <string name="password">密码</string>
+    <string name="confirm_password">确认密码</string>
+    <string name="passwords_do_not_match">密码不一致</string>
+    <string name="invalid_jid">该Jabber ID 无效</string>
+    <string name="error_out_of_memory">空间不足，图片过大</string>
+    <string name="add_phone_book_text">您将添加 %s 至手机联系人列表?</string>
+    <string name="contact_status_online">在线</string>
+    <string name="contact_status_free_to_chat">免费对话</string>
+    <string name="contact_status_away">离开</string>
+    <string name="contact_status_extended_away">长时间离开</string>
+    <string name="contact_status_do_not_disturb">请勿打扰</string>
+    <string name="contact_status_offline">离线</string>
+    <string name="muc_details_conference">讨论组</string>
+    <string name="muc_details_other_members">其他成员</string>
+    <string name="server_info_carbon_messages">XEP-0280: 消息碳</string>
+    <string name="server_info_stream_management">XEP-0198: 流管理</string>
+    <string name="server_info_pep">XEP-0163: PEP (头像)</string>
+    <string name="server_info_available">有效</string>
+    <string name="server_info_unavailable">无效</string>
+    <string name="missing_public_keys">缺少公共秘钥公告</string>
+    <string name="last_seen_now">最近一次查看为刚刚</string>
+    <string name="last_seen_min"> 最近一次查看为一分钟前</string>
+    <string name="last_seen_mins">最近一次查看为 %d 分钟前</string>
+    <string name="last_seen_hour">最近一次查看为一小时前</string>
+    <string name="last_seen_hours">最近一次查看为 %d 小时前</string>
+    <string name="last_seen_day">最近一次查看为一天前</string>
+    <string name="last_seen_days">最近一次查看为 %d天前</string>
+    <string name="never_seen">未曾查看</string>
+    <string name="install_openkeychain">加密信息. 请安装OpenKeychain进行解码.</string>
+    <string name="unknown_otr_fingerprint">未知 OTR指纹</string>
+    <string name="openpgp_messages_found">OpenPGP 发现加密信息</string>
+    <string name="reception_failed">接收失败</string>
+    <string name="your_fingerprint">你的指纹</string>
+    <string name="otr_fingerprint">OTR 指纹</string>
+    <string name="verify">验证</string>
+    <string name="decrypt">解密</string>
+    <string name="conferences">讨论组</string>
+    <string name="search">查找</string>
+    <string name="create_contact">创建联系人</string>
+    <string name="join_conference">加入讨论组</string>
+    <string name="delete_contact">删除联系人</string>
+    <string name="view_contact_details">查看联系人详细信息</string>
+    <string name="create">创建</string>
+    <string name="contact_already_exists">联系人已存在</string>
+    <string name="join">加入</string>
+    <string name="conference_address">讨论组地址</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">保存为书签</string>
+    <string name="delete_bookmark">删除书签</string>
+    <string name="bookmark_already_exists">该书签已存在</string>
+    <string name="you">你的</string>
+    <string name="action_edit_subject">编辑讨论组主题</string>
+    <string name="conference_not_found">讨论组未找到</string>
+    <string name="leave">离开</string>
+    <string name="contact_added_you">联系人已添加你到联系人列表</string>
+    <string name="add_back">反向添加</string>
+    <string name="contact_has_read_up_to_this_point">目前读到%s 处</string>
+    <string name="publish">发布</string>
+    <string name="touch_to_choose_picture">点击头像可选择头像 </string>
+    <string name="publish_avatar_explanation">请注意: 所有关注您最新动态的人将看到该图像.</string>
+    <string name="publishing">发布&#8230;</string>
+    <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布请求</string>
+    <string name="error_publish_avatar_converting">转换头像出错</string>
+    <string name="error_saving_avatar">不能将头像保存至disk</string>
+    <string name="or_long_press_for_default">(或长按按钮将返回默认头像)</string>
+    <string name="error_publish_avatar_no_server_support">您的服务器不支持发布头像</string>
+    <string name="private_message">密谈</string>
+    <string name="private_message_to">至 %s</string>
+    <string name="send_private_message_to">发送私密消息到%s</string>
+    <string name="connect">Connect</string>
+    <string name="account_already_exists">该账号已存在</string>
+    <string name="next">下一步</string>
+    <string name="server_info_session_established">当前会话已建立</string>
+    <string name="additional_information">其他信息</string>
+    <string name="skip">Skip略过</string>
+    <string name="disable_notifications">关闭通知</string>
+    <string name="disable_notifications_for_this_conversation">关闭该会话消息</string>
+    <string name="notifications_disabled">通知已关闭</string>
+    <string name="enable">打开通知</string>
+    <string name="conference_requires_password">讨论组设有密码</string>
+    <string name="enter_password">输入密码</string>
+    <string name="missing_presence_updates">缺少在线联系人更新</string>
+    <string name="request_presence_updates">请先发送更新在线联系人请求.\n\n<small>这将用来判断您的联系人所用的客户端类型人.</small></string>
+    <string name="request_now">现在发送请求</string>
+    <string name="delete_fingerprint">删除指纹</string>
+    <string name="sure_delete_fingerprint">是否确定删除该指纹?</string>
+    <string name="ignore">忽略</string>
+    <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题.\n\n<small>到联系人详情确认您订阅的在线联系人.</small></string>
+    <string name="pref_encryption_settings">加密设置</string>
+    <string name="pref_force_encryption">强制要求 end-to-end 加密</string>
+    <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
+    <string name="pref_dont_save_encrypted">不保存加密信息</string>
+    <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
+    <string name="pref_expert_options">Expert 选项</string>
+    <string name="pref_expert_options_summary">请谨慎使用</string>
+    <string name="pref_use_larger_font"> 放大字体</string>
+    <string name="pref_use_larger_font_summary">整个app界面使用更大号的字体</string>
+    <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml
new file mode 100644
index 00000000..b9c261ad
--- /dev/null
+++ b/src/main/res/values-zh-rTW/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>手機</item>
+        <item>電話</item>
+        <item>平板電腦</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>永不</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 分鐘</item>
+        <item>1 小時</item>
+        <item>2 小時</item>
+        <item>8 小時</item>
+        <item>直至另行取消</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..2c3ea225
--- /dev/null
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">設定</string>
+    <string name="action_add">新對話</string>
+    <string name="action_accounts">管理帳戶</string>
+    <string name="action_end_conversation">結束對話</string>
+    <string name="action_contact_details">聯絡人詳情</string>
+    <string name="action_secure">安全對話</string>
+    <string name="action_add_account">新增帳戶</string>
+    <string name="action_edit_contact">編輯姓名</string>
+    <string name="action_add_phone_book">新增到手機通訊錄</string>
+    <string name="action_delete_contact">從列表中刪除</string>
+    <string name="title_activity_manage_accounts">管理帳戶</string>
+    <string name="title_activity_conference_details">群組詳情</string>
+    <string name="title_activity_contact_details">聯絡人詳情</string>
+    <string name="title_activity_conversations">對話</string>
+    <string name="title_activity_sharewith">分享對話</string>
+    <string name="title_activity_start_conversation">開始對話</string>
+    <string name="title_activity_choose_contact">選擇聯絡人</string>
+    <string name="just_now">剛剛</string>
+    <string name="minute_ago">1 分鐘前</string>
+    <string name="minutes_ago">%d 分鐘前</string>
+    <string name="unread_conversations">未讀對話</string>
+    <string name="sending">正在發送&#8230;</string>
+    <string name="encrypted_message">正在解密訊息中，請稍候&#8230;</string>
+    <string name="nick_in_use">該用戶名稱已被使用</string>
+    <string name="admin">管理員</string>
+    <string name="owner">擁有人</string>
+    <string name="moderator">版主</string>
+    <string name="participant">成員</string>
+    <string name="visitor">訪客</string>
+    <string name="remove_contact_text">你確定要將 %s 從聯絡人清單中移除嗎？與該聯絡人的對話將不會被清除。</string>
+    <string name="remove_bookmark_text">你確定要將 %s 從書籤清單中移除嗎？與該聯絡人的對話將不會被清除。</string>
+    <string name="register_account">在伺服器上註冊新帳戶</string>
+    <string name="share_with">分享</string>
+    <string name="start_conversation">開始對話</string>
+    <string name="invite_contact">邀請聯絡人</string>
+    <string name="contacts">聯絡人</string>
+    <string name="cancel">取消</string>
+    <string name="add">新增</string>
+    <string name="edit">編輯</string>
+    <string name="delete">刪除</string>
+    <string name="save">儲存</string>
+    <string name="ok">好的</string>
+    <string name="crash_report_title">Conversations 停止運行</string>
+    <string name="crash_report_message">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式。\n<b>警告:</b> 你的 XMPP 帳戶將被用作發送有關訊息之用。</string>
+    <string name="send_now">現在發送</string>
+    <string name="send_never">不再詢問</string>
+    <string name="problem_connecting_to_account">無法連接至帳戶</string>
+    <string name="problem_connecting_to_accounts">無法連接至多個帳戶</string>
+    <string name="touch_to_fix">點擊此處管理帳戶。</string>
+    <string name="attach_file">附件</string>
+    <string name="not_in_roster">該聯絡人不在你的聯絡人清單上，需要加為聯絡人嗎?</string>
+    <string name="add_contact">新增聯絡人</string>
+    <string name="send_failed">傳遞失敗</string>
+    <string name="send_rejected">拒絕</string>
+    <string name="receiving_image">接收圖片文件中，請稍候&#8230;</string>
+    <string name="preparing_image">準備傳輸圖片</string>
+    <string name="action_clear_history">清除歷史記錄</string>
+    <string name="clear_conversation_history">清除對話記錄</string>
+    <string name="clear_histor_msg">你確定要刪除該對話中所有訊息嗎？\n\n<b>警告:</b> 這將不會影響其他設備或伺服器儲存的訊息。</string>
+    <string name="delete_messages">刪除訊息</string>
+    <string name="also_end_conversation">之後結束這對話</string>
+    <string name="choose_presence">選擇狀態訊息</string>
+    <string name="send_plain_text_message">發送純文字訊息</string>
+    <string name="send_otr_message">發送 OTR 加密訊息</string>
+    <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
+    <string name="your_nick_has_been_changed">用戶名稱修改成功</string>
+    <string name="download_image">下載圖片</string>
+    <string name="image_offered_for_download"><i>可供下載的圖像文件</i></string>
+    <string name="send_unencrypted">不加密發送</string>
+    <string name="decryption_failed">解密失敗，可能是私鑰不正確。</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations 使用一個名為 <b>OpenKeychain</b> 的第三方程式來加密、解碼訊息以及管理您的公鑰。\n\nOpenKeychain 以 GPLv3 釋出，並可在 F-Droid 和 Google Play 上下載。\n\n<small>(之後請重新啟動 Conversations。)</small></string>
+    <string name="restart">重新啟動</string>
+	<string name="install">安裝</string>
+    <string name="offering">提供中&#8230;</string>
+    <string name="waiting">等待中&#8230;</string>
+    <string name="no_pgp_key">找不到 OpenPGP 鑰匙</string>
+    <string name="contact_has_no_pgp_key">Conversations 不能將你的訊息加密，因為聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
+    <string name="no_pgp_keys">找不到多條 OpenPGP 鑰匙</string>
+    <string name="contacts_have_no_pgp_keys">Conversations 不能將你的訊息加密，因為多位聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
+    <string name="encrypted_message_received"><i>已收到加密訊息，點擊進行解密和查看。</i></string>
+    <string name="encrypted_image_received"><i>已收到加密圖片，點擊進行解密和查看。</i></string>
+    <string name="image_file"><i>已收到圖片，點擊查看</i></string>
+    <string name="pref_general">一般</string>
+    <string name="pref_xmpp_resource">XMPP 資源</string>
+    <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
+    <string name="pref_accept_files">接收文件</string>
+    <string name="pref_accept_files_summary">自動接收小於 &#8230; 的文件</string>
+    <string name="pref_notification_settings">通知設定</string>
+    <string name="pref_notifications">通知</string>
+    <string name="pref_notifications_summary">收到新訊息時通知</string>
+    <string name="pref_vibrate">震動</string>
+    <string name="pref_vibrate_summary">收到新訊息時震動</string>
+    <string name="pref_sound">聲音</string>
+    <string name="pref_sound_summary">收到新訊息時播放鈴聲</string>
+    <string name="pref_conference_notifications">群組通知</string>
+    <string name="pref_conference_notifications_summary">當有新訊息時總是通知，而不是被標記時才通知</string>
+    <string name="pref_notification_grace_period">通知限期</string>
+    <string name="pref_notification_grace_period_summary">收到副本後，關閉通知一小段時間</string>
+    <string name="pref_advanced_options">進階選項</string>
+    <string name="pref_never_send_crash">總是不發送故障報告</string>
+    <string name="pref_never_send_crash_summary">發送「堆疊追蹤」給 Conversations 的開發人員能幫助改進本程式</string>
+    <string name="pref_confirm_messages">確認訊息</string>
+    <string name="pref_confirm_messages_summary">讓你的聯絡人知道你已收到及閱讀訊息</string>
+    <string name="pref_ui_options">介面選項</string>
+    <string name="openpgp_error">OpenKeychain 回報了一個錯誤</string>
+    <string name="error_decrypting_file">解密文件時出現 I/O 錯誤</string>
+    <string name="accept">接受</string>
+    <string name="error">發生了一個錯誤</string>
+    <string name="pref_grant_presence_updates">同意更新狀態訊息</string>
+    <string name="pref_grant_presence_updates_summary">預先更新狀態訊息並關注聯絡人的狀態訊息</string>
+    <string name="subscriptions">關注</string>
+    <string name="your_account">你的帳戶</string>
+    <string name="keys">鑰匙</string>
+    <string name="send_presence_updates">發送狀態訊息</string>
+    <string name="receive_presence_updates">接收狀態訊息</string>
+    <string name="ask_for_presence_updates">關注狀態訊息</string>
+    <string name="attach_choose_picture">選擇圖片</string>
+    <string name="attach_take_picture">拍照</string>
+    <string name="preemptively_grant">預先同意關注請求</string>
+    <string name="error_not_an_image_file">您選擇的文件不是圖片</string>
+    <string name="error_compressing_image">轉換圖片時發生錯誤</string>
+    <string name="error_file_not_found">找不到文件</string>
+    <string name="error_io_exception">一般的 I/O 錯誤。是存儲空間不足嗎？</string>
+    <string name="error_security_exception_during_image_copy">你用來選擇圖片的 app 沒有給予足夠權限我們去讀取文件。\n\n<small>請使用另一文件管理器來選擇圖片</small></string>
+    <string name="account_status_unknown">未知</string>
+    <string name="account_status_disabled">暫時停用</string>
+    <string name="account_status_online">在線</string>
+    <string name="account_status_connecting">連接中\u2026</string>
+    <string name="account_status_offline">離線</string>
+    <string name="account_status_unauthorized">未授權</string>
+    <string name="account_status_not_found">未找到伺服器</string>
+    <string name="account_status_no_internet">未連接網絡</string>
+    <string name="account_status_regis_fail">註冊失敗</string>
+    <string name="account_status_regis_conflict">該用戶名稱已被使用</string>
+    <string name="account_status_regis_success">註冊完成</string>
+    <string name="account_status_regis_not_sup">伺服器不支持註冊</string>
+    <string name="encryption_choice_none">純文字內容</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">編輯帳戶</string>
+    <string name="mgmt_account_delete">刪除帳戶</string>
+    <string name="mgmt_account_disable">暫時停用</string>
+    <string name="mgmt_account_publish_avatar">發佈頭像</string>
+    <string name="mgmt_account_publish_pgp">發布 OpenPGP 公共鑰匙</string>
+    <string name="mgmt_account_enable">啟用帳戶</string>
+    <string name="mgmt_account_are_you_sure">你確定嗎？</string>
+    <string name="mgmt_account_delete_confirm_text">如果刪除帳戶，則所有對話訊息將會被刪除</string>
+    <string name="attach_record_voice">錄音</string>
+    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_password">密碼</string>
+    <string name="account_settings_example_jabber_id">username@example.com</string>
+    <string name="account_settings_confirm_password">確認密碼</string>
+    <string name="password">密碼</string>
+    <string name="confirm_password">確認密碼</string>
+    <string name="passwords_do_not_match">密碼不一致</string>
+    <string name="invalid_jid">該 Jabber ID 無效</string>
+    <string name="error_out_of_memory">空間不足，圖片過大</string>
+    <string name="add_phone_book_text">你確定要新增 %s 為聯絡人嗎？</string>
+    <string name="contact_status_online">線上</string>
+    <string name="contact_status_free_to_chat">目前有空</string>
+    <string name="contact_status_away">離開</string>
+    <string name="contact_status_extended_away">長時間離開</string>
+    <string name="contact_status_do_not_disturb">請勿打擾</string>
+    <string name="contact_status_offline">離線</string>
+    <string name="muc_details_conference">群組</string>
+    <string name="muc_details_other_members">其他成員</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">支援</string>
+    <string name="server_info_unavailable">不支援</string>
+    <string name="missing_public_keys">沒有公佈公鑰訊息。</string>
+    <string name="last_seen_now">剛剛曾在線上</string>
+    <string name="last_seen_min">一分鐘前曾在線上</string>
+    <string name="last_seen_mins">%d 分鐘前曾在線上</string>
+    <string name="last_seen_hour">一小時前曾在線上</string>
+    <string name="last_seen_hours">%d 小時前曾在線上</string>
+    <string name="last_seen_day">一天前曾在線上</string>
+    <string name="last_seen_days">%d 天前曾在線上</string>
+    <string name="never_seen">未曾上線</string>
+    <string name="install_openkeychain">加密的訊息。請安裝 OpenKeychain 以解密。</string>
+    <string name="unknown_otr_fingerprint">未知的 OTR 指紋</string>
+    <string name="openpgp_messages_found">發現以 OpenPGP 加密的訊息</string>
+    <string name="reception_failed">接收失敗</string>
+    <string name="your_fingerprint">你的指紋</string>
+    <string name="otr_fingerprint">OTR 指紋</string>
+    <string name="verify">驗證</string>
+    <string name="decrypt">解密</string>
+    <string name="conferences">群組</string>
+    <string name="search">查找</string>
+    <string name="create_contact">新增聯絡人</string>
+    <string name="join_conference">加入群組</string>
+    <string name="delete_contact">刪除聯絡人</string>
+    <string name="view_contact_details">查看聯絡人詳細訊息</string>
+    <string name="create">新增</string>
+    <string name="contact_already_exists">聯絡人已存在</string>
+    <string name="join">加入</string>
+    <string name="conference_address">群組地址</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">儲存為書籤</string>
+    <string name="delete_bookmark">刪除書籤</string>
+    <string name="bookmark_already_exists">該書籤已存在</string>
+    <string name="you">你</string>
+    <string name="action_edit_subject">編輯群組主題</string>
+    <string name="conference_not_found">群組未找到</string>
+    <string name="leave">離開</string>
+    <string name="contact_added_you">聯絡人已新增你到聯絡人列表</string>
+    <string name="add_back">新增為聯絡人</string>
+    <string name="contact_has_read_up_to_this_point">%s 讀到此處</string>
+    <string name="publish">發佈</string>
+    <string name="touch_to_choose_picture">點擊頭像可選擇頭像</string>
+    <string name="publish_avatar_explanation">請注意: 所有關注你狀態訊息的人將看到該圖像。</string>
+    <string name="publishing">發佈中&#8230;</string>
+    <string name="error_publish_avatar_server_reject">伺服器拒絕了你的發佈請求</string>
+    <string name="error_publish_avatar_converting">發佈頭像時發生錯誤</string>
+    <string name="error_saving_avatar">將頭像儲存至硬碟時發生錯誤</string>
+    <string name="or_long_press_for_default">(或長按以回復預設頭像)</string>
+    <string name="error_publish_avatar_no_server_support">你的伺服器不支持發佈頭像</string>
+    <string name="private_message">私密聊天</string>
+    <string name="private_message_to">給 %s</string>
+    <string name="send_private_message_to">發送私密消息給 %s</string>
+    <string name="connect">連接</string>
+    <string name="account_already_exists">該帳戶已存在</string>
+    <string name="next">下一步</string>
+    <string name="server_info_session_established">已建立連接</string>
+    <string name="additional_information">其他訊息</string>
+    <string name="skip">略過</string>
+    <string name="disable_notifications">關閉通知</string>
+    <string name="disable_notifications_for_this_conversation">關閉該對話消息</string>
+    <string name="notifications_disabled">通知已關閉</string>
+    <string name="enable">打開通知</string>
+    <string name="conference_requires_password">群組設有密碼</string>
+    <string name="enter_password">輸入密碼</string>
+    <string name="missing_presence_updates">缺少聯絡人狀態訊息</string>
+    <string name="request_presence_updates">請先發送關注狀態訊息請求。\n\n<small>這將用來判斷您的聯絡人所用的客戶端類型。</small></string>
+    <string name="request_now">現在發送請求</string>
+    <string name="delete_fingerprint">刪除指紋</string>
+    <string name="sure_delete_fingerprint">你確定刪除該指紋嗎？</string>
+    <string name="ignore">忽略</string>
+    <string name="without_mutual_presence_updates"><b>警告:</b> 在沒有互相關注狀態訊息的情況下發送或會引起不能預計的問題。\n\n<small>請檢視聯絡人詳情頁面以確認你們的關注狀態。</small></string>
+    <string name="pref_encryption_settings">加密設定</string>
+    <string name="pref_force_encryption">強制要求端到端加密</string>
+    <string name="pref_force_encryption_summary">總是發送加密訊息 (群組訊息除外)</string>
+    <string name="pref_dont_save_encrypted">不儲存加密訊息</string>
+    <string name="pref_dont_save_encrypted_summary">警告: 此操作或會導致訊息丟失</string>
+    <string name="pref_expert_options">專家選項</string>
+    <string name="pref_expert_options_summary">請小心設定</string>
+    <string name="pref_use_larger_font">增加字體大小</string>
+    <string name="pref_use_larger_font_summary">讓整個 app 界面使用更大號的字體</string>
+    <string name="pref_use_send_button_to_indicate_status">用「發送」按鈕顯示狀態訊息</string>
+    <string name="pref_use_indicate_received">要求讀取收據</string>
+    <string name="pref_use_indicate_received_summary">已被讀取的訊息會以綠色勾號表示。請注意，這個功能未必每次有效。</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">將「發送」按鈕設成不同顏色，以表示不同的狀態訊息。</string>
+    <string name="pref_expert_options_other">其他</string>
+    <string name="pref_conference_name">群組名稱</string>
+    <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..1a4fd25d
--- /dev/null
+++ b/src/main/res/values/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="resources">
+        <item>Mobile</item>
+        <item>Phone</item>
+        <item>Tablet</item>
+        <item>Conversations</item>
+        <item>Android</item>
+    </string-array>
+    <string-array name="filesizes">
+        <item>never</item>
+        <item>256 KB</item>
+        <item>512 KB</item>
+        <item>1 MB</item>
+    </string-array>
+    <string-array name="filesizes_values">
+        <item>0</item>
+        <item>262144</item>
+        <item>524288</item>
+        <item>1048576</item>
+    </string-array>
+    <string-array name="mute_options_descriptions">
+        <item>30 minutes</item>
+        <item>one hour</item>
+        <item>2 hours</item>
+        <item>8 hours</item>
+        <item>until further notice</item>
+    </string-array>
+
+    <integer-array name="mute_options_durations">
+        <item>1800</item>
+        <item>3600</item>
+        <item>7200</item>
+        <item>28800</item>
+        <item>-1</item>
+    </integer-array>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..2354a5e8
--- /dev/null
+++ b/src/main/res/values/attrs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <attr name="TextSizeInfo" format="dimension" />
+    <attr name="TextSizeBody" format="dimension" />
+    <attr name="TextSizeHeadline" format="dimension" />
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
new file mode 100644
index 00000000..908b8b89
--- /dev/null
+++ b/src/main/res/values/colors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="primary" type="color">#ff259b24</color>
+    <color name="primarydark" type="color">#ff0a7e07</color>
+    <color name="primarytext" type="color">#de000000</color>
+    <color name="secondarytext" type="color">#8a000000</color>
+    <color name="ondarktext" type="color">#fffafafa</color>
+    <color name="primarybackground" type="color">#fffafafa</color>
+    <color name="secondarybackground" type="color">#ffeeeeee</color>
+    <color name="darkbackground" type="color">#ff323232</color>
+    <color name="divider">#1f000000</color>
+    <color name="red">#ffe51c23</color>
+    <color name="orange">#ffff9800</color>
+    <color name="green">#ff259b24</color>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
new file mode 100644
index 00000000..3862bb7b
--- /dev/null
+++ b/src/main/res/values/strings.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Conversations</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_add">New conversation</string>
+    <string name="action_accounts">Manage accounts</string>
+    <string name="action_end_conversation">End this conversation</string>
+    <string name="action_contact_details">Contact details</string>
+    <string name="action_muc_details">Conference details</string>
+    <string name="action_secure">Secure conversation</string>
+    <string name="action_add_account">Add account</string>
+    <string name="action_edit_contact">Edit name</string>
+    <string name="action_add_phone_book">Add to phone book</string>
+    <string name="action_delete_contact">Delete from roster</string>
+    <string name="title_activity_manage_accounts">Manage Accounts</string>
+    <string name="title_activity_settings">Settings</string>
+    <string name="title_activity_conference_details">Conference Details</string>
+    <string name="title_activity_contact_details">Contact Details</string>
+    <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Share with Conversation</string>
+    <string name="title_activity_start_conversation">Start Conversation</string>
+    <string name="title_activity_choose_contact">Choose contact</string>
+    <string name="just_now">just now</string>
+    <string name="minute_ago">1 min ago</string>
+    <string name="minutes_ago">%d mins ago</string>
+    <string name="unread_conversations">unread Conversations</string>
+    <string name="sending">sending&#8230;</string>
+    <string name="encrypted_message">Decrypting message. Please wait&#8230;</string>
+    <string name="nick_in_use">Nickname is already in use</string>
+    <string name="admin">Admin</string>
+    <string name="owner">Owner</string>
+    <string name="moderator">Moderator</string>
+    <string name="participant">Participant</string>
+    <string name="visitor">Visitor</string>
+    <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string>
+    <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
+    <string name="register_account">Register new account on server</string>
+    <string name="share_with">Share with</string>
+    <string name="start_conversation">Start Conversation</string>
+    <string name="invite_contact">Invite Contact</string>
+    <string name="contacts">Contacts</string>
+    <string name="cancel">Cancel</string>
+    <string name="add">Add</string>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="save">Save</string>
+    <string name="ok">OK</string>
+    <string name="crash_report_title">Conversations has crashed</string>
+    <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Conversations\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string>
+    <string name="send_now">Send now</string>
+    <string name="send_never">Never ask again</string>
+    <string name="problem_connecting_to_account">Unable to connect to account</string>
+    <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string>
+    <string name="touch_to_fix">Touch here to manage your accounts</string>
+    <string name="attach_file">Attach file</string>
+    <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
+    <string name="add_contact">Add contact</string>
+    <string name="send_failed">delivery failed</string>
+    <string name="send_rejected">rejected</string>
+    <string name="receiving_image">Receiving image file. Please wait&#8230;</string>
+    <string name="preparing_image">Preparing image for transmission</string>
+    <string name="action_clear_history">Clear history</string>
+    <string name="clear_conversation_history">Clear Conversation History</string>
+    <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
+    <string name="delete_messages">Delete messages</string>
+    <string name="also_end_conversation">End this conversations afterwards</string>
+    <string name="choose_presence">Choose presence to contact</string>
+    <string name="send_plain_text_message">Send plain text message</string>
+    <string name="send_otr_message">Send OTR encrypted message</string>
+    <string name="send_pgp_message">Send OpenPGP encrypted message</string>
+    <string name="your_nick_has_been_changed">Your nickname has been changed</string>
+    <string name="download_image">Download Image</string>
+    <string name="image_offered_for_download"><i>Image file offered for download</i></string>
+    <string name="send_unencrypted">Send unencrypted</string>
+    <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="openkeychain_required_long">Conversations utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Conversations afterwards.)</small></string>
+    <string name="restart">Restart</string>
+    <string name="install">Install</string>
+    <string name="offering">offering&#8230;</string>
+    <string name="waiting">waiting&#8230;</string>
+    <string name="no_pgp_key">No OpenPGP Key found</string>
+    <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
+    <string name="no_pgp_keys">No OpenPGP Keys found</string>
+    <string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
+    <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
+    <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
+    <string name="image_file"><i>Image received. Touch to view</i></string>
+    <string name="pref_general">General</string>
+    <string name="pref_xmpp_resource">XMPP resource</string>
+    <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
+    <string name="pref_accept_files">Accept files</string>
+    <string name="pref_accept_files_summary">Automatically accept files smaller than&#8230;</string>
+    <string name="pref_notification_settings">Notification Settings</string>
+    <string name="pref_notifications">Notifications</string>
+    <string name="pref_notifications_summary">Notify when a new message arrives</string>
+    <string name="pref_vibrate">Vibrate</string>
+    <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
+    <string name="pref_sound">Sound</string>
+    <string name="pref_sound_summary">Play ringtone with notification</string>
+    <string name="pref_conference_notifications">Conference notifications</string>
+    <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</string>
+    <string name="pref_notification_grace_period">Notification grace period</string>
+    <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
+    <string name="pref_advanced_options">Advanced Options</string>
+    <string name="pref_never_send_crash">Never send crash reports</string>
+    <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
+    <string name="pref_confirm_messages">Confirm Messages</string>
+    <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
+    <string name="pref_ui_options">UI Options</string>
+    <string name="openpgp_error">OpenKeychain reported an error</string>
+    <string name="error_decrypting_file">I/O Error decrypting file</string>
+    <string name="accept">Accept</string>
+    <string name="error">An error has occurred</string>
+    <string name="pref_grant_presence_updates">Grant presence updates</string>
+    <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string>
+    <string name="subscriptions">Subscriptions</string>
+    <string name="your_account">Your account</string>
+    <string name="keys">Keys</string>
+    <string name="send_presence_updates">Send presence updates</string>
+    <string name="receive_presence_updates">Receive presence updates</string>
+    <string name="ask_for_presence_updates">Ask for presence updates</string>
+    <string name="attach_choose_picture">Choose picture</string>
+    <string name="attach_take_picture">Take picture</string>
+    <string name="preemptively_grant">Preemptively grant subscription request</string>
+    <string name="error_not_an_image_file">The file you selected is not an image</string>
+    <string name="error_compressing_image">Error while converting the image file</string>
+    <string name="error_file_not_found">File not found</string>
+    <string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string>
+    <string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string>
+    <string name="account_status_unknown">Unknown</string>
+    <string name="account_status_disabled">Temporarily disabled</string>
+    <string name="account_status_online">Online</string>
+    <string name="account_status_connecting">Connecting\u2026</string>
+    <string name="account_status_offline">Offline</string>
+    <string name="account_status_unauthorized">Unauthorized</string>
+    <string name="account_status_not_found">Server not found</string>
+    <string name="account_status_no_internet">No connectivity</string>
+    <string name="account_status_regis_fail">Registration failed</string>
+    <string name="account_status_regis_conflict">Username already in use</string>
+    <string name="account_status_regis_success">Registration completed</string>
+    <string name="account_status_regis_not_sup">Server does not support registration</string>
+    <string name="encryption_choice_none">Plain text</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="mgmt_account_edit">Edit account</string>
+    <string name="mgmt_account_delete">Delete account</string>
+    <string name="mgmt_account_disable">Temporarily disable</string>
+    <string name="mgmt_account_publish_avatar">Publish avatar</string>
+    <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>
+    <string name="mgmt_account_enable">Enable account</string>
+    <string name="mgmt_account_are_you_sure">Are you sure?</string>
+    <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
+    <string name="attach_record_voice">Record voice</string>
+    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_password">Password</string>
+    <string name="account_settings_example_jabber_id">username@example.com</string>
+    <string name="account_settings_confirm_password">Confirm password</string>
+    <string name="password">Password</string>
+    <string name="confirm_password">Confirm password</string>
+    <string name="passwords_do_not_match">Passwords do not match</string>
+    <string name="invalid_jid">This is not a valid Jabber ID</string>
+    <string name="error_out_of_memory">Out of memory. Image is too large</string>
+    <string name="add_phone_book_text">Do you want to add %s to your phones contact list?</string>
+    <string name="contact_status_online">online</string>
+    <string name="contact_status_free_to_chat">free to chat</string>
+    <string name="contact_status_away">away</string>
+    <string name="contact_status_extended_away">extended away</string>
+    <string name="contact_status_do_not_disturb">do not disturb</string>
+    <string name="contact_status_offline">offline</string>
+    <string name="muc_details_conference">Conference</string>
+    <string name="muc_details_other_members">Other Members</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+    <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+    <string name="server_info_available">available</string>
+    <string name="server_info_unavailable">unavailable</string>
+    <string name="missing_public_keys">Missing public key announcements</string>
+    <string name="last_seen_now">last seen just now</string>
+    <string name="last_seen_min">last seen 1 minute ago</string>
+    <string name="last_seen_mins">last seen %d minutes ago</string>
+    <string name="last_seen_hour">last seen 1 hour ago</string>
+    <string name="last_seen_hours">last seen %d hours ago</string>
+    <string name="last_seen_day">last seen 1 day ago</string>
+    <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="openpgp_messages_found">OpenPGP encrypted messages found</string>
+    <string name="reception_failed">Reception failed</string>
+    <string name="your_fingerprint">Your fingerprint</string>
+    <string name="otr_fingerprint">OTR fingerprint</string>
+    <string name="verify">Verify</string>
+    <string name="decrypt">Decrypt</string>
+    <string name="conferences">Conferences</string>
+    <string name="search">Search</string>
+    <string name="create_contact">Create Contact</string>
+    <string name="join_conference">Join Conference</string>
+    <string name="delete_contact">Delete Contact</string>
+    <string name="view_contact_details">View contact details</string>
+    <string name="create">Create</string>
+    <string name="contact_already_exists">The contact already exists</string>
+    <string name="join">Join</string>
+    <string name="conference_address">Conference address</string>
+    <string name="conference_address_example">room@conference.example.com</string>
+    <string name="save_as_bookmark">Save as bookmark</string>
+    <string name="delete_bookmark">Delete bookmark</string>
+    <string name="bookmark_already_exists">This bookmark already exists</string>
+    <string name="you">You</string>
+    <string name="action_edit_subject">Edit conference subject</string>
+    <string name="conference_not_found">Conference not found</string>
+    <string name="leave">Leave</string>
+    <string name="contact_added_you">Contact added you to contact list</string>
+    <string name="add_back">Add back</string>
+    <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
+    <string name="publish">Publish</string>
+    <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</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>
+    <string name="error_saving_avatar">Could not save avatar to disk</string>
+    <string name="or_long_press_for_default">(Or long press to bring back default)</string>
+    <string name="error_publish_avatar_no_server_support">Your server does not support the publication of avatars</string>
+    <string name="private_message">whispered</string>
+    <string name="private_message_to">to %s</string>
+    <string name="send_private_message_to">Send private message to %s</string>
+    <string name="connect">Connect</string>
+    <string name="account_already_exists">This account does already exist</string>
+    <string name="next">Next</string>
+    <string name="server_info_session_established">Current session established</string>
+    <string name="additional_information">Additional Information</string>
+    <string name="skip">Skip</string>
+    <string name="disable_notifications">Disable notifications</string>
+    <string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
+    <string name="notifications_disabled">Notifications are disabled</string>
+    <string name="enable">Enable</string>
+    <string name="conference_requires_password">Conference requires password</string>
+    <string name="enter_password">Enter password</string>
+    <string name="missing_presence_updates">Missing presence updates from contact</string>
+    <string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
+    <string name="request_now">Request now</string>
+    <string name="delete_fingerprint">Delete Fingerprint</string>
+    <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
+    <string name="ignore">Ignore</string>
+    <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
+    <string name="pref_encryption_settings">Encryption settings</string>
+    <string name="pref_force_encryption">Force end-to-end encryption</string>
+    <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
+    <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
+		<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+		<string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+		<string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
+		<string name="pref_expert_options">Expert options</string>
+    <string name="pref_expert_options_summary">Please be careful with these</string>
+    <string name="pref_use_larger_font">Increase font size</string>
+    <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
+    <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
+    <string name="pref_use_indicate_received">Request message receipts</string>
+    <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
+    <string name="pref_expert_options_other">Other</string>
+    <string name="pref_conference_name">Conference name</string>
+    <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
+    <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
+    <string name="conference_banned">You are banned from this conference</string>
+    <string name="conference_members_only">This conference is members only</string>
+    <string name="conference_kicked">You have been kicked from this conference</string>
+    <string name="using_account">using account %s</string>
+    <string name="checking_image">Checking image on HTTP host</string>
+    <string name="image_file_deleted">The image file has been deleted</string>
+    <string name="not_connected_try_again">You are not connected. Try again later</string>
+    <string name="check_image_filesize">Check image file size</string>
+
+</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
new file mode 100644
index 00000000..64bde770
--- /dev/null
+++ b/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="Divider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1.5dp</item>
+        <item name="android:background">@color/divider</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
new file mode 100644
index 00000000..fa7973d2
--- /dev/null
+++ b/src/main/res/values/themes.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+        <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
+        <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
+        <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+    </style>
+
+    <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
+
+    <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+        <item name="android:background">@color/primary</item>
+        <item name="android:backgroundStacked">@color/primarydark</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <item name="android:icon">@android:color/transparent</item>
+    </style>
+
+    <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
+        <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
+        <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
+    </style>
+
+    <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
+        <item name="android:background">@drawable/actionbar_tab_indicator</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
new file mode 100644
index 00000000..06ab7560
--- /dev/null
+++ b/src/main/res/xml/preferences.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <PreferenceCategory android:title="@string/pref_general" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="grant_new_contacts"
+            android:summary="@string/pref_grant_presence_updates_summary"
+            android:title="@string/pref_grant_presence_updates" />
+
+        <ListPreference
+            android:defaultValue="Mobile"
+            android:entries="@array/resources"
+            android:entryValues="@array/resources"
+            android:key="resource"
+            android:summary="@string/pref_xmpp_resource_summary"
+            android:title="@string/pref_xmpp_resource" />
+        <ListPreference
+            android:defaultValue="524288"
+            android:entries="@array/filesizes"
+            android:entryValues="@array/filesizes_values"
+            android:key="auto_accept_file_size"
+            android:summary="@string/pref_accept_files_summary"
+            android:title="@string/pref_accept_files" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="confirm_messages"
+            android:summary="@string/pref_confirm_messages_summary"
+            android:title="@string/pref_confirm_messages" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_notification_settings" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="show_notification"
+            android:summary="@string/pref_notifications_summary"
+            android:title="@string/pref_notifications" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:dependency="show_notification"
+            android:key="vibrate_on_notification"
+            android:summary="@string/pref_vibrate_summary"
+            android:title="@string/pref_vibrate" />
+
+        <RingtonePreference
+            android:defaultValue="content://settings/system/notification_sound"
+            android:dependency="show_notification"
+            android:key="notification_ringtone"
+            android:ringtoneType="notification"
+            android:summary="@string/pref_sound_summary"
+            android:title="@string/pref_sound" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:dependency="show_notification"
+            android:key="always_notify_in_conference"
+            android:summary="@string/pref_conference_notifications_summary"
+            android:title="@string/pref_conference_notifications" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_ui_options" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="use_subject"
+            android:summary="@string/pref_conference_name_summary"
+            android:title="@string/pref_conference_name" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="use_larger_font"
+            android:summary="@string/pref_use_larger_font_summary"
+            android:title="@string/pref_use_larger_font" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="send_button_status"
+            android:summary="@string/pref_use_send_button_to_indicate_status_summary"
+            android:title="@string/pref_use_send_button_to_indicate_status" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_advanced_options" >
+        <PreferenceScreen
+            android:summary="@string/pref_expert_options_summary"
+            android:title="@string/pref_expert_options" >
+            <PreferenceCategory android:title="@string/pref_encryption_settings" >
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="force_encryption"
+                    android:summary="@string/pref_force_encryption_summary"
+                    android:title="@string/pref_force_encryption" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="dont_save_encrypted"
+                    android:summary="@string/pref_dont_save_encrypted_summary"
+                    android:title="@string/pref_dont_save_encrypted" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="enable_legacy_ssl"
+                    android:summary="@string/pref_enable_legacy_ssl_summary"
+                    android:title="@string/pref_enable_legacy_ssl" />
+            </PreferenceCategory>
+            <PreferenceCategory android:title="@string/pref_expert_options_other" >
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="indicate_received"
+                    android:summary="@string/pref_use_indicate_received_summary"
+                    android:title="@string/pref_use_indicate_received" />
+            </PreferenceCategory>
+        </PreferenceScreen>
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="never_send"
+            android:summary="@string/pref_never_send_crash_summary"
+            android:title="@string/pref_never_send_crash" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
-- 
cgit v1.2.3