mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 23:27:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into branding

Browse source 
# 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values-nl/strings.xml
View file

@ -151,6 +151,8 @@
<string name="added_content">\"%1$s\" toegevoegd</string> <string name="added_content">\"%1$s\" toegevoegd</string>
<string name="shared_text_empty">Gedeelde tekst was leeg</string> <string name="shared_text_empty">Gedeelde tekst was leeg</string>
<string name="append_to_note">Achteraan toevoegen aan notitie</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 --> <!-- Array: note modes -->
<string-array name="noteMode_entries"> <string-array name="noteMode_entries">
<item>Open in wbewerkmodus</item> <item>Open in wbewerkmodus</item>

2
app/src/main/res/values-tr/strings.xml
View file

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

1
fastlane/metadata/android/en-US/changelogs/2013000.txt
View file

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