diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-06-13 14:01:24 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-06-13 14:01:24 +0300 |
| commit | c3630231d4d9d27d65414d11e3fd4b08572b4f9d (patch) | |
| tree | e2d9ead4d2cdab74afb90e780b90c7f9b14503bb /app/src/main/res/values-es/strings.xml | |
| parent | f0b4c24aa941be2a3c423efe61d4e1b6505f6b04 (diff) | |
| parent | 0e6afd42e37166c1f70e57d19d60d8e06f00b966 (diff) | |
Merge branch 'master' into 603-sorting-method
# Conflicts:
# app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java
# app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/AbstractNotesDatabase.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
# app/src/main/res/layout/activity_notes_list_view.xml
# app/src/main/res/menu/menu_list_view.xml
Diffstat (limited to 'app/src/main/res/values-es/strings.xml')
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3c55f9d5..12279f9e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -13,6 +13,7 @@ <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="simple_about">Acerca de</string> + <string name="simple_accounts">Cuentas</string> <string name="simple_bold">Negrita</string> <string name="simple_link">Enlace</string> <string name="simple_italic">Cursiva</string> @@ -150,7 +151,12 @@ <string name="added_content">Se ha añadido «%1$s»</string> <string name="shared_text_empty">El texto compartido estaba vacío</string> <string name="append_to_note">Añadir a la nota</string> - + <string name="settings_branding">Branding</string> + <string name="simple_security">Seguridad</string> + <string name="simple_appearance">Apariencia</string> + <string name="simple_synchronization">Sincronización</string> + <string name="share_multiple">Compartido contenido de %1$d notas</string> + <string name="manage_accounts">Gestionar cuentas</string> <!-- Array: note modes --> <string-array name="noteMode_entries"> <item>Abrir en modo edición</item> @@ -184,4 +190,10 @@ <item quantity="one">%d selecionado</item> <item quantity="other">%d seleccionados</item> </plurals> -</resources> + + <string name="formatting_help_text_title">Text</string> + <string name="formatting_help_checkboxes_title">Casillas de verificación</string> + <string name="formatting_help_code_title">Código</string> + <string name="formatting_help_unsupported_title">No soportado</string> + <string name="formatting_help_unsupported_body_3">Imágenes</string> + </resources> |