Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 613cf63c authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into branding 

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
parents 3d5afce6 628c1d1d

app/src/main/res/values-nl/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

app/src/main/res/values-tr/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

fastlane/metadata/android/en-US/changelogs/2013000.txt

+2 −1
Original line number Diff line number Diff line 
- 📩 Bulk share content of multiple notes

- 🔧 Move note list widget preferences to database (#832)

- 🐞 Searching for ? character crashes the app (#846)
 
 No newline at end of file