s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Merge confict

Browse Source
This commit is contained in:
Domagalski 2019-01-03 21:53:15 +01:00
parent 1eed752b1a
commit 2338e484f8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/values/strings.xml
View File

@ -298,11 +298,8 @@
<string name="info_icon_userlist_tab_level_status_offline">- user is currently offline</string> <string name="info_icon_userlist_tab_level_status_offline">- user is currently offline</string>
<string name="info_icon_userlist_tab_level_status_inactive">- user is inactive </string> <string name="info_icon_userlist_tab_level_status_inactive">- user is inactive </string>
<string name="info_icon_userlist_tab_level_status_inactive_tip">(didn’t share any localization data since 7 days)</string> <string name="info_icon_userlist_tab_level_status_inactive_tip">(didn’t share any localization data since 7 days)</string>
<<<<<<< HEAD
<string name="title_activity_black_list">BlackList</string> <string name="title_activity_black_list">BlackList</string>
<string name="title_activity_white_list">Whitelist</string> <string name="title_activity_white_list">Whitelist</string>
<string name="index_user">User index</string>
<string name="black_list_title">Add user to Blacklist</string>
<string name="white_list_title">Add user to Whitelist</string> <string name="white_list_title">Add user to Whitelist</string>
<string name="large_text" translatable="false"> <string name="large_text" translatable="false">
@ -394,14 +391,12 @@
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
"when a user tries to pick up one of cards.\n\n" "when a user tries to pick up one of cards.\n\n"
</string> </string>
=======
<string name="info_icon_userlist_summary">After clicking on a name, the tutor tab will pop up, containing details about selected tutor.\n\nYou can search for any tutor on the map by entering his name and surname in the search field.\n\nBy default, only active users are shown. You can change that in menu (three dots icon).\n\nYou can also search for a tutor directly, by entering name and surname of person that you look for.</string> <string name="info_icon_userlist_summary">After clicking on a name, the tutor tab will pop up, containing details about selected tutor.\n\nYou can search for any tutor on the map by entering his name and surname in the search field.\n\nBy default, only active users are shown. You can change that in menu (three dots icon).\n\nYou can also search for a tutor directly, by entering name and surname of person that you look for.</string>
<!--(ENG) Blacklist --> <!--(ENG) Blacklist -->
<string name="title_activity_black_list">Blacklist</string>
<string name="index_user">User index</string> <string name="index_user">User index</string>
<string name="black_list_title">Add user to blacklist</string> <string name="black_list_title">Add user to blacklist</string>
>>>>>>> develop
<string name="add">Add</string> <string name="add">Add</string>
<string name="possitive_dialog_button">Yes</string> <string name="possitive_dialog_button">Yes</string>