diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-06-06 11:42:54 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-06-06 11:42:54 +0300 |
| commit | 613cf63c9a62d99a7c67a3b83e2377feb2b6d9b3 (patch) | |
| tree | d5eba44eb23f75da20362a5fb74187cc5dc4cb8d /app/src/main | |
| parent | 3d5afce677122e2b33cb13b8ebd39808a1009ee5 (diff) | |
| parent | 628c1d1d0a643ca8a93f7aa4550ef0d09e575053 (diff) | |
Merge branch 'master' into branding
# Conflicts:
# app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/values-nl/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values-tr/strings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 808e2899..1ba46f37 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -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> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3d6a8234..9c95df31 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -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> |