diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-01-05 21:46:46 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-01-05 21:46:46 +0300 |
commit | efa1a8f9cbf786b7c391dbbf07dd8aa78e0ccac4 (patch) | |
tree | c4057a69238a41492cd1119d31378b5380c71a3b /app/src/main/res/values-da | |
parent | 0fe4b5b4b101e6a303e9b9629d38dace6de2651f (diff) | |
parent | 8fdbd61b683444df52bdc0e2209b2254013f8fc9 (diff) |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteReadonlyFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
# app/src/main/res/drawable/ic_format_bold_black_24dp.xml
# app/src/main/res/drawable/ic_format_italic_black_24dp.xml
# app/src/main/res/drawable/ic_insert_link_black_24dp.xml
# app/src/main/res/menu/context_based_formatting.xml
# app/src/main/res/menu/context_based_range_formatting.xml
# app/src/main/res/values/strings.xml
# app/src/test/java/it/niedermann/owncloud/notes/shared/util/MarkDownUtilTest.java
# app/src/test/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessorTest.java
Diffstat (limited to 'app/src/main/res/values-da')
-rw-r--r-- | app/src/main/res/values-da/strings.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 36627dbb..a78e7a76 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -14,9 +14,7 @@ <string name="simple_edit">Rediger</string> <string name="action_edit_save">Gem</string> <string name="simple_about">Om</string> - <string name="simple_bold">Fed</string> <string name="simple_link">Link</string> - <string name="simple_italic">Kursiv</string> <string name="action_note_deleted">%1$s blev slettet</string> <string name="action_note_restored">%1$s blev gendannet</string> <string name="action_undo">Fortryd</string> @@ -49,7 +47,6 @@ <string name="error_sync">Synkronisering fejlede: %1$s</string> <string name="error_synchronization">Synkroniseringen mislykkedes</string> - <string name="error_json">Er Noter appen aktiveret på serveren?</string> <string name="error_no_network">Ingen netværksforbindelse</string> <string name="error_unknown">En ukendt fejl er opstået</string> @@ -96,7 +93,6 @@ <string name="simple_close">Luk</string> <string name="simple_copy">Kopier</string> <string name="simple_exception">Undtagelse</string> - <string name="copied_to_clipboard">Kopieret til udklipsholder</string> <string name="pin_to_homescreen">Fastgør til hjemmeskærm</string> <string name="note_has_been_deleted">Denne note er blevet slettet</string> <string name="add_account">Tilføj konto</string> @@ -107,17 +103,14 @@ <string name="account_already_imported">Kontoen er allerede importeret</string> <string name="no_notes_yet">Ingen noter endnu</string> <string name="no_notes_yet_description">Tryk på + for at oprette en ny note</string> - <string name="could_not_load_preview_two_digit_numbered_list">Forhåndsvisningen kunne ikke indlæses. Kontroller om der er et listeemne nummereret med to cifre og uden indhold.</string> <string name="simple_more">Mere</string> <string name="simple_move">Flyt</string> - <string name="checkbox_could_not_be_toggled">Afrkydsningsfeltet kunne ikke skiftes.</string> <string name="category_readonly">Skrivebeskyttet</string> <string name="no_category">Ingen kategori</string> <string name="add_category">Tilføj %1$s</string> <string name="simple_checkbox">Afkrydsningsfeldt</string> <string name="unlock_notes">Lås noter op</string> <string name="simple_beta">Beta</string> - <string name="could_not_copy_to_clipboard">Kunne ikke kopiere til udklipsholderen</string> <string name="error_dialog_title">Åh nej - hvad nu? 🙁</string> <string name="error_dialog_tip_token_mismatch_retry">Forsøg venligst at tvinge app\'en til at lukke og start den påny igen. Der kan have været en ukorrekt forbindelse til Nextcloud-app\'en.</string> <string name="error_dialog_tip_token_mismatch_clear_storage">Hvis problemet ikke løses, så forsøg at rydde lageret for begge apps: Nextcloud og Nextcloud Notes, for at løse problemet.</string> @@ -199,8 +192,6 @@ <string name="formatting_help_lists_body_3">To</string> <string name="formatting_help_lists_body_4">Tre</string> <string name="formatting_help_code_title">Kode</string> - <string name="formatting_help_unsupported_title">Ikke understøttet</string> - <string name="formatting_help_unsupported_body_3">Billeder</string> <string name="simple_other">Andet</string> <string name="sort_last_modified">Sortér efter dato ændret</string> <string name="sort_alphabetically">Sortér alfabetisk</string> |