diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-05-11 14:29:54 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-05-11 14:29:54 +0300 |
| commit | 8eea6da76571140463da0b3567c88661a8958f63 (patch) | |
| tree | ccf2d41f9794d1a1f2fb67457cad8ec0c5906be8 /app/src/main/res/values | |
| parent | 96ee09e790e88a5a78f1f9cec35562847213adfb (diff) | |
| parent | 9f0521619796bd3952385c37d644559a1882dcae (diff) | |
Merge branch 'master' into 345-clear-storage-action
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 13e720075..b4b229e03 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -248,4 +248,6 @@ <string name="error_action_open_deck_info">Open App info</string> <string name="error_action_open_network">Network settings</string> <string name="error_action_server_logs">Server logs</string> + <string name="info_box_maintenance_mode">Server in maintenance mode</string> + <string name="info_box_version_not_supported">Server version %1$s not supported, please update to %2$s</string> </resources> |