diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-04-25 21:52:10 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-04-25 21:52:10 +0300 |
| commit | 72a5c5a922d640f86203b1be13e246b9c97f6b3f (patch) | |
| tree | 4b1b4816d1790881f8bde08dfd0b71751c84d63a /app/src/main/res/values | |
| parent | 79b168fa0f251914f6fb8dfd8637c69f90177435 (diff) | |
| parent | ca1f22cba278106c22a22fd00c40b95340213a41 (diff) | |
Merge branch 'master' into 395-archived-cards
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f8bd1684..d9deb9e88 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -196,10 +196,10 @@ <string name="filter_today">Today</string> <string name="filter_week">Next 7 days</string> <string name="filter_month">Next 30 days</string> - <string name="filter_no_due">No duedate</string> + <string name="filter_no_due">No due date</string> <string name="filter_by_tag">Filter by tag</string> <string name="filter_by_assigned_user">Filter by assigned user</string> - <string name="filter_by_duedate">Filter by duedate</string> + <string name="filter_by_duedate">Filter by due date</string> <!-- Archived cards --> <string name="archived_cards">Archived cards</string> |