tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

resolve conflicts and merge

Browse source
This commit is contained in:
Lukas Barragan Torres 2023-05-05 11:02:18 +02:00
commit 13b9c0591f
38 changed files with 1291 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/values/strings.xml
View file

@ -32,6 +32,14 @@
<!-- Tasks -->
<string name="tasks">Tasks</string>
<string name="task">Task</string>
<string name="my_subjects">My Subjects</string>
<string name="new_subject">New Subject</string>
<string name="new_task">New Task</string>
<string name="edit_subject">Edit Subject</string>
<string name="edit_task">Edit Task</string>
<string name="delete_subject">Delete Subject</string>
<string name="delete_task">Delete Task</string>
<string name="view_tasks">View</string>
<!-- Sessions -->
<string name="sessions_temp_description">Looks like you found the sessions screen! In here, your upcoming studying sessions with friends will be listed. You can accept invites or edit your own.</string> <!-- TODO Remove this description line once implemented. -->