diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-05-04 22:25:16 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-05-04 22:25:16 +0300 |
| commit | a46d75bc191f4c6cf7c30a103c420b156fdc2d0c (patch) | |
| tree | d2ca6b86201cd7824724bcb4b93568df01112143 /app/src/main/res/values | |
| parent | 8edeb313ce3354eb314aa1db526ca537a9d6c5c1 (diff) | |
| parent | 8e3dd945118be3ecd6099f1e6c61311af9ed9cd1 (diff) | |
Merge branch 'master' into filter-tabs
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
# app/src/main/java/it/niedermann/nextcloud/deck/util/ExceptionUtil.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3e63c5983..628b9211f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,6 +76,8 @@ <string name="about_contribution_tab_title">Contribution</string> <string name="about_license_tab_title">License</string> + <string name="copied_to_clipboard">Copied to clipboard</string> + <string name="seconds_ago">seconds ago</string> <string name="edit">Edit</string> <string name="label_labels">Select Tags</string> @@ -139,7 +141,7 @@ <string name="add_a_new_card_using_the_button">Add a new card using the + button</string> <string name="update_deck">Update deck</string> <string name="your_deck_version_is_too_old">Your deck version is too old</string> - <string name="deck_outdated_please_update">Your deck version is too old. Please update to use this android app as client.</string> + <string name="deck_outdated_please_update">Your deck version is too old (%1$s). Please update to use this android app as client.</string> <string name="delete_board_message">This will permanently delete this board including all lists and cards.</string> <string name="settings_theme_title">Dark theme</string> <string name="settings_branding_title">Branding</string> @@ -216,8 +218,8 @@ <string name="error">An error appeared</string> <string name="synchronization_failed">Synchronization failed</string> <string name="operation_not_yet_supported">Not yet supported</string> - <string name="copied_to_clipboard">Copied to clipboard</string> <string name="error_revoking_ac">Error while revoking the access for %1$s</string> + <string name="error_create_label">Error while creating label %1$s</string> <string name="maintenance_mode">Server in maintenance mode</string> <string name="server_misconfigured">Server misconfigured</string> <string name="server_error">Server error</string> |