diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-04-02 20:03:41 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-04-02 20:15:54 +0300 |
| commit | e38805a4d86e3e3a757677689e86cdbbd136a5ea (patch) | |
| tree | 36f292ebcba5b5abcb656eb40c2a6aaf8497963c /app/src/main/res/values-da | |
| parent | 1a0e99fd4d456e02ef38332fc1a50ad842f0142a (diff) | |
| parent | 0b48efa8b20c2dfca87f3ca78bdcb65227160093 (diff) | |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.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/NotePreviewFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/AbstractNotesDatabase.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_19_20.java
# app/src/main/res/values-hu-rHU/strings.xml
Diffstat (limited to 'app/src/main/res/values-da')
| -rw-r--r-- | app/src/main/res/values-da/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a78e7a76..094f3e18 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -42,9 +42,7 @@ <string name="settings_font_title">Monospace font</string> <string name="settings_font_size">Skriftstørrelse</string> <string name="settings_wifi_only">Synk kun på Wi-Fi</string> - <string name="settings_lock">Password protection</string> <string name="settings_background_sync">Synkronisering i baggrunden</string> - <string name="error_sync">Synkronisering fejlede: %1$s</string> <string name="error_synchronization">Synkroniseringen mislykkedes</string> <string name="error_no_network">Ingen netværksforbindelse</string> @@ -110,7 +108,6 @@ <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="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> @@ -133,9 +130,7 @@ <string name="change_note_title">Skift titel på note</string> <string name="menu_edit_title">Rediger titel</string> <string name="settings_branding">Branding</string> - <string name="settings_gridview">Gittervisning</string> <string name="simple_security">Sikkerhed</string> - <string name="simple_appearance">Udseende</string> <string name="simple_synchronization">Synchronization</string> <string name="simple_behavior">Adfærd</string> <string name="manage_accounts">Administrer konti</string> |