Merge branch 'next-gen' into develop
Conflicts: app/src/main/AndroidManifest.xml app/src/main/res/values-es/about_viewer.xml app/src/main/res/values-es/account_editor.xml app/src/main/res/values-es/change_log.xml app/src/main/res/values-es/chat_viewer.xml app/src/main/res/values-es/contact_editor.xml app/src/main/res/values-es/contact_list.xml app/src/main/res/values-es/market.xml app/src/main/res/values-es/notification_bar.xml app/src/main/res/values-es/phrase_editor.xml app/src/main/res/values-es/preference_editor.xml app/src/main/res/values-es/status_editor.xml app/src/main/res/values-fr/about_viewer.xml app/src/main/res/values-fr/account_editor.xml app/src/main/res/values-fr/change_log.xml app/src/main/res/values-fr/chat_viewer.xml app/src/main/res/values-fr/contact_editor.xml app/src/main/res/values-fr/contact_viewer.xml app/src/main/res/values-fr/market.xml app/src/main/res/values-fr/phrase_editor.xml app/src/main/res/values-it/about_viewer.xml app/src/main/res/values-it/account_list.xml app/src/main/res/values-it/contact_editor.xml app/src/main/res/values-it/contact_list.xml app/src/main/res/values-it/contact_viewer.xml app/src/main/res/values-it/secret_viewer.xml app/src/main/res/values-it/status_editor.xml app/src/main/res/values-it/words.xml app/src/main/res/values-ja/about_viewer.xml app/src/main/res/values-ja/account_editor.xml app/src/main/res/values-ja/account_list.xml app/src/main/res/values-ja/chat_viewer.xml app/src/main/res/values-ja/contact_editor.xml app/src/main/res/values-ja/contact_list.xml app/src/main/res/values-ja/contact_viewer.xml app/src/main/res/values-ja/fingerprint_viewer.xml app/src/main/res/values-ja/market.xml app/src/main/res/values-ja/muc_editor.xml app/src/main/res/values-ja/notification_bar.xml app/src/main/res/values-ja/phrase_editor.xml app/src/main/res/values-ja/preference_editor.xml app/src/main/res/values-ja/secret_viewer.xml app/src/main/res/values-ja/status_editor.xml app/src/main/res/values-ja/words.xml app/src/main/res/values-nl/about_viewer.xml app/src/main/res/values-nl/account_editor.xml app/src/main/res/values-nl/change_log.xml app/src/main/res/values-nl/chat_viewer.xml app/src/main/res/values-nl/contact_editor.xml app/src/main/res/values-nl/market.xml app/src/main/res/values-nl/phrase_editor.xml app/src/main/res/values-nl/preference_editor.xml app/src/main/res/values-nl/status_editor.xml app/src/main/res/values-ru/chat_viewer.xml app/src/main/res/values-sk/about_viewer.xml app/src/main/res/values-sk/account_editor.xml app/src/main/res/values-sk/change_log.xml app/src/main/res/values-sk/chat_viewer.xml app/src/main/res/values-sk/contact_editor.xml app/src/main/res/values-sk/market.xml app/src/main/res/values-sk/phrase_editor.xml app/src/main/res/values-sv-rSE/about_viewer.xml app/src/main/res/values-sv-rSE/account_list.xml app/src/main/res/values-sv-rSE/contact_editor.xml app/src/main/res/values-sv-rSE/contact_viewer.xml app/src/main/res/values-sv-rSE/muc_editor.xml app/src/main/res/values-zh-rCN/about_viewer.xml app/src/main/res/values-zh-rCN/account_editor.xml app/src/main/res/values-zh-rCN/account_list.xml app/src/main/res/values-zh-rCN/chat_viewer.xml app/src/main/res/values-zh-rCN/contact_editor.xml app/src/main/res/values-zh-rCN/contact_list.xml app/src/main/res/values-zh-rCN/contact_viewer.xml app/src/main/res/values-zh-rCN/muc_editor.xml app/src/main/res/values-zh-rCN/notification_bar.xml app/src/main/res/values-zh-rCN/secret_viewer.xml app/src/main/res/values-zh-rCN/status_editor.xml app/src/main/res/values-zh-rCN/words.xml app/src/main/res/values-zh-rTW/account_editor.xml app/src/main/res/values-zh-rTW/account_list.xml app/src/main/res/values-zh-rTW/chat_viewer.xml app/src/main/res/values-zh-rTW/contact_editor.xml app/src/main/res/values-zh-rTW/contact_list.xml app/src/main/res/values-zh-rTW/notification_bar.xml app/src/main/res/values-zh-rTW/secret_viewer.xml app/src/main/res/values-zh-rTW/status_editor.xml app/src/main/res/values-zh-rTW/words.xml app/src/main/res/values/connections.xml app/src/main/res/values/versions.xml
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment