Merge branch 'master' into branding

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
This commit is contained in:
Stefan Niedermann 2020-06-06 10:42:54 +02:00
commit 613cf63c9a
3 changed files with 6 additions and 1 deletions

View file

@ -151,6 +151,8 @@
<string name="added_content">\"%1$s\" toegevoegd</string>
<string name="shared_text_empty">Gedeelde tekst was leeg</string>
<string name="append_to_note">Achteraan toevoegen aan notitie</string>
<string name="share_multiple">Deel de inhoud van %1$d notities</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Open in wbewerkmodus</item>

View file

@ -150,6 +150,8 @@
<string name="added_content">\"%1$s\" eklendi</string>
<string name="shared_text_empty">Paylaşılan metin boş</string>
<string name="append_to_note">Nota ekle</string>
<string name="share_multiple">%1$d notun içeriğini paylaş</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Düzenleme kipinde aç</item>

View file

@ -1,2 +1,3 @@
- 📩 Bulk share content of multiple notes
- 🔧 Move note list widget preferences to database (#832)
- 🐞 Searching for ? character crashes the app (#846)