diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-06-17 18:30:59 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-06-17 18:31:10 +0300 |
| commit | b108515abae3a9523179f4e576545335978fcbfd (patch) | |
| tree | 37936d02d4f59d5b5174d21c63b650f30203723d /app/src/main/res/values | |
| parent | 5fa1024e4a63e2e85cd94f6d7e237d8d3a7b549b (diff) | |
| parent | 34458e8c3bc02daae17872b2ab0671d20119a8ce (diff) | |
Merge branch 'master' into create-card-before-editing
Signed-off-by: Stefan Niedermann <info@niedermann.it>
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f9acf8b6b..8cacf2776 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ <string name="app_name_short" translatable="false">Deck</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> + <string name="hint_search_deck">Search deck</string> <string name="simple_boards">Boards</string> <string name="simple_add">Add</string> @@ -34,6 +35,7 @@ <string name="simple_copied">Copied</string> <string name="simple_archive">Archive</string> <string name="simple_unassigned">Unassigned</string> + <string name="hint_error_appeared">An error appeared</string> <string name="edit_board">Edit board</string> <string name="archive_board">Archive board</string> @@ -71,6 +73,10 @@ <string name="about_license_tab_title">License</string> <string name="seconds_ago">seconds ago</string> <string name="edit">Edit</string> + <!-- After specifying the title of a new card, save it and then directly start it in edit mode --> + <string name="save_and_edit">@string/edit</string> + <!-- After specifying the title of a new card, save it and return to the list of cards --> + <string name="save_and_close">@string/simple_save</string> <string name="label_labels">Select Tags</string> <string name="label_description">Description</string> <string name="hint_assign_people">Assign users</string> @@ -174,7 +180,7 @@ <string name="hours_6">6 hours</string> <string name="action_card_move">Move card</string> <string name="action_card_move_title">Move %1$s</string> - <string name="title_is_mandatory">Title is mandatory</string> + <string name="title_is_mandatory">Title is required</string> <string name="provide_at_least_a_title_or_description">Provide at least a title or description</string> <string name="welcome_text">Welcome to %1$s</string> <string name="maintenance_mode_explanation">The server %1$s is currently in maintenance mode. Please contact your administrator or try later again.</string> @@ -341,6 +347,6 @@ <string name="account_imported">Account imported</string> <string name="simple_search">Search</string> <!-- Label for a title input field that is required to be filled out --> - <string name="title_mandatory">Title (mandatory)</string> + <string name="title_mandatory">Title (required)</string> <string name="saving_new_card">Saving new card…</string> </resources> |