diff options
Diffstat (limited to 'res')
143 files changed, 1189 insertions, 618 deletions
diff --git a/res/drawable-hdpi/ic_action_add.png b/res/drawable-hdpi/ic_action_add.png Binary files differdeleted file mode 100644 index aa7cf4f2..00000000 --- a/res/drawable-hdpi/ic_action_add.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_add_group.png b/res/drawable-hdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 00000000..97640355 --- /dev/null +++ b/res/drawable-hdpi/ic_action_add_group.png diff --git a/res/drawable-hdpi/ic_action_add_person.png b/res/drawable-hdpi/ic_action_add_person.png Binary files differindex 5ebac970..9d88d0f4 100644 --- a/res/drawable-hdpi/ic_action_add_person.png +++ b/res/drawable-hdpi/ic_action_add_person.png diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png Binary files differdeleted file mode 100644 index e9ce89e0..00000000 --- a/res/drawable-hdpi/ic_action_delete.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_discard.png b/res/drawable-hdpi/ic_action_discard.png Binary files differindex 9c717dd3..703b31f8 100644 --- a/res/drawable-hdpi/ic_action_discard.png +++ b/res/drawable-hdpi/ic_action_discard.png diff --git a/res/drawable-hdpi/ic_action_edit.png b/res/drawable-hdpi/ic_action_edit.png Binary files differindex 5f7c6eff..756db316 100644 --- a/res/drawable-hdpi/ic_action_edit.png +++ b/res/drawable-hdpi/ic_action_edit.png diff --git a/res/drawable-hdpi/ic_action_edit_dark.png b/res/drawable-hdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..5f7c6eff --- /dev/null +++ b/res/drawable-hdpi/ic_action_edit_dark.png diff --git a/res/drawable-hdpi/ic_action_group.png b/res/drawable-hdpi/ic_action_group.png Binary files differindex 271980b9..3e7f16d5 100644 --- a/res/drawable-hdpi/ic_action_group.png +++ b/res/drawable-hdpi/ic_action_group.png diff --git a/res/drawable-hdpi/ic_action_new.png b/res/drawable-hdpi/ic_action_new.png Binary files differnew file mode 100644 index 00000000..d866d616 --- /dev/null +++ b/res/drawable-hdpi/ic_action_new.png diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/res/drawable-hdpi/ic_action_new_attachment.png Binary files differindex 28507da2..c01c2b38 100644 --- a/res/drawable-hdpi/ic_action_new_attachment.png +++ b/res/drawable-hdpi/ic_action_new_attachment.png diff --git a/res/drawable-hdpi/ic_action_not_secure.png b/res/drawable-hdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 00000000..2c917615 --- /dev/null +++ b/res/drawable-hdpi/ic_action_not_secure.png diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png Binary files differdeleted file mode 100644 index 9fd81097..00000000 --- a/res/drawable-hdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png Binary files differindex f594b4e4..772e3598 100644 --- a/res/drawable-hdpi/ic_action_search.png +++ b/res/drawable-hdpi/ic_action_search.png diff --git a/res/drawable-hdpi/ic_action_secure.png b/res/drawable-hdpi/ic_action_secure.png Binary files differindex 287ae2fb..4439d1ae 100644 --- a/res/drawable-hdpi/ic_action_secure.png +++ b/res/drawable-hdpi/ic_action_secure.png diff --git a/res/drawable-hdpi/ic_action_send.png b/res/drawable-hdpi/ic_action_send.png Binary files differdeleted file mode 100644 index 6384a4ee..00000000 --- a/res/drawable-hdpi/ic_action_send.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_unsecure.png b/res/drawable-hdpi/ic_action_unsecure.png Binary files differdeleted file mode 100644 index b9f442d5..00000000 --- a/res/drawable-hdpi/ic_action_unsecure.png +++ /dev/null diff --git a/res/drawable-hdpi/tab_selected_conversations.9.png b/res/drawable-hdpi/tab_selected_conversations.9.png Binary files differnew file mode 100644 index 00000000..b8f44c21 --- /dev/null +++ b/res/drawable-hdpi/tab_selected_conversations.9.png diff --git a/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/res/drawable-hdpi/tab_selected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..5512dbd3 --- /dev/null +++ b/res/drawable-hdpi/tab_selected_focused_conversations.9.png diff --git a/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/res/drawable-hdpi/tab_selected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..e5f1df22 --- /dev/null +++ b/res/drawable-hdpi/tab_selected_pressed_conversations.9.png diff --git a/res/drawable-hdpi/tab_unselected_conversations.9.png b/res/drawable-hdpi/tab_unselected_conversations.9.png Binary files differnew file mode 100644 index 00000000..7cd46d63 --- /dev/null +++ b/res/drawable-hdpi/tab_unselected_conversations.9.png diff --git a/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/res/drawable-hdpi/tab_unselected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..438ecdd8 --- /dev/null +++ b/res/drawable-hdpi/tab_unselected_focused_conversations.9.png diff --git a/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..4f18a95a --- /dev/null +++ b/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png diff --git a/res/drawable-mdpi/ic_action_add.png b/res/drawable-mdpi/ic_action_add.png Binary files differdeleted file mode 100644 index 99b189a0..00000000 --- a/res/drawable-mdpi/ic_action_add.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_add_group.png b/res/drawable-mdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 00000000..9a655899 --- /dev/null +++ b/res/drawable-mdpi/ic_action_add_group.png diff --git a/res/drawable-mdpi/ic_action_add_person.png b/res/drawable-mdpi/ic_action_add_person.png Binary files differindex c43cf655..b7d8f46a 100644 --- a/res/drawable-mdpi/ic_action_add_person.png +++ b/res/drawable-mdpi/ic_action_add_person.png diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png Binary files differdeleted file mode 100644 index cedb1085..00000000 --- a/res/drawable-mdpi/ic_action_delete.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_discard.png b/res/drawable-mdpi/ic_action_discard.png Binary files differindex 9dfb7cc2..248fb09c 100644 --- a/res/drawable-mdpi/ic_action_discard.png +++ b/res/drawable-mdpi/ic_action_discard.png diff --git a/res/drawable-mdpi/ic_action_edit.png b/res/drawable-mdpi/ic_action_edit.png Binary files differindex 650b4d89..68a45320 100644 --- a/res/drawable-mdpi/ic_action_edit.png +++ b/res/drawable-mdpi/ic_action_edit.png diff --git a/res/drawable-mdpi/ic_action_edit_dark.png b/res/drawable-mdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..650b4d89 --- /dev/null +++ b/res/drawable-mdpi/ic_action_edit_dark.png diff --git a/res/drawable-mdpi/ic_action_group.png b/res/drawable-mdpi/ic_action_group.png Binary files differindex 06dbeecd..1ee3cccd 100644 --- a/res/drawable-mdpi/ic_action_group.png +++ b/res/drawable-mdpi/ic_action_group.png diff --git a/res/drawable-mdpi/ic_action_new.png b/res/drawable-mdpi/ic_action_new.png Binary files differnew file mode 100644 index 00000000..f17e7980 --- /dev/null +++ b/res/drawable-mdpi/ic_action_new.png diff --git a/res/drawable-mdpi/ic_action_new_attachment.png b/res/drawable-mdpi/ic_action_new_attachment.png Binary files differindex 33058655..1d265aac 100644 --- a/res/drawable-mdpi/ic_action_new_attachment.png +++ b/res/drawable-mdpi/ic_action_new_attachment.png diff --git a/res/drawable-mdpi/ic_action_not_secure.png b/res/drawable-mdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 00000000..faffa233 --- /dev/null +++ b/res/drawable-mdpi/ic_action_not_secure.png diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png Binary files differdeleted file mode 100644 index 359da1c1..00000000 --- a/res/drawable-mdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png Binary files differindex 2e446ec0..4edb1ff9 100644 --- a/res/drawable-mdpi/ic_action_search.png +++ b/res/drawable-mdpi/ic_action_search.png diff --git a/res/drawable-mdpi/ic_action_secure.png b/res/drawable-mdpi/ic_action_secure.png Binary files differindex d4921723..05332ebf 100644 --- a/res/drawable-mdpi/ic_action_secure.png +++ b/res/drawable-mdpi/ic_action_secure.png diff --git a/res/drawable-mdpi/ic_action_send.png b/res/drawable-mdpi/ic_action_send.png Binary files differdeleted file mode 100644 index 4552ae6d..00000000 --- a/res/drawable-mdpi/ic_action_send.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_unsecure.png b/res/drawable-mdpi/ic_action_unsecure.png Binary files differdeleted file mode 100644 index 84072abd..00000000 --- a/res/drawable-mdpi/ic_action_unsecure.png +++ /dev/null diff --git a/res/drawable-mdpi/tab_selected_conversations.9.png b/res/drawable-mdpi/tab_selected_conversations.9.png Binary files differnew file mode 100644 index 00000000..09d42dc8 --- /dev/null +++ b/res/drawable-mdpi/tab_selected_conversations.9.png diff --git a/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/res/drawable-mdpi/tab_selected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..20af01de --- /dev/null +++ b/res/drawable-mdpi/tab_selected_focused_conversations.9.png diff --git a/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/res/drawable-mdpi/tab_selected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..13a878be --- /dev/null +++ b/res/drawable-mdpi/tab_selected_pressed_conversations.9.png diff --git a/res/drawable-mdpi/tab_unselected_conversations.9.png b/res/drawable-mdpi/tab_unselected_conversations.9.png Binary files differnew file mode 100644 index 00000000..ad2dbae9 --- /dev/null +++ b/res/drawable-mdpi/tab_unselected_conversations.9.png diff --git a/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/res/drawable-mdpi/tab_unselected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..dfff5ac8 --- /dev/null +++ b/res/drawable-mdpi/tab_unselected_focused_conversations.9.png diff --git a/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..4365d178 --- /dev/null +++ b/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png diff --git a/res/drawable-xhdpi/ic_action_add.png b/res/drawable-xhdpi/ic_action_add.png Binary files differdeleted file mode 100644 index 9d6af042..00000000 --- a/res/drawable-xhdpi/ic_action_add.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_add_group.png b/res/drawable-xhdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 00000000..c493aa5a --- /dev/null +++ b/res/drawable-xhdpi/ic_action_add_group.png diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/res/drawable-xhdpi/ic_action_add_person.png Binary files differindex 91434a47..4e8de1b6 100644 --- a/res/drawable-xhdpi/ic_action_add_person.png +++ b/res/drawable-xhdpi/ic_action_add_person.png diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png Binary files differdeleted file mode 100644 index 98c73da1..00000000 --- a/res/drawable-xhdpi/ic_action_delete.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_discard.png b/res/drawable-xhdpi/ic_action_discard.png Binary files differindex db69d6c2..9eeeed12 100644 --- a/res/drawable-xhdpi/ic_action_discard.png +++ b/res/drawable-xhdpi/ic_action_discard.png diff --git a/res/drawable-xhdpi/ic_action_edit.png b/res/drawable-xhdpi/ic_action_edit.png Binary files differindex 8ab436d8..67e056fe 100644 --- a/res/drawable-xhdpi/ic_action_edit.png +++ b/res/drawable-xhdpi/ic_action_edit.png diff --git a/res/drawable-xhdpi/ic_action_edit_dark.png b/res/drawable-xhdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..8ab436d8 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_edit_dark.png diff --git a/res/drawable-xhdpi/ic_action_group.png b/res/drawable-xhdpi/ic_action_group.png Binary files differindex ea3f24e7..fa2af497 100644 --- a/res/drawable-xhdpi/ic_action_group.png +++ b/res/drawable-xhdpi/ic_action_group.png diff --git a/res/drawable-xhdpi/ic_action_new.png b/res/drawable-xhdpi/ic_action_new.png Binary files differnew file mode 100644 index 00000000..dde2141f --- /dev/null +++ b/res/drawable-xhdpi/ic_action_new.png diff --git a/res/drawable-xhdpi/ic_action_new_attachment.png b/res/drawable-xhdpi/ic_action_new_attachment.png Binary files differindex 4948feec..41cbab20 100644 --- a/res/drawable-xhdpi/ic_action_new_attachment.png +++ b/res/drawable-xhdpi/ic_action_new_attachment.png diff --git a/res/drawable-xhdpi/ic_action_not_secure.png b/res/drawable-xhdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 00000000..c0902a03 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_not_secure.png diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png Binary files differdeleted file mode 100644 index 03eeb8d6..00000000 --- a/res/drawable-xhdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png Binary files differindex aad535e9..19658e4a 100644 --- a/res/drawable-xhdpi/ic_action_search.png +++ b/res/drawable-xhdpi/ic_action_search.png diff --git a/res/drawable-xhdpi/ic_action_secure.png b/res/drawable-xhdpi/ic_action_secure.png Binary files differindex 2a089838..4e08b95a 100644 --- a/res/drawable-xhdpi/ic_action_secure.png +++ b/res/drawable-xhdpi/ic_action_secure.png diff --git a/res/drawable-xhdpi/ic_action_send.png b/res/drawable-xhdpi/ic_action_send.png Binary files differdeleted file mode 100644 index 652ac68d..00000000 --- a/res/drawable-xhdpi/ic_action_send.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_unsecure.png b/res/drawable-xhdpi/ic_action_unsecure.png Binary files differdeleted file mode 100644 index 96b128f2..00000000 --- a/res/drawable-xhdpi/ic_action_unsecure.png +++ /dev/null diff --git a/res/drawable-xhdpi/tab_selected_conversations.9.png b/res/drawable-xhdpi/tab_selected_conversations.9.png Binary files differnew file mode 100644 index 00000000..34eb4ec0 --- /dev/null +++ b/res/drawable-xhdpi/tab_selected_conversations.9.png diff --git a/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/res/drawable-xhdpi/tab_selected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..3155ef69 --- /dev/null +++ b/res/drawable-xhdpi/tab_selected_focused_conversations.9.png diff --git a/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..5c2440e4 --- /dev/null +++ b/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png diff --git a/res/drawable-xhdpi/tab_unselected_conversations.9.png b/res/drawable-xhdpi/tab_unselected_conversations.9.png Binary files differnew file mode 100644 index 00000000..e9ab742e --- /dev/null +++ b/res/drawable-xhdpi/tab_unselected_conversations.9.png diff --git a/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..42a2191e --- /dev/null +++ b/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png diff --git a/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..a5a2c25e --- /dev/null +++ b/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png diff --git a/res/drawable-xxhdpi/ic_action_add_group.png b/res/drawable-xxhdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 00000000..2b46dbb9 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_add_group.png diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png Binary files differindex f18aa614..e9a58eaf 100644 --- a/res/drawable-xxhdpi/ic_action_add_person.png +++ b/res/drawable-xxhdpi/ic_action_add_person.png diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/res/drawable-xxhdpi/ic_action_discard.png Binary files differindex b522daff..cb1260a4 100644 --- a/res/drawable-xxhdpi/ic_action_discard.png +++ b/res/drawable-xxhdpi/ic_action_discard.png diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/res/drawable-xxhdpi/ic_action_edit.png Binary files differindex f2b2078b..3a241ea4 100644 --- a/res/drawable-xxhdpi/ic_action_edit.png +++ b/res/drawable-xxhdpi/ic_action_edit.png diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/res/drawable-xxhdpi/ic_action_edit_dark.png Binary files differnew file mode 100644 index 00000000..f2b2078b --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_edit_dark.png diff --git a/res/drawable-xxhdpi/ic_action_group.png b/res/drawable-xxhdpi/ic_action_group.png Binary files differindex 6ef9b128..9289b1c8 100644 --- a/res/drawable-xxhdpi/ic_action_group.png +++ b/res/drawable-xxhdpi/ic_action_group.png diff --git a/res/drawable-xxhdpi/ic_action_new.png b/res/drawable-xxhdpi/ic_action_new.png Binary files differnew file mode 100644 index 00000000..c42c2bfb --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_new.png diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/res/drawable-xxhdpi/ic_action_new_attachment.png Binary files differindex 78553886..ce7536cb 100644 --- a/res/drawable-xxhdpi/ic_action_new_attachment.png +++ b/res/drawable-xxhdpi/ic_action_new_attachment.png diff --git a/res/drawable-xxhdpi/ic_action_not_secure.png b/res/drawable-xxhdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 00000000..a186f1fb --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_not_secure.png diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png Binary files differdeleted file mode 100644 index fd1bcdd4..00000000 --- a/res/drawable-xxhdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png Binary files differindex 9c0ea3ca..a1086388 100644 --- a/res/drawable-xxhdpi/ic_action_search.png +++ b/res/drawable-xxhdpi/ic_action_search.png diff --git a/res/drawable-xxhdpi/ic_action_secure.png b/res/drawable-xxhdpi/ic_action_secure.png Binary files differindex d8c094ed..ccf1fb00 100644 --- a/res/drawable-xxhdpi/ic_action_secure.png +++ b/res/drawable-xxhdpi/ic_action_secure.png diff --git a/res/drawable-xxhdpi/tab_selected_conversations.9.png b/res/drawable-xxhdpi/tab_selected_conversations.9.png Binary files differnew file mode 100644 index 00000000..e4439e7c --- /dev/null +++ b/res/drawable-xxhdpi/tab_selected_conversations.9.png diff --git a/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..dd2ded89 --- /dev/null +++ b/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png diff --git a/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..58c8a576 --- /dev/null +++ b/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png diff --git a/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/res/drawable-xxhdpi/tab_unselected_conversations.9.png Binary files differnew file mode 100644 index 00000000..566062f0 --- /dev/null +++ b/res/drawable-xxhdpi/tab_unselected_conversations.9.png diff --git a/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png Binary files differnew file mode 100644 index 00000000..432e68c4 --- /dev/null +++ b/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png diff --git a/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png Binary files differnew file mode 100644 index 00000000..8dd01d5c --- /dev/null +++ b/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png diff --git a/res/drawable/actionbar_tab_indicator.xml b/res/drawable/actionbar_tab_indicator.xml new file mode 100644 index 00000000..102b75d8 --- /dev/null +++ b/res/drawable/actionbar_tab_indicator.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Non focused states --> + <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@android:color/transparent" /> + <item android:state_focused="false" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_conversations" /> + + <!-- Focused states --> + <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_focused_conversations" /> + <item android:state_focused="true" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_conversations" /> + + <!-- Pressed --> + <!-- Non focused states --> + <item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_conversations" /> + <item android:state_focused="false" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" /> + + <!-- Focused states --> + <item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_conversations" /> + <item android:state_focused="true" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" /> + </selector>
\ No newline at end of file diff --git a/res/drawable/blue.xml b/res/drawable/blue.xml deleted file mode 100644 index 5692154a..00000000 --- a/res/drawable/blue.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#FF1da9da" /> -</shape>
\ No newline at end of file diff --git a/res/drawable/bluebackground.xml b/res/drawable/bluebackground.xml deleted file mode 100644 index fbf6d317..00000000 --- a/res/drawable/bluebackground.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android" > - <item - android:state_pressed="false" - android:drawable="@drawable/blue" /> - <item - android:state_pressed="true" - android:drawable="@drawable/darkblue" /> -</selector> diff --git a/res/drawable/darkblue.xml b/res/drawable/darkblue.xml deleted file mode 100644 index b33c38ce..00000000 --- a/res/drawable/darkblue.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#FF0099cc" /> -</shape>
\ No newline at end of file diff --git a/res/drawable/darkred.xml b/res/drawable/darkred.xml deleted file mode 100644 index 1313cc2f..00000000 --- a/res/drawable/darkred.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#ffcc0000" /> -</shape>
\ No newline at end of file diff --git a/res/drawable/es_slidingpane_shadow.xml b/res/drawable/es_slidingpane_shadow.xml index 8c2cefc2..5b6037f7 100644 --- a/res/drawable/es_slidingpane_shadow.xml +++ b/res/drawable/es_slidingpane_shadow.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" > <gradient - android:endColor="#cccccc" - android:startColor="#00000000" /> + android:endColor="@color/divider" + android:startColor="@android:color/transparent" /> <size android:width="3.0dp" android:height="0.5dp" /> </shape>
\ No newline at end of file diff --git a/res/drawable/message_border.xml b/res/drawable/message_border.xml index 1477fbe8..4a581e7d 100644 --- a/res/drawable/message_border.xml +++ b/res/drawable/message_border.xml @@ -2,5 +2,5 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <corners android:radius="2dp"/> <padding android:left="1.5dp" android:right="1.5dp" android:top="1.5dp" android:bottom="1.5dp"/> - <solid android:color="#cecece"/> + <solid android:color="@color/divider"/> </shape>
\ No newline at end of file diff --git a/res/drawable/red.xml b/res/drawable/red.xml deleted file mode 100644 index abdc07d6..00000000 --- a/res/drawable/red.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#FFe92727" /> -</shape>
\ No newline at end of file diff --git a/res/drawable/redbackground.xml b/res/drawable/redbackground.xml deleted file mode 100644 index ddca66f4..00000000 --- a/res/drawable/redbackground.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android" > - <item - android:state_pressed="false" - android:drawable="@drawable/red" /> - <item - android:state_pressed="true" - android:drawable="@drawable/darkred" /> -</selector> diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml index 25f148ce..e4cb9742 100644 --- a/res/drawable/section_header.xml +++ b/res/drawable/section_header.xml @@ -4,7 +4,7 @@ <size android:height="1.5dp" - android:width="1000dp" /> + android:width="2000dp" /> - <solid android:color="#b7b7b7" /> + <solid android:color="@color/divider" /> </shape>
\ No newline at end of file diff --git a/res/drawable/snackbar.xml b/res/drawable/snackbar.xml new file mode 100644 index 00000000..5f5dc430 --- /dev/null +++ b/res/drawable/snackbar.xml @@ -0,0 +1,6 @@ +<?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:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" /> +</shape>
\ No newline at end of file diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-sw360dp/fragment_conversations_overview.xml index 939950c2..ceb3b5fa 100644 --- a/res/layout-sw360dp/fragment_conversations_overview.xml +++ b/res/layout-sw360dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="324dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > <ListView android:id="@+id/list" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="#b5b5b5" + android:divider="@color/divider" android:dividerHeight="1dp" - android:background="#eeeeee" + android:background="@color/primarybackground" /> </LinearLayout> @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> </LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-sw384dp/fragment_conversations_overview.xml index e48cf9ec..26d79d23 100644 --- a/res/layout-sw384dp/fragment_conversations_overview.xml +++ b/res/layout-sw384dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="345dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > <ListView android:id="@+id/list" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="#b5b5b5" + android:divider="@color/divider" android:dividerHeight="1dp" - android:background="#eeeeee" + android:background="@color/primarybackground" /> </LinearLayout> @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> </LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-sw600dp/fragment_conversations_overview.xml index fac95f9c..f26c840b 100644 --- a/res/layout-sw600dp/fragment_conversations_overview.xml +++ b/res/layout-sw600dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="240dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > <ListView android:id="@+id/list" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="#b5b5b5" + android:divider="@color/divider" android:dividerHeight="1dp" - android:background="#eeeeee" + android:background="@color/primarybackground" /> </LinearLayout> @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> </LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-sw720dp/fragment_conversations_overview.xml index fcb1949c..b85f1116 100644 --- a/res/layout-sw720dp/fragment_conversations_overview.xml +++ b/res/layout-sw720dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="288dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > <ListView android:id="@+id/list" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="#b5b5b5" + android:divider="@color/divider" android:dividerHeight="1dp" - android:background="#eeeeee" + android:background="@color/primarybackground" /> </LinearLayout> @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> </LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 6cfbe9e3..0c18d9b2 100644 --- a/res/layout/account_row.xml +++ b/res/layout/account_row.xml @@ -19,7 +19,8 @@ android:id="@+id/account_jid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20sp" + android:textSize="18sp" + android:textColor="@color/primarytext" android:singleLine="true" android:scrollHorizontally="false"/> @@ -35,17 +36,17 @@ android:layout_height="wrap_content" android:text="@string/account_status" android:textStyle="bold" - android:textSize="16sp" /> + android:textSize="14sp" + android:textColor="@color/primarytext"/> <TextView android:id="@+id/account_status" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="4dp" - android:textColor="#669900" android:text="@string/account_status_unknown" android:textStyle="bold" - android:textSize="16sp"/> + android:textSize="14sp"/> </LinearLayout> diff --git a/res/layout/actionview_search.xml b/res/layout/actionview_search.xml new file mode 100644 index 00000000..70300913 --- /dev/null +++ b/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/res/layout/activity_choose_contact.xml b/res/layout/activity_choose_contact.xml new file mode 100644 index 00000000..248a7822 --- /dev/null +++ b/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/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index 5eecfa87..8f0b42c1 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -2,7 +2,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#e5e5e5"> + android:background="@color/primarybackground"> <LinearLayout android:layout_width="match_parent" @@ -14,7 +14,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:text="@string/action_contact_details" /> + android:text="@string/action_contact_details" + android:textColor="@color/primarytext"/> <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,15 +44,16 @@ android:layout_height="wrap_content" android:paddingLeft="8dp" android:singleLine="true" - android:textColor="#5b5b5b" - android:textSize="18sp" /> + android:textSize="14sp" + android:textColor="@color/primarytext"/> <TextView android:id="@+id/details_contactstatus" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="16dp" - android:textSize="24sp" + android:textSize="18sp" + android:textColor="@color/primarytext" android:textStyle="bold" /> <TextView android:id="@+id/details_lastseen" @@ -59,8 +61,8 @@ android:layout_height="wrap_content" android:paddingLeft="8dp" android:singleLine="true" - android:textColor="#5b5b5b" - android:textSize="14sp" /> + android:textSize="14sp" + android:textColor="@color/primarytext"/> </LinearLayout> </RelativeLayout> @@ -71,48 +73,38 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:text="@string/your_account" /> + android:text="@string/your_account" + android:textColor="@color/primarytext"/> <TextView android:id="@+id/details_account" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:textSize="18sp" - android:textColor="#5b5b5b" /> + android:textSize="14sp" + android:textColor="@color/primarytext" /> <TextView style="@style/sectionHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:text="@string/subscriptions" /> + android:text="@string/subscriptions" + android:textColor="@color/primarytext"/> <CheckBox android:id="@+id/details_send_presence" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/send_presence_updates" - android:textSize="18sp" - android:textColor="#5b5b5b" /> + android:textSize="14sp" + android:textColor="@color/primarytext" /> <CheckBox android:id="@+id/details_receive_presence" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/receive_presence_updates" - android:textSize="18sp" - android:textColor="#5b5b5b" /> - - <TextView - android:id="@+id/ask_again" - android:paddingTop="8dp" - android:paddingLeft="32dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ask_again" - android:textColor="#33B5E5" - android:textSize="18sp" - android:visibility="gone" - /> + android:textSize="14sp" + android:textColor="@color/primarytext" /> <TextView style="@style/sectionHeader" android:layout_width="wrap_content" diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index f866a485..49b4cef3 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -2,144 +2,126 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#e5e5e5"> - -<LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" > - <TextView - style="@style/sectionHeader" + android:background="@color/primarybackground" > + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="8dp" - android:text="@string/muc_details_conference" /> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#eee" > - + android:orientation="vertical" > - <EditText - android:id="@+id/muc_subject" + <TextView + style="@style/sectionHeader" android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/muc_edit_subject" - android:background="#eee" - android:ems="10" - android:hint="@string/muc_details_conference_subject" - android:inputType="textAutoComplete" - android:paddingBottom="12dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="12dp" /> - - <ImageButton - android:id="@+id/muc_edit_subject" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:layout_height="wrap_content" android:padding="8dp" - android:src="@drawable/ic_action_edit" /> - </RelativeLayout> - <TextView - android:id="@+id/muc_jabberid" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:singleLine="true" - android:textColor="#5b5b5b" - android:textSize="18sp"/> + android:text="@string/muc_details_conference" /> - <TextView - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:text="@string/muc_details_your_nickname" /> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#eee" > - + <TextView + android:id="@+id/muc_jabberid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="8dp" + android:singleLine="true" + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primarytext" + android:textSize="14sp"/> - <EditText - android:id="@+id/muc_your_nick" + <TextView + style="@style/sectionHeader" android:layout_width="wrap_content" - android:layout_height="48dp" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/muc_edit_nick" - android:background="#eee" - android:ems="10" - android:hint="@string/muc_details_your_nickname" - android:inputType="textEmailAddress" - android:paddingBottom="12dp" + android:layout_height="wrap_content" android:paddingLeft="8dp" android:paddingRight="8dp" - android:paddingTop="12dp" /> - - <ImageButton - android:id="@+id/muc_edit_nick" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:paddingTop="8dp" + android:text="@string/you" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" android:padding="8dp" - android:src="@drawable/ic_action_edit" /> - </RelativeLayout> - <TextView - android:id="@+id/muc_role" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:singleLine="true" - android:textSize="18sp" - android:textColor="#5b5b5b"/> - - <LinearLayout - android:id="@+id/muc_more_details" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <TextView - android:id="@+id/muc_participants_header" - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:text="@string/muc_details_other_members" /> + android:paddingBottom="8dp" > - <LinearLayout - android:id="@+id/muc_members" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1" - android:orientation="vertical" - android:divider="?android:dividerHorizontal" - android:showDividers="middle" - > - </LinearLayout> + <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="18sp" /> + + <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="14sp" /> + </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:src="@drawable/ic_action_edit_dark" + android:padding="8dp"/> + + </RelativeLayout> + + <LinearLayout + android:id="@+id/muc_more_details" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/muc_participants_header" + style="@style/sectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="8dp" + android:text="@string/muc_details_other_members" /> + + <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> + </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> - <Button - android:layout_marginTop="24dp" - android:id="@+id/invite" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/invite_contacts" - android:layout_gravity="center_horizontal"/> -</LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml deleted file mode 100644 index 78500ead..00000000 --- a/res/layout/activity_new_conversation.xml +++ /dev/null @@ -1,56 +0,0 @@ -<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="#e5e5e5" > - - - <ProgressBar - android:id="@+id/progressBar1" - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:visibility="gone" - /> - - <EditText - android:id="@+id/new_conversation_search" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:background="#eee" - android:ems="10" - android:hint="@string/search_jabber_id" - android:inputType="textEmailAddress" - android:paddingBottom="12dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="12dp" /> - - <TextView - android:id="@+id/contacts_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Contacts" - style="@style/sectionHeader" - android:layout_below="@+id/new_conversation_search" - android:paddingLeft="8dp" - android:paddingTop="8dp" - android:paddingRight="8dp"/> - - <ListView - android:id="@+id/contactList" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/contacts_header" - tools:listitem="@layout/contact" - android:choiceMode="multipleChoice"> - - </ListView> -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml new file mode 100644 index 00000000..9c757540 --- /dev/null +++ b/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/res/layout/cert_warning.xml b/res/layout/cert_warning.xml index 59d71803..fffe3266 100644 --- a/res/layout/cert_warning.xml +++ b/res/layout/cert_warning.xml @@ -9,14 +9,14 @@ android:id="@+id/hint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="18sp"/> + android:textSize="14sp"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFe92727" android:textStyle="bold" - android:textSize="18sp" + android:textSize="14sp" android:text="Do not connect unless you know exactly what you are doing" android:paddingTop="8dp" android:paddingBottom="8dp"/> @@ -24,7 +24,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="18sp" + android:textSize="14sp" android:text="The SHA1 fingerprint is:" /> <TextView @@ -36,6 +36,6 @@ android:layout_height="wrap_content" android:typeface="monospace" android:textStyle="bold" - android:textSize="20sp"/> + android:textSize="18sp"/> </LinearLayout> diff --git a/res/layout/contact.xml b/res/layout/contact.xml index 7303d2ba..8432c7a3 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -25,22 +25,23 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp" - android:textColor="#5b5b5b" + android:textColor="@color/primarytext" android:singleLine="true" /> <TextView android:id="@+id/contact_jid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#5b5b5b" android:singleLine="true" + android:textSize="14sp" + android:textColor="@color/primarytext" /> <TextView android:id="@+id/key" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp" - android:textColor="#5b5b5b" + android:textColor="@color/primarytext" android:typeface="monospace" android:visibility="gone" /> diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml index dcac42e9..0c457c25 100644 --- a/res/layout/contact_key.xml +++ b/res/layout/contact_key.xml @@ -10,13 +10,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp" - android:textColor="#5b5b5b" + android:textColor="@color/primarytext" android:typeface="monospace" /> <TextView android:id="@+id/key_type" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#5b5b5b" + android:textColor="@color/secondarytext" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml index dda09178..97985737 100644 --- a/res/layout/conversation_list_row.xml +++ b/res/layout/conversation_list_row.xml @@ -25,8 +25,8 @@ android:layout_alignLeft="@+id/conversation_lastwrapper" android:layout_toLeftOf="@+id/conversation_lastupdate" android:singleLine="true" - android:textColor="#636363" - android:textSize="20sp" + android:textSize="18sp" + android:textColor="@color/primarytext" android:typeface="sans" /> <LinearLayout @@ -41,9 +41,8 @@ android:id="@+id/conversation_lastmsg" android:layout_width="fill_parent" android:layout_height="wrap_content" - - android:textColor="#636363" android:textSize="14sp" + android:textColor="@color/primarytext" android:singleLine="true" android:scrollHorizontally="false" /> @@ -52,7 +51,7 @@ android:id="@+id/conversation_lastimage" android:layout_width="fill_parent" android:layout_height="36dp" - android:background="#333333" + android:background="@color/primarytext" android:scaleType="centerCrop" /> </LinearLayout> @@ -63,8 +62,8 @@ android:layout_alignBaseline="@+id/conversation_name" android:layout_alignParentRight="true" android:gravity="right" - android:textColor="#636363" - android:textSize="12sp" /> + android:textSize="12sp" + android:textColor="@color/secondarytext"/> </RelativeLayout> diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml new file mode 100644 index 00000000..4b5b9a04 --- /dev/null +++ b/res/layout/create_contact_dialog.xml @@ -0,0 +1,38 @@ +<?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:textSize="14sp" + android:textColor="@color/primarytext" + android:text="@string/your_account" /> + <Spinner + android:id="@+id/account" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/jabber_id" + android:layout_marginTop="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="14sp" + android:textColor="@color/primarytext" + android:text="@string/account_settings_jabber_id" /> + + <AutoCompleteTextView + android:id="@+id/jid" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textEmailAddress" + android:hint="@string/account_settings_example_jabber_id" + android:textColorHint="@color/secondarytext" + android:textColor="@color/primarytext" + /> +</LinearLayout> diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml index 789bbae9..10ceaae5 100644 --- a/res/layout/dialog_clear_history.xml +++ b/res/layout/dialog_clear_history.xml @@ -8,7 +8,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/clear_histor_msg" - android:textSize="18sp" + android:textSize="14sp" android:paddingBottom="8dp"/> <CheckBox android:id="@+id/end_conversation_checkbox" diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index 6dfe149d..c518c647 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -12,22 +12,23 @@ android:layout_height="wrap_content" android:paddingTop="8dp" android:text="Jabber ID" - android:textColor="#33B5E5" - android:textSize="20sp"/> + android:textColor="@color/primarytext" + android:textSize="18sp"/> <TextView android:id="@+id/verify_otr_jid" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:textSize="14sp" /> + android:textSize="14sp" + android:textColor="@color/secondarytext"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="8dp" - android:text="OTR fingerprint" - android:textColor="#33B5E5" - android:textSize="20sp"/> + android:text="@string/otr_fingerprint" + android:textColor="@color/primarytext" + android:textSize="18sp"/> <TextView android:id="@+id/verify_otr_fingerprint" @@ -35,14 +36,15 @@ android:layout_height="wrap_content" android:paddingLeft="8dp" android:textSize="14sp" - android:typeface="monospace"/> + android:typeface="monospace" + android:textColor="@color/secondarytext"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="8dp" - android:text="Your fingerprint" - android:textColor="#33B5E5" - android:textSize="20sp"/> + android:text="@string/your_fingerprint" + android:textSize="18sp" + android:textColor="@color/primarytext"/> <TextView android:id="@+id/verify_otr_yourprint" @@ -50,5 +52,6 @@ android:layout_height="wrap_content" android:paddingLeft="8dp" android:textSize="14sp" - android:typeface="monospace"/> + android:typeface="monospace" + android:textColor="@color/secondarytext"/> </LinearLayout> diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml index 12fbe468..3b2ee981 100644 --- a/res/layout/edit_account_dialog.xml +++ b/res/layout/edit_account_dialog.xml @@ -13,16 +13,14 @@ - <EditText + <AutoCompleteTextView android:id="@+id/account_jid" android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" android:inputType="textEmailAddress" - android:hint="@string/account_settings_example_jabber_id"> + android:hint="@string/account_settings_example_jabber_id" /> - - </EditText> <TextView diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml deleted file mode 100644 index 206c7432..00000000 --- a/res/layout/edit_contact_name.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?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/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/enter_new_name" - android:textColor="#5b5b5b" - android:textSize="18sp" /> - - <EditText - android:paddingTop="16dp" - android:paddingBottom="8dp" - android:id="@+id/editText1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="textPersonName" > - - <requestFocus /> - </EditText> - -</LinearLayout> diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index c09a7d5f..b712c304 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -3,15 +3,33 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#e5e5e5" > + android:background="@color/secondarybackground" > - <RelativeLayout - android:id="@+id/textsend" + + + <ListView + android:id="@+id/messages_view" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_above="@+id/snackbar" android:layout_alignParentLeft="true" - android:background="#eee" > + 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" > <EditText android:id="@+id/textinput" @@ -19,7 +37,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/textSendButton" - android:background="#eee" + android:background="@color/primarybackground" android:ems="10" android:inputType="textShortMessage|textMultiLine|textCapSentences" android:minHeight="48dp" @@ -27,7 +45,8 @@ android:paddingBottom="12dp" android:paddingLeft="8dp" android:paddingRight="8dp" - android:paddingTop="12dp" > + android:paddingTop="12dp" + android:textColor="@color/primarytext"> <requestFocus /> </EditText> @@ -42,110 +61,42 @@ android:src="@drawable/ic_action_send_now" /> </RelativeLayout> - <ListView - android:id="@+id/messages_view" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/textsend" - android:layout_alignParentLeft="true" - android:layout_below="@+id/info_box" - android:background="#e5e5e5" - android:divider="@null" - android:dividerHeight="0dp" - android:listSelector="@android:color/transparent" - android:stackFromBottom="true" - android:transcriptMode="normal" - tools:listitem="@layout/message_sent" > - </ListView> - - <LinearLayout - android:id="@+id/info_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <LinearLayout - android:id="@+id/muc_error" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@drawable/redbackground" - android:orientation="vertical" - android:visibility="gone" > - - <TextView - android:id="@+id/muc_error_msg" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="6dp" - android:textColor="#eee" - android:textSize="20sp" - android:textStyle="bold" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="6dp" - android:paddingLeft="6dp" - android:text="@string/edit_conference_details" - android:textColor="#eee" - android:textSize="14sp" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/new_fingerprint" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@drawable/redbackground" - android:orientation="vertical" - android:visibility="gone" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="6dp" - android:text="@string/unknown_otr_fingerprint" - android:textColor="#eee" - android:textSize="20sp" - android:textStyle="bold" /> - - <TextView - android:id="@+id/otr_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="6dp" - android:paddingLeft="6dp" - android:textColor="#eee" - android:textSize="14sp" - android:singleLine="true" - android:typeface="monospace" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/pgp_keyentry" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@drawable/bluebackground" - android:orientation="vertical" - android:visibility="gone" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="6dp" - android:text="@string/openpgp_messages_found" - android:textColor="#eee" - android:textSize="20sp" - android:textStyle="bold" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="6dp" - android:paddingLeft="6dp" - android:text="@string/openpgp_click_to_decrypt" - android:textColor="#eee" - android:textSize="14sp" /> - </LinearLayout> - </LinearLayout> + <RelativeLayout + android:id="@+id/snackbar" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/textsend" + android:background="@drawable/snackbar" + android:minHeight="48dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="4dp" + 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:paddingLeft="24dp" + android:textColor="@color/ondarktext" + android:textSize="14sp" /> + + <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="14sp" + android:textStyle="bold" /> + </RelativeLayout> </RelativeLayout>
\ No newline at end of file diff --git a/res/layout-sw320dp/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml index fcb1949c..b85f1116 100644 --- a/res/layout-sw320dp/fragment_conversations_overview.xml +++ b/res/layout/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="288dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > <ListView android:id="@+id/list" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:divider="#b5b5b5" + android:divider="@color/divider" android:dividerHeight="1dp" - android:background="#eeeeee" + android:background="@color/primarybackground" /> </LinearLayout> @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> </LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml new file mode 100644 index 00000000..431bf59e --- /dev/null +++ b/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:textSize="14sp" + android:textColor="@color/primarytext" + android:text="@string/your_account" /> + <Spinner + android:id="@+id/account" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/jabber_id" + android:layout_marginTop="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="14sp" + android:textColor="@color/primarytext" + android:text="@string/conference_address" /> + + <AutoCompleteTextView + android:id="@+id/jid" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textEmailAddress" + android:hint="@string/conference_address_example" + android:textColorHint="@color/secondarytext" + android:textColor="@color/primarytext" + /> + + <CheckBox + android:id="@+id/bookmark" + android:layout_marginTop="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/save_as_bookmark" + android:checked="true" /> + +</LinearLayout> diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml index 0866477a..a2a01bf1 100644 --- a/res/layout/manage_accounts.xml +++ b/res/layout/manage_accounts.xml @@ -8,7 +8,8 @@ android:id="@+id/account_list" android:layout_width="fill_parent" android:layout_height="wrap_content" - tools:listitem="@layout/account_row"> + android:divider="@color/divider" + android:dividerHeight="1dp"> </ListView> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml index 3b3df9e8..563d730d 100644 --- a/res/layout/message_recieved.xml +++ b/res/layout/message_recieved.xml @@ -3,7 +3,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="8dp" > + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingBottom="4dp" + android:paddingTop="4dp"> <LinearLayout android:id="@+id/message_box" @@ -17,10 +20,13 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent" - android:background="#ededed" + android:background="@color/primarybackground" android:orientation="vertical" android:gravity="center_vertical" - android:padding="3dp" > + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="5dp" + android:paddingLeft="5dp"> <ImageView android:id="@+id/message_image" @@ -29,7 +35,7 @@ android:adjustViewBounds="true" android:paddingBottom="2dp" android:scaleType="fitXY" - android:background="#333333" + android:background="@color/primarytext" /> <TextView @@ -38,8 +44,8 @@ android:layout_height="wrap_content" android:autoLink="web" android:textIsSelectable="true" - android:textColor="#333333" - android:textSize="16sp"/> + android:textSize="14sp" + android:textColor="@color/primarytext"/> <Button android:id="@+id/download_button" @@ -52,7 +58,8 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal" + android:paddingTop="1dp"> <ImageView android:id="@+id/security_indicator" @@ -72,8 +79,8 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:text="@string/sending" - android:textColor="#8e8e8e" - android:textSize="12sp" /> + android:textSize="12sp" + android:textColor="@color/secondarytext"/> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index fbc95898..d4970e6f 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -3,7 +3,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="8dp" > + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingBottom="4dp" + android:paddingTop="4dp"> <LinearLayout android:id="@+id/message_box" @@ -17,10 +20,13 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent" - android:background="#ededed" + android:background="@color/primarybackground" android:orientation="vertical" android:gravity="center_vertical" - android:padding="3dp" > + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="5dp" + android:paddingLeft="5dp"> <ImageView android:id="@+id/message_image" @@ -29,7 +35,7 @@ android:adjustViewBounds="true" android:paddingBottom="2dp" android:scaleType="fitXY" - android:background="#333333" + android:background="@color/primarytext" /> <TextView @@ -38,14 +44,15 @@ android:layout_height="wrap_content" android:autoLink="web" android:textIsSelectable="true" - android:textColor="#333333" - android:textSize="16sp" /> + android:textSize="14sp" + android:textColor="@color/primarytext"/> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_gravity="right"> + android:layout_gravity="right" + android:paddingTop="1dp"> <TextView android:id="@+id/message_time" @@ -54,8 +61,8 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:text="@string/sending" - android:textColor="#8e8e8e" - android:textSize="12sp" /> + android:textSize="12sp" + android:textColor="@color/secondarytext"/> <ImageView android:id="@+id/security_indicator" diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml index b9eafca4..d8f24151 100644 --- a/res/layout/otr_fingerprint.xml +++ b/res/layout/otr_fingerprint.xml @@ -9,7 +9,7 @@ android:id="@+id/otr_no_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20sp" + android:textSize="18sp" android:text="@string/no_otr_fingerprint" android:visibility="visible"/> @@ -17,7 +17,7 @@ android:id="@+id/otr_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20sp" + android:textSize="18sp" android:typeface="monospace" android:visibility="gone"/> diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml new file mode 100644 index 00000000..07a7ac3b --- /dev/null +++ b/res/layout/quickedit.xml @@ -0,0 +1,18 @@ +<?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> diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml new file mode 100644 index 00000000..3f402664 --- /dev/null +++ b/res/menu/choose_contact.xml @@ -0,0 +1,10 @@ +<?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/res/menu/conference_context.xml b/res/menu/conference_context.xml new file mode 100644 index 00000000..fd898580 --- /dev/null +++ b/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/res/menu/contact_context.xml b/res/menu/contact_context.xml new file mode 100644 index 00000000..11ac7d7c --- /dev/null +++ b/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/res/menu/conversations.xml b/res/menu/conversations.xml index 68bcc957..2621289a 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -2,48 +2,44 @@ <item android:id="@+id/action_add" + android:icon="@drawable/ic_action_new" android:orderInCategory="10" - android:icon="@drawable/ic_action_add" - android:showAsAction="ifRoom" - android:title="@string/action_add" /> - + 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="ifRoom" - android:icon="@drawable/ic_action_unsecure" - android:title="@string/action_secure" /> - + android:showAsAction="always" + android:title="@string/action_secure"/> <item android:id="@+id/action_attach_file" - android:orderInCategory="30" - android:showAsAction="ifRoom" android:icon="@drawable/ic_action_new_attachment" - android:title="@string/attach_file" /> - + android:orderInCategory="30" + android:showAsAction="always" + android:title="@string/attach_file"/> <item android:id="@+id/action_contact_details" android:orderInCategory="40" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_person" - android:title="@string/action_contact_details" /> - <item + 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:icon="@drawable/ic_action_group" - android:title="@string/action_muc_details" /> - <item + android:title="@string/action_muc_details"/> + <item android:id="@+id/action_invite" + android:orderInCategory="45" android:showAsAction="never" - android:title="@string/invite_contacts" /> - + android:title="@string/invite_contact"/> <item android:id="@+id/action_archive" android:orderInCategory="50" android:showAsAction="never" android:title="@string/action_end_conversation"/> - <item + <item android:id="@+id/action_clear_history" android:orderInCategory="60" android:showAsAction="never" @@ -52,13 +48,11 @@ android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" - android:title="@string/action_accounts" - /> - + android:title="@string/action_accounts"/> <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" android:title="@string/action_settings"/> -</menu> +</menu>
\ No newline at end of file diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml index 5f76b0e0..04ecc25f 100644 --- a/res/menu/manageaccounts_context.xml +++ b/res/menu/manageaccounts_context.xml @@ -8,7 +8,7 @@ android:title="@string/mgmt_account_edit"/> <item android:id="@+id/mgmt_account_delete" - android:icon="@drawable/ic_action_delete" + android:icon="@drawable/ic_action_discard" android:showAsAction="always" android:title="@string/mgmt_account_delete"/> <item diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml index 4f9b6da0..685109cd 100644 --- a/res/menu/muc_details.xml +++ b/res/menu/muc_details.xml @@ -1,6 +1,12 @@ <?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:orderInCategory="10" + android:showAsAction="always" + android:icon="@drawable/ic_action_edit" + android:title="@string/action_edit_subject" /> + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" diff --git a/res/menu/newconversation.xml b/res/menu/newconversation.xml deleted file mode 100644 index 4f9b6da0..00000000 --- a/res/menu/newconversation.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - <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> diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml deleted file mode 100644 index 7492c265..00000000 --- a/res/menu/newconversation_context.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/action_contact_details" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_person" - android:title="@string/action_contact_details" /> - <item - android:id="@+id/action_start_conversation" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_chat" - android:title="@string/start_conversation" /> - <item - android:id="@+id/action_invite" - android:showAsAction="ifRoom" - android:title="@string/invite_contacts" /> - <item - android:id="@+id/action_invite_to_existing" - android:showAsAction="never" - android:title="@string/invite_contacts_to_existing" /> -</menu> diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml new file mode 100644 index 00000000..271bac18 --- /dev/null +++ b/res/menu/start_conversation.xml @@ -0,0 +1,33 @@ +<?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/res/values-de/strings.xml b/res/values-de/strings.xml index 9a11ca6a..e4ad7817 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -12,15 +12,26 @@ <string name="action_secure">Verschlüsselte Unterhaltung</string> <string name="action_add_account">Account 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_contacts">Kontakte</string> + <string name="title_activity_manage_accounts">Accounts 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="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…</string> <string name="announce_pgp">PGP Ankündigung erneuern</string> <string name="encrypted_message">Entschlüssle Nachricht. Bitte warten…</string> <string name="conference_details">Konferenzdetails</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> @@ -37,9 +48,24 @@ <string name="invite_contacts">Kontakte einladen</string> <string name="invite_contacts_to_existing">Lade zu bestehender Konferenz ein</string> <string name="new_conference">Erzeuge neue Konferenz</string> + <string name="new_contact">Neuen Kontakt erstellen</string> + <string name="contacts">Kontakte</string> + <string name="search_jabber_id">Jabber ID eingeben oder suchen</string> + <string name="choose_account">Account auswählen</string> + <string name="multi_user_conference">Mehrbenutzerkonferenz</string> + <string name="trying_join_conference">Möchtest du einer Konferenz beitreten?</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="yes">Ja</string> + <string name="no">Nein</string> + <string name="ok">OK</string> + <string name="done">Erledigt</string> + <string name="hide">Verstecken</string> <string name="create_invite">Erzeugen \u0026 Einladen</string> - <string name="new_conference_explained">Do you want to create a new conference with a randomly generated address and invite the selected contacts to it?</string> + <string name="new_conference_explained">Möchtest du eine neue Konferenz mit einer zufälligen Adresse erstellen und die ausgewählten Kontakte zu dieser einladen?</string> <string name="no_open_mucs">Keine bestehende Konferenz</string> <string name="invitation_sent">Einladung wurde versandt</string> <string name="account_offline">Account offline</string> @@ -88,8 +114,11 @@ <string name="restart">Neustarten</string> <string name="install">Installieren</string> <string name="offering">angeboten…</string> + <string name="waiting">warten…</string> <string name="no_pgp_key">Kein OpenPGP Schlüssel gefunden</string> + <string name="no_pgp_keys">Keine 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 sein oder ihren Schlüssel nicht preis gibt.\n\n<small>Bitte sag deinem Kontakt er oder sie möge bitte OpenPGP einrichten.</small></string> + <string name="contact_has_no_pgp_keys">Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\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> @@ -127,16 +156,18 @@ <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 zu sehen.</string> <string name="subscriptions">Abonnements</string> + <string name="subscription_updated">Abonnements aktualisiert</string> <string name="your_account">Dein Account</string> <string name="keys">Schlüssel</string> - <string name="send_presence_updates">Sende Online Status</string> - <string name="receive_presence_updates">Empfange Online Status</string> - <string name="ask_for_presence_updates">Frage um Erlaubnis den Online Status sehen zu dürfen</string> - <string name="attach_choose_picture">Photo auswählen</string> - <string name="attach_take_picture">Photo aufnehmen</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="asked_for_presence_updates">Es wurde um Anwesenheitsbenachrichtigungen gefragt</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_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> @@ -166,8 +197,62 @@ <string name="mgmt_account_enable">Anschalten</string> <string name="attach_record_voice">Sprache aufzeichnen</string> <string name="account_settings">Kontoeinstellungen</string> - <string name="save">Speichern</string> <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string> <string name="invalid_jid">Ungültige Jabber ID</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="pref_show_last_seen">Letzte Nutzung anzeigen</string> + <string name="pref_show_last_seen_summary">Zeige die Zeit an, zu welcher ein Kontakt zuletzt online war</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="mgmt_account_account_offline">Das Konto ist offline</string> + <string name="attach_record_voice">Audio aufnehmen</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="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_conference_subject">Konferenzthema</string> + <string name="muc_details_your_nickname">Dein Name</string> + <string name="muc_details_other_members">Andere Mitglieder</string> + <string name="subscription_not_updated_offline">Der Account ist offline. Die Abonemments konnten nicht aktualisiert werden</string> + <string name="share_with_active_conversations">Aktive Gespräche</string> + <string name="server_info_statistics">Statistiken</string> + <string name="server_info_connection_age">Verbindungsalter</string> + <string name="server_info_session_age">Sitzungsalter</string> + <string name="server_info_packets_sent">Gesendete Pakete</string> + <string name="server_info_packets_received">Empfangene Pakete</string> + <string name="server_info_connected_accounts">Verbundene Konten</string> + <string name="server_info_server_features">Serverfunktionen</string> + <string name="server_info_roster_versioning">Roster Versioning</string> + <string name="server_info_carbon_messages">Carbon Messages</string> + <string name="server_info_stream_management">Stream Management</string> + <string name="hours">Stunden</string> + <string name="mins">Minuten</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="edit_conference_details">Konferenzdetails bearbeiten</string> + <string name="openpgp_messages_found">Verschlüsselte OpenPGP-Nachricht gefunden</string> + <string name="openpgp_click_to_decrypt">Hier klicken, um das Passwort einzugeben und die Nachricht zu entschlüsseln</string> + <string name="reception_failed">Empfang ist fehlgeschlagen</string> + <string name="no_muc_server_found">Es wurde kein Konferenzserver gefunden</string> </resources>
\ No newline at end of file diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c47d7cf8..9ebf673b 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -21,6 +21,8 @@ <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> @@ -37,6 +39,7 @@ <string name="visitor">Visitante</string> <string name="enter_new_name">Introduce un nuevo nombre:</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="untrusted_cert_hint">El servidor %s presenta un certificado no confiable, posiblemente auto firmado.</string> <string name="account_info">Información del servidor</string> <string name="register_account">Registrar nueva cuenta en servidor</string> @@ -45,10 +48,7 @@ <string name="show_otr_key">Clave OTR</string> <string name="no_otr_fingerprint">No se ha generado una clave OTR. Continúa y comienza una conversación encriptada</string> <string name="start_conversation">Comenzar conversación</string> - <string name="invite_contacts">Invitar contactos</string> - <string name="invite_contacts_to_existing">Invitar a conferencia existente</string> - <string name="new_conference">Crear nueva conferencia</string> - <string name="new_contact">Crear nuevo contacto</string> + <string name="invite_contact">Invitar contactos</string> <string name="contacts">Contactos</string> <string name="search_jabber_id">Busca o escribe identificador Jabber</string> <string name="choose_account">Seleccionar cuenta</string> @@ -78,7 +78,7 @@ <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. ¿Quieres añadirlo?</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> @@ -200,10 +200,10 @@ <string name="mgmt_account_account_offline">La cuenta está desconectada</string> <string name="attach_record_voice">Grabar audio</string> <string name="account_settings">Configuración de cuenta</string> - <string name="account_settings_jabber_id">Identificador Jabber:</string> - <string name="account_settings_password">Contraseña:</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="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> @@ -248,4 +248,28 @@ <string name="edit_conference_details">Pulsa para editar detalles de la conferencia</string> <string name="openpgp_messages_found">Encontrado mensaje encriptado con OpenPGP</string> <string name="openpgp_click_to_decrypt">Pulsa para introducir la contraseña y desencriptar el mensaje</string> + <string name="reception_failed">Error al recibir</string> + <string name="no_muc_server_found">No se ha encontrado un servidor de conferencias apropiado</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> </resources>
\ No newline at end of file diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index db6247cf..df793735 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -22,7 +22,7 @@ <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string> <string name="just_now">orain</string> - <string name="minute_ago">1 min lehenago</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…</string> @@ -88,7 +88,7 @@ <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 geroago amaitu</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> @@ -145,7 +145,7 @@ <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 kontatuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string> + <string name="pref_confirm_messages_summary">Zure kontaktuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string> <string name="pref_show_last_seen">Azkenengoz ikusia erakutsi</string> <string name="pref_show_last_seen_summary">Kontaktu bat azken aldiz konektatuta ikusi den ordua erakutsi</string> <string name="openpgp_error">OpenKeychainek akats baten berri eman du</string> @@ -233,7 +233,7 @@ <string name="server_info_carbon_messages">Carbon Messages</string> <string name="server_info_stream_management">Stream Management</string> <string name="hours">orduak</string> - <string name="mins">minutuak</string> + <string name="mins">minutu</string> <string name="missing_public_keys">Gako publikoen iragarpenak faltan</string> <string name="last_seen_now">azkenegoz ikusia orain</string> <string name="last_seen_mins">azkenegoz ikusia %d minutu lehenago</string> @@ -244,5 +244,11 @@ <string name="last_seen_hour">azkenegoz 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="edit_conference_details">Ukitu konferentziaren xehetasunak editatzeko</string> + <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string> + <string name="openpgp_click_to_decrypt">Sakatu hemen pasahitza sartu eta mezuak desenkriptatzeko</string> + <string name="reception_failed">Jasotzeak huts egin du</string> + <string name="no_muc_server_found">Ez da aurkitu konferentzia zerbitzari egokirik</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3f27220b..1e21e9f5 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1,6 +1,5 @@ <?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> @@ -10,16 +9,29 @@ <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_edit_contact">Edit name</string> - <string name="action_delete_contact">Delete from roster</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_contacts">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="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…</string> <string name="announce_pgp">Renouveler les annonces PGP</string> <string name="encrypted_message">Déchiffrement du message. Patientez…</string> <string name="conference_details">Détails de la conférence</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> @@ -36,7 +48,22 @@ <string name="invite_contacts">Inviter des contacts</string> <string name="invite_contacts_to_existing">Inviter à une conférence</string> <string name="new_conference">Créer une nouvelle conférence</string> + <string name="new_contact">Ajouter ce contact</string> + <string name="contacts">Contacts</string> + <string name="search_jabber_id">Rechercher un identifiant</string> + <string name="choose_account">Choix du compte</string> + <string name="multi_user_conference">Conférence Multi Utilisateurs</string> + <string name="trying_join_conference">Voulez-vous rejoindre une conférence?</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="yes">Oui</string> + <string name="no">Non</string> + <string name="ok">OK</string> + <string name="done">Terminé</string> + <string name="hide">Cacher</string> <string name="create_invite">Créer \u0026 invitation</string> <string name="new_conference_explained">Voulez-vous créer une nouvelle conférence avec une adresse générée aléatoirement et inviter les contacts sélectionnés à la rejoindre?</string> <string name="no_open_mucs">Conférences non existantes</string> @@ -63,7 +90,6 @@ <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_message_to_conference">Envoyer un message à la conférence</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> @@ -86,9 +112,12 @@ <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…</string> + <string name="offering">Proposition…</string> + <string name="waiting">Patientez…</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> @@ -118,6 +147,10 @@ <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_show_last_seen">Afficher l\'historique de connexion</string> + <string name="pref_show_last_seen_summary">Indiquer quand un contact s\'est connecté pour la dernière fois.</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="error_copying_image_file">Erreur lors de la copie du fichier</string> @@ -126,11 +159,13 @@ <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="subscription_updated">Publication mise à jour</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="asked_for_presence_updates">Mises à jour de présence demandées</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> @@ -139,28 +174,100 @@ <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">Statut :</string> - <string name="account_status_unknown">Inconnu</string> - <string name="account_status_disabled">Temporarily disabled</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_requires_tls">Le serveur requiert TLS</string> - <string name="account_status_error">Certificat non certifié</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="certif_no_trust">Annuler</string> - <string name="certif_trust">Croire ce certificat</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_enable">Activer</string> + <string name="account_status">Statut :</string> + <string name="account_status_unknown">Inconnu</string> + <string name="account_status_disabled">Temporarily disabled</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_requires_tls">Le serveur requiert TLS</string> + <string name="account_status_error">Certificat non certifié</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="certif_no_trust">Annuler</string> + <string name="certif_trust">Croire ce certificat</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_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="mgmt_account_account_offline">Le compte est hors-ligne</string> + <string name="attach_record_voice">Enregistrer un son</string> + <string name="account_settings">Paramètres du compte</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_conference_subject">Sujet de la conférence</string> + <string name="muc_details_your_nickname">Votre pseudo</string> + <string name="muc_details_other_members">Autres membres</string> + <string name="subscription_not_updated_offline">Vous ne pouvez pas mettre à jour de publication en étant hors-ligne.</string> + <string name="share_with_active_conversations">Conversations actives</string> + <string name="server_info_statistics">Statistiques</string> + <string name="server_info_connection_age">Durée de connexion</string> + <string name="server_info_session_age">Durée de la session</string> + <string name="server_info_packets_sent">Paquets envoyés</string> + <string name="server_info_packets_received">Paquets reçus</string> + <string name="server_info_connected_accounts">Comptes connectés</string> + <string name="server_info_server_features">Capacités du serveur</string> + <string name="server_info_roster_versioning">Versions de la liste de contacts</string> + <string name="server_info_carbon_messages">Copies carbone</string> + <string name="server_info_stream_management">Gestion des flux</string> + <string name="hours">heures</string> + <string name="mins">minutes</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="edit_conference_details">Tapotez pour modifier les détails de la conférence</string> + <string name="openpgp_messages_found">Messages chiffrés par OpenPGP détectés.</string> + <string name="openpgp_click_to_decrypt">Tapotez pour entrer la phrase secrète afin de déchiffrer le message.</string> + <string name="reception_failed">Echec lors de la réception</string> + <string name="no_muc_server_found">Aucun serveur de conférences n\'a été trouvé.</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> </resources> diff --git a/res/values-fr/styles.xml b/res/values-fr/styles.xml deleted file mode 100644 index 1468283e..00000000 --- a/res/values-fr/styles.xml +++ /dev/null @@ -1,19 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> - <item name="android:drawableBottom">@drawable/section_header</item> - <item name="android:drawablePadding">4dp</item> - <item name="android:layout_marginTop">8dp</item> - <item name="android:textSize">14sp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textColor">#5b5b5b</item> - <item name="android:textStyle">bold</item> - </style> - - <style name="Divider"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">1.5dp</item> - <item name="android:background">#b7b7b7</item> - </style> - -</resources>
\ No newline at end of file diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml new file mode 100644 index 00000000..d73bdef5 --- /dev/null +++ b/res/values-ru/arrays.xml @@ -0,0 +1,22 @@ +<?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> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml new file mode 100644 index 00000000..c1e9ce0c --- /dev/null +++ b/res/values-ru/strings.xml @@ -0,0 +1,271 @@ +<?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_refresh">Обновить список контактов</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_contacts">Контакты</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">Поделиться</string> + <string name="title_activity_start_conversation">Начать беседу</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">отправка…</string> + <string name="announce_pgp">Обновить PGP ключи</string> + <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите…</string> + <string name="conference_details">Сведения о Конференции</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="enter_new_name">Введите новое имя:</string> + <string name="remove_contact_text">Вы хотите удалить %s из своего списка? Беседы, связанные с этим аккаунтом будут сохранены.</string> + <string name="untrusted_cert_hint">Сервер %s предоставил неподтвержденный, самостоятельно подписанный сертификат.</string> + <string name="account_info">Информация о Сервере</string> + <string name="register_account">Создать новый аккаунт на сервере</string> + <string name="share_with">Поделиться с</string> + <string name="ask_again"><u>Нажмите, чтобы попросить заново</u></string> + <string name="show_otr_key">Контрольная сумма криптографического протокола OTR</string> + <string name="no_otr_fingerprint">Нет созданных контрольных сумм криптографического протокола OTR. Просто начните новую зашифрованную беседу</string> + <string name="start_conversation">Начать Беседу</string> + <string name="invite_contacts">Пригласить Пользователя</string> + <string name="invite_contacts_to_existing">Пригласить пользователя в существующую конференцию</string> + <string name="new_conference">Создать новую конференцию</string> + <string name="new_contact">Создать новый контакт</string> + <string name="contacts">Контакты</string> + <string name="search_jabber_id">Укажите уникальный идентификатор пользователя JID (Джаббер ID)</string> + <string name="choose_account">Выберите аккаунт</string> + <string name="multi_user_conference">Мультиконференция</string> + <string name="trying_join_conference">Вы хотели бы присоединиться к конференции?</string> + <string name="cancel">Отмена</string> + <string name="add">Добавить</string> + <string name="edit">Редактировать</string> + <string name="delete">Удалить</string> + <string name="save">Сохранить</string> + <string name="yes">Да</string> + <string name="no">Нет</string> + <string name="ok">ОК</string> + <string name="done">Готово</string> + <string name="hide">Спрятать</string> + <string name="create_invite">Создать \u0026 Пригласить</string> + <string name="new_conference_explained">Вы хотите создать новую конференцию со случайным адресом и пригласить туда выбранных пользователей?</string> + <string name="no_open_mucs">Нет существующих конференций</string> + <string name="invitation_sent">Приглашение отправлено</string> + <string name="account_offline">Аккаунт не в сети</string> + <string name="cant_invite_while_offline">Вы должны быть в сети, чтобы пригласить пользователей в конференцию</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">Получение изображения. Пожалуйста подождите…</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="error_loading_image">Ошибка загрузки изображения (Файл не найден)</string> + <string name="image_offered_for_download"><i>Изображение предложено для загрузки</i></string> + <string name="not_connected">Не подключен</string> + <string name="otr_messages">OTR защифрованное сообщение</string> + <string name="manage_account">Управление аккаунтом</string> + <string name="contact_offline">Вы не в сети</string> + <string name="contact_offline_otr">Отправка OTR зашифрованного сообщения пользователю, который не в сети, к сожалению, не поддерживается.\nХотите, отправить незашифрованное текстовое сообщение?</string> + <string name="contact_offline_file">Отправка файлов пользователю не в сети, к сожалению, не поддерживается.</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">предложение…</string> + <string name="waiting">ожидание…</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="otr_file_transfer">OTR шифрование недоступно</string> + <string name="otr_file_transfer_msg">К сожалению невозможно использовать OTR шифрование для передачи файлов. Вы можете использовать OpenPGP шифрование или передать файл в незашифрованном виде.</string> + <string name="use_pgp_encryption">Использовать OpenPGP шифрование</string> + <string name="pref_xmpp_resource">XMPP ресурс</string> + <string name="pref_xmpp_resource_summary">Имя, которым Conversations идентифицирует себя</string> + <string name="pref_accept_files">Принимать файлы</string> + <string name="pref_accept_files_summary">Автоматически принимать файлы размером меньше, чем…</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_ui_options">Параметры интерфейса</string> + <string name="pref_use_phone_self_picture">Использовать стандартный аватар</string> + <string name="pref_use_phone_self_picture_summary">В случае использования нескольких аккаунтов, отображаться будет только один, единый аватар</string> + <string name="pref_conference_name">Название конференции</string> + <string name="pref_conference_name_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_show_last_seen">Отображать последний визит</string> + <string name="pref_show_last_seen_summary">Отображать время последнего визита пользователя</string> + <string name="openpgp_error">Возникла ошибка в OpenKeychain</string> + <string name="error_decrypting_file">Ошибка расшифровки файла</string> + <string name="error_copying_image_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="subscription_updated">Подписка обновлена</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="asked_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">Статус:</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_requires_tls">Сервер требует использования криптографического протокола TLS</string> + <string name="account_status_error">Неподтвержденный сертификат</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="certif_no_trust">Не подключаться</string> + <string name="certif_trust">Принять сертификат</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_enable">Включить</string> + <string name="mgmt_account_are_you_sure">Вы уверены?</string> + <string name="mgmt_account_delete_confirm_text">Если вы удалите свой аккаунт, вся ваша история будет потеряна</string> + <string name="mgmt_account_account_offline">Аккаунт не подключен</string> + <string name="attach_record_voice">Запись голоса</string> + <string name="account_settings">Настройки аккаунта</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_conference_subject">Тема Конференции</string> + <string name="muc_details_your_nickname">Ваш псевдоним</string> + <string name="muc_details_other_members">Другие участники</string> + <string name="subscription_not_updated_offline">Аккаунт не в сети. Не удалось обновить статус подписки</string> + <string name="share_with_active_conversations">Активные Беседы</string> + <string name="server_info_statistics">Статистика</string> + <string name="server_info_connection_age">Продолжительность соединения</string> + <string name="server_info_session_age">Продолжительность сессии</string> + <string name="server_info_packets_sent">Пакет послан</string> + <string name="server_info_packets_received">Пакет получен</string> + <string name="server_info_connected_accounts">Активных аккаунтов</string> + <string name="server_info_server_features">Особенности Сервера</string> + <string name="server_info_roster_versioning">Контроль версий списков</string> + <string name="server_info_carbon_messages">Дублирование сообщений</string> + <string name="server_info_stream_management">Управление потоками</string> + <string name="hours">час.</string> + <string name="mins">мин.</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="edit_conference_details">Нажмите здесь, чтобы изменить сведения о конференции</string> + <string name="openpgp_messages_found">Найдены OpenPGP зашифрованые сообщения</string> + <string name="openpgp_click_to_decrypt">Нажмите здесь, чтобы ввести идентификационную фразу и расшифровать сообщения</string> + <string name="reception_failed">Прием не удался</string> + <string name="no_muc_server_found">Не найдено подходящего сервера для конференции</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> +</resources> diff --git a/res/values/colors.xml b/res/values/colors.xml new file mode 100644 index 00000000..b6477939 --- /dev/null +++ b/res/values/colors.xml @@ -0,0 +1,13 @@ +<?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> +</resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 4f8ff473..61e3ee94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8,7 +8,7 @@ <string name="action_refresh">Refresh contact list</string> <string name="action_end_conversation">End this conversation</string> <string name="action_contact_details">Contact details</string> - <string name="action_muc_details">Conferenece 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> @@ -21,6 +21,8 @@ <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> @@ -36,7 +38,8 @@ <string name="participant">Participant</string> <string name="visitor">Visitor</string> <string name="enter_new_name">Enter a new name:</string> - <string name="remove_contact_text">Do you want to delete %s from your roster? The conversation associated with this account will not be removed.</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="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string> <string name="account_info">Server Info</string> <string name="register_account">Register new account on server</string> @@ -45,10 +48,7 @@ <string name="show_otr_key">OTR fingerprint</string> <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string> <string name="start_conversation">Start Conversation</string> - <string name="invite_contacts">Invite Contacts</string> - <string name="invite_contacts_to_existing">Invite to existing conference</string> - <string name="new_conference">Create new conference</string> - <string name="new_contact">Create new contact</string> + <string name="invite_contact">Invite Contact</string> <string name="contacts">Contacts</string> <string name="search_jabber_id">Search or enter Jabber ID</string> <string name="choose_account">Choose account</string> @@ -104,9 +104,9 @@ <string name="contact_offline_otr">Sending OTR encrypted messages to an offline contact is unfortunately not supported.\nWould you like to send the message in plain text?</string> <string name="contact_offline_file">Sending files to an offline contact is unfortunately not supported.</string> <string name="send_unencrypted">Send unencrypted</string> - <string name="decryption_failed">Decrpytion failed. Maybe you don’t have the proper private key.</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 mange 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="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…</string> @@ -200,15 +200,15 @@ <string name="mgmt_account_account_offline">Account is offline</string> <string name="attach_record_voice">Record voice</string> <string name="account_settings">Account Settings</string> - <string name="account_settings_jabber_id">Jabber ID:</string> - <string name="account_settings_password">Password:</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="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">Ouf of memory. Image is to large</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> @@ -250,4 +250,26 @@ <string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string> <string name="reception_failed">Reception failed</string> <string name="no_muc_server_found">No suitable Conference Server found</string> -</resources>
\ No newline at end of file + <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> +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1468283e..a827fe36 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -6,14 +6,14 @@ <item name="android:layout_marginTop">8dp</item> <item name="android:textSize">14sp</item> <item name="android:textAllCaps">true</item> - <item name="android:textColor">#5b5b5b</item> + <item name="android:textColor">@color/primarytext</item> <item name="android:textStyle">bold</item> </style> <style name="Divider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1.5dp</item> - <item name="android:background">#b7b7b7</item> + <item name="android:background">@color/divider</item> </style> </resources>
\ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml new file mode 100644 index 00000000..97f1db8f --- /dev/null +++ b/res/values/themes.xml @@ -0,0 +1,26 @@ +<?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> + </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 |
