diff options
author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-05-02 19:20:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-02 19:20:00 +0300 |
commit | 9c9392f8e1c457f5c01271d8be6ecdcb9f7082ad (patch) | |
tree | 4b43187f7576d7e839ee519bd33dca1e57845563 /app | |
parent | 64bcd801d643bfe1534bc7638ef67c284a02bf65 (diff) | |
parent | efcf6b5af97a6099ca11bef238eeb71dd7ebbe31 (diff) |
Merge branch 'master' into 1167-retrofit
Diffstat (limited to 'app')
-rw-r--r-- | app/build.gradle | 4 | ||||
-rw-r--r-- | app/src/main/res/values-es/strings.xml | 18 | ||||
-rw-r--r-- | app/src/main/res/values-eu/strings.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/values-pt-rBR/strings.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values-sl/strings.xml | 16 |
5 files changed, 50 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index 27f6a08b..3dcaf300 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,8 +78,8 @@ dependencies { implementation 'com.github.stefan-niedermann:android-commons:0.2.0' // Glide - implementation 'com.github.bumptech.glide:glide:4.11.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + implementation 'com.github.bumptech.glide:glide:4.12.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' // Markdown implementation project(path: ':markdown') diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b6e94bc1..4edaecf3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -6,12 +6,14 @@ <string name="label_all_notes">Todas las notas</string> <string name="label_favorites">Favoritos</string> <string name="action_create">Nueva nota</string> + <string name="welcome_text">Bienvenido a %1$s</string> <string name="action_settings">Ajustes</string> <string name="action_trashbin">Notas eliminadas</string> <string name="action_search">Buscar</string> <string name="action_sorting_method">Método de orden</string> <string name="simple_cancel">Cancelar</string> <string name="simple_edit">Editar</string> + <string name="simple_remove">Borrar</string> <string name="action_edit_save">Guardar</string> <string name="simple_about">Acerca de</string> <string name="simple_link">Enlace</string> @@ -42,7 +44,11 @@ <string name="settings_font_title">Tipo de letra monoespaciado</string> <string name="settings_font_size">Tamaño de fuente</string> <string name="settings_wifi_only">Sincronizar solo sobre Wi-Fi</string> + <string name="settings_lock">Bloqueo de App (Beta)</string> + <string name="settings_lock_summary">Credenciales del dispositivo</string> <string name="settings_background_sync">Sincronización en segundo plano</string> + <string name="settings_prevent_screen_capture">Evitar la captura de pantalla</string> + <string name="error_sync">Fallo en la sincronización: %1$s</string> <string name="error_synchronization">Fallo en la sincronización</string> <string name="error_no_network">Sin conexión de red</string> @@ -132,7 +138,9 @@ <string name="change_note_title">Cambiar título de la nota</string> <string name="menu_edit_title">Editar título</string> <string name="settings_branding">Marca</string> + <string name="settings_gridview">Vista en cuadrícula</string> <string name="simple_security">Seguridad</string> + <string name="appearance_and_behavior">Apariencia y comportamiento</string> <string name="simple_synchronization">Sincronización</string> <string name="simple_behavior">Comportamiento</string> <string name="manage_accounts">Gestionar cuentas</string> @@ -239,5 +247,13 @@ <string name="error_action_open_network">Configuración de red</string> <string name="no_account_configured_yet">Todavía no hay una cuenta configurada</string> <string name="no_other_accounts">Aún no ha configurado ninguna otra cuenta.</string> + <string name="choose_account">Elija una cuenta</string> <string name="context_based_formatting">Ventana emergente para formato basado en el contexto</string> - </resources> + <plurals name="remove_account_message"> + <item quantity="one">La eliminación de la cuenta %1$s también eliminará irremediablemente un cambio no sincronizado. </item> + <item quantity="other">La eliminación de la cuenta %1$s también eliminará irremediablemente %2$d cambios no sincronizados.</item> + </plurals> + <string name="remove_account">Eliminar %1$s</string> + + <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Tienes que estar conectado a internet para poder añadir una cuenta.</string> +</resources> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 187fd1ee..c7d6a119 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -249,5 +249,11 @@ <string name="no_other_accounts">Oraindik ez duzu konturik konfiguratu.</string> <string name="choose_account">Aukeratu kontua</string> <string name="context_based_formatting">Testuinguruan oinarritutako formateatze leiho gainerakorra </string> + <plurals name="remove_account_message"> + <item quantity="one"> %1$skontua kentzeak berreskuraezinak diren sinkronizatu gabeko aldaketak ere ezabatuko ditu. </item> + <item quantity="other">%1$s kontua kentzeak berreskuraezinak diren%2$d sinkronizatu gabeko aldaketak ere ezabatuko ditu. </item> + </plurals> + <string name="remove_account">%1$s kendu </string> + <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Kontu bat gehitzeko internetera konektatuta egon behar zara.</string> </resources> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 66ea604e..5fa5d5e9 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -6,12 +6,14 @@ <string name="label_all_notes">Todas as notas</string> <string name="label_favorites">Favoritos</string> <string name="action_create">Nova nota</string> + <string name="welcome_text">Bem-vindo ao %1$s</string> <string name="action_settings">Configurações</string> <string name="action_trashbin">Anotações excluídas</string> <string name="action_search">Pesquisar</string> <string name="action_sorting_method">Método de ordenação</string> <string name="simple_cancel">Cancelar</string> <string name="simple_edit">Editar</string> + <string name="simple_remove">Remover</string> <string name="action_edit_save">Salvar</string> <string name="simple_about">Sobre</string> <string name="simple_link">Link</string> @@ -245,5 +247,13 @@ <string name="error_action_open_network">Configurações da rede</string> <string name="no_account_configured_yet">Nenhuma conta foi configurada</string> <string name="no_other_accounts">Você ainda não configurou nenhuma outra conta.</string> + <string name="choose_account">Escolha a conta </string> <string name="context_based_formatting">Formatação baseada no contexto popover</string> - </resources> + <plurals name="remove_account_message"> + <item quantity="one">Removendo a conta %1$s também excluirá uma alteração irrecuperável não foi sincronizada. </item> + <item quantity="other">Removendo a conta %1$s também irá deletar irrecuperávelmente %2$d mudanças não sincronizadas. </item> + </plurals> + <string name="remove_account">Remover %1$s</string> + + <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Você deve estar conectado à Internet para adicionar uma conta. </string> +</resources> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index bff54d00..5b369369 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -6,12 +6,14 @@ <string name="label_all_notes">Vse zabeležke</string> <string name="label_favorites">Priljubljene</string> <string name="action_create">Nova zabeležka</string> + <string name="welcome_text">Dobrodošli v %1$s</string> <string name="action_settings">Nastavitve</string> <string name="action_trashbin">Izbrisane zabeležke</string> <string name="action_search">Poišči</string> <string name="action_sorting_method">Način razvrščanja</string> <string name="simple_cancel">Prekliči</string> <string name="simple_edit">Uredi</string> + <string name="simple_remove">Odstrani</string> <string name="action_edit_save">Shrani</string> <string name="simple_about">O programu</string> <string name="simple_link">Povezava</string> @@ -138,7 +140,7 @@ <string name="settings_branding">Prilagajanje oblikovanja</string> <string name="settings_gridview">Mrežni pogled</string> <string name="simple_security">Varnost</string> - <string name="appearance_and_behavior">Izgled in obnašanje</string> + <string name="appearance_and_behavior">Videz in obnašanje</string> <string name="simple_synchronization">Usklajevanje</string> <string name="simple_behavior">Obnašanje</string> <string name="manage_accounts">Upravljanje z računi</string> @@ -253,5 +255,15 @@ <string name="error_action_open_network">Nastavitve omrežja</string> <string name="no_account_configured_yet">Ni nastavljenega nobenega računa</string> <string name="no_other_accounts">Ni nastavljenega nobenega drugega računa</string> + <string name="choose_account">Izbor računa</string> <string name="context_based_formatting">Pojavno okno vsebinskega oblikovanja</string> - </resources> + <plurals name="remove_account_message"> + <item quantity="one">Odstranjevanje računa %1$s trajno izbriše tudi neusklajeno spremembo.</item> + <item quantity="two">Odstranjevanje računa %1$s trajno izbriše tudi %2$d neusklajeni spremembi.</item> + <item quantity="few">Odstranjevanje računa %1$s trajno izbriše tudi %2$d neusklajene spremembe.</item> + <item quantity="other">Odstranjevanje računa %1$s trajno izbriše tudi %2$d neusklajenih sprememb.</item> + </plurals> + <string name="remove_account">Odstrani %1$s</string> + + <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Za dodajanje računa mora biti vzpostavljena povezava z omrežjem.</string> +</resources> |