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/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
#	mastodon/src/main/res/color/bookmark_icon.xml
#	mastodon/src/main/res/color/boost_icon.xml
#	mastodon/src/main/res/color/favorite_icon.xml
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/layout/tab_bar.xml
#	mastodon/src/main/res/values/palettes.xml
#	mastodon/src/main/res/values/styles.xml
#	metadata/uk/changelogs/51.txt
#	metadata/uk/changelogs/56.txt
#	metadata/uk/changelogs/61.txt
#	metadata/uk/full_description.txt
This commit is contained in:
LucasGGamerM
2023-10-12 14:58:23 -03:00
parent 3c603d5dbc d6040c0895
commit ce3ca42c7a
241 changed files with 1110 additions and 1636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,26 @@
<string name="sk_settings_content_types_explanation">Markdown bezalako eduki-mota ezartzea ahalbidetzen du bidalketa bat sortzerakoan. Gogoan izan instantzia guztiek ez dutela hau baimentzen.</string>
<string name="sk_settings_default_content_type">Eduki-mota lehenetsia</string>
<string name="sk_settings_confirm_before_reblog">Berretsi bultzatu aurretik</string>
<string name="sk_reacted_with">%s bezala erreakzionatuta</string>
<string name="sk_reacted">erreakzionatuta</string>
<string name="sk_reacted_with">%1$s-(e)k honela erreakzionatu du: %2$s</string>
<string name="sk_reacted">%s-(e)k erreakzionatu du</string>
<string name="sk_timeline_bubble">Burbuila</string>
<string name="sk_edit_timeline_tags_hint">Sartu traolak…</string>
<string name="sk_add_timeline">Gehitu denbora-lerroa</string>
<string name="sk_edit_timeline_tags_explanation">Jakin eragiketa hauek zerbitzariak kudeatzen dituela. Litekeena da konbinazioetarako euskarririk ez izatea.</string>
<string name="sk_settings_unifiedpush_no_distributor_body">Banatzaile bat instalatu behar duzu UnifiedPush jakinarazpenek funtzionatzeko. Informazio gehiago: https://unifiedpush.org/</string>
<string name="sk_icon_feed">Jarioa</string>
<string name="sk_edit_timeline_tag_main">Traola hau duten tootak…</string>
<string name="sk_icon_verified">Egiaztatua</string>
<string name="sk_hashtag_timeline_local_only_switch">Erakutsi toot lokalak soilik\?</string>
<string name="sk_icon_umbrella">Euritakoa</string>
<string name="sk_settings_unifiedpush_no_distributor">Ez da banatzailerik aurkitu</string>
<string name="sk_edit_timeline_tag_any">...edo hauetako edozein</string>
<string name="sk_edit_timeline_tag_all">...eta hauek guztiak</string>
<string name="sk_icon_diamond">Diamantea</string>
<string name="sk_edit_timeline_tag_hint">Sartu traola…</string>
<string name="sk_edit_timeline_tag_none">...baina hauetako bat ere ez</string>
<string name="sk_settings_unifiedpush_choose">Aukeratu banatzaile bat</string>
<string name="sk_icon_recycle_bin">Zakarrontzia</string>
<string name="sk_trending_links_info_banner">Hauek dira zure zerbitzarian komentatzen ari diren albisteak</string>
<string name="sk_add_timeline_tag_error_empty">Traola ezin da hutsik egon</string>
</resources>