diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-06-01 15:28:24 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-06-01 15:28:24 +0300 |
| commit | 5e048176400665995bf05b1dce80be915f895643 (patch) | |
| tree | ca90e2145b7979561175740c9c966eacbd550f74 /app/src/main/res/values | |
| parent | 68f8f7b7f796cc1e9bbbbc700e1de3bcf1b5eda9 (diff) | |
| parent | 558f68e201648bd67cf20c0c34b2b2a2b0736497 (diff) | |
Merge branch 'master' into branding
# Conflicts:
# 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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ddcbdb2b..e965bca2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,7 +86,7 @@ <string name="about_app_license_title">App license</string> <string name="about_app_license">This application is licensed under the GNU GENERAL PUBLIC LICENSE v3+.</string> <string name="about_app_license_button">View license</string> - <string name="about_app_icon_author" translatable="false"><a href="http://jancborchardt.net/">Jan C. Borchardt</a> (<a href="https://github.com/owncloud/notes/commits/master/img/notes.svg">GitHub</a>)</string> + <string name="about_app_icon_author" translatable="false"><a href="http://jancborchardt.net/">Jan C. Borchardt</a> (<a href="https://github.com/nextcloud/notes/blob/76d15214f80f2bf7ea08427bff73ad145128f090/img/notes.svg">GitHub</a>)</string> <string name="about_icons_disclaimer_title">Icons</string> <string name="about_icons_disclaimer"><p>Original icon made by %1$s</p><p>All further icons used by this app are <a href="https://materialdesignicons.com/">Material Design Icons</a> made by Google Inc. and licensed under the Apache 2.0 License.</p></string> <string name="about_credits_tab_title">Credits</string> @@ -181,6 +181,11 @@ <string name="error_dialog_insufficient_storage">Your Nextcloud instance has no free storage left. Please delete some files to sync your local changes into your cloud.</string> <string name="error_dialog_contact_us">Please do not hesitate to contact us if the issues persist. You can find our contact information in the about section in the sidebar.</string> <string name="error_dialog_we_need_info">We need the following technical information to help you:</string> + <string name="error_dialog_server_app_enabled">Please make sure you have installed and enabled the "Notes" app on your server.</string> + <string name="error_dialog_redirect">Your server did respond with a HTTP 302 status code, which implies, that you do not have installed the Notes app on your server or something is misconfigured. This can be caused by custom overrides in a .htaccess-file or by Nextcloud apps like OID Client.</string> + <string name="added_content">Added "%1$s"</string> + <string name="shared_text_empty">Shared text was empty</string> + <string name="append_to_note">Append to note</string> <string name="settings_branding">Branding</string> <string name="simple_security">Security</string> <string name="simple_appearance">Appearance</string> |