owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/res/drawable/bg_note_edit.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	metadata/uk/full_description.txt
This commit is contained in:
LucasGGamerM
2023-11-17 16:02:23 -03:00
parent 231d494955 d96b9558b4
commit da5186c7b5
78 changed files with 1289 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mastodon/src/main/res/values-es-rES/strings_sk.xml
View File

@@ -403,15 +403,28 @@
<string name="sk_trending_links_info_banner">Estas noticias están dando que hablar en todo el Fediverso.</string>
<string name="sk_blocked_accounts">Cuentas bloqueadas</string>
<string name="sk_muted_accounts">Cuentas silenciadas</string>
<string name="sk_settings_like_icon">Utilizar el corazón como icono favorito</string>
<string name="sk_settings_like_icon">Utilizar un corazón como icono de favorito</string>
<string name="sk_recently_used">Utilizado recientemente</string>
<string name="sk_set_as_default">Establecer por defecto</string>
<string name="sk_settings_color_palette_default">Por defecto (%s)</string>
<string name="sk_settings_underlined_links">Enlaces subrayados</string>
<string name="sk_settings_underlined_links">Subrayar enlaces</string>
<string name="sk_edit_alt_text">Editar el texto alternativo</string>
<string name="sk_settings_default_visibility">Visibilidad de la publicación predeterminada</string>
<string name="sk_settings_default_visibility">Visibilidad de publicación predeterminada</string>
<string name="sk_settings_lock_account">Aprobar nuevos seguidores manualmente</string>
<string name="sk_timeline_cache_cleared">Caché de la línea de tiempo de inicio borrada</string>
<string name="sk_settings_clear_timeline_cache">Borrar la caché de la línea de tiempo de inicio</string>
<string name="sk_timeline_cache_cleared">Caché de la cronología de inicio borrada</string>
<string name="sk_settings_clear_timeline_cache">Borrar la caché de la cronología de inicio</string>
<string name="sk_button_mutuals">Amigos</string>
<string name="sk_icon_snowflake">Copos de nieve</string>
<string name="sk_private_note_confirm">Confirmar los cambios en la nota</string>
<string name="sk_private_note_update_failed">No se pudo guardar la nota</string>
<string name="sk_icon_cloud">Nube</string>
<string name="sk_delete_note">Borrar la nota personal</string>
<string name="sk_icon_sunset">Puesta de sol</string>
<string name="sk_private_note_hint">Añadir una nota personal sobre este perfil</string>
<string name="sk_icon_water">Agua</string>
<string name="sk_icon_sun">Sol</string>
<string name="sk_add_note">Añadir una nota personal</string>
<string name="sk_icon_rain">Lluvia</string>
<string name="sk_icon_thunderstorm">Tormenta eléctrica</string>
<string name="sk_private_note_confirm_delete">¿Borrar la nota personal sobre %s\?</string>
</resources>