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

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	metadata/ru/full_description.txt
This commit is contained in:
LucasGGamerM
2023-08-24 08:17:57 -03:00
parent 3db74fb958 40a033d692
commit afc401c1f2
65 changed files with 2604 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mastodon/src/main/res/values-sl-rSI/strings.xml
View File

@@ -15,6 +15,7 @@
<string name="user_sent_follow_request">%s vam je poslal_a zahtevo za sledenje</string>
<string name="user_favorited">%s je vzljubil/a vašo objavo</string>
<string name="notification_boosted">%s je izpostavila/a vašo objavo</string>
<string name="poll_ended">Pokaži rezultate ankete, v kateri sem sodeloval_a</string>
<string name="share_toot_title">Deli</string>
<string name="settings">Nastavitve</string>
<string name="publish">Objavi</string>
@@ -40,6 +41,7 @@
<string name="button_follow">Sledi</string>
<string name="button_following">Sledi</string>
<string name="edit_profile">Uredi profil</string>
<string name="share_user">Profil v skupno rabo</string>
<string name="mute_user">Utišaj %s</string>
<string name="unmute_user">Odtišaj %s</string>
<string name="block_user">Blokiraj %s</string>
@@ -206,6 +208,7 @@
<string name="visibility_public">Javno</string>
<string name="visibility_followers_only">Samo sledilci</string>
<string name="visibility_private">Samo osebe, ki jih omenjam</string>
<string name="recent_searches">Nedavno</string>
<string name="skip">Preskoči</string>
<string name="notification_type_follow">Novi sledilci</string>
<string name="notification_type_favorite">Priljubljeni</string>
@@ -230,6 +233,8 @@
<string name="settings_clear_cache">Počisti medijski predpomnilnik</string>
<string name="settings_app_version">Mastodon za Android v%1$s (%2$d)</string>
<string name="media_cache_cleared">Predpomnilnik medijev počiščen</string>
<string name="confirm_log_out">Ali se želite odjaviti iz %s?</string>
<string name="sensitive_content_explain">Avtor je to vsebino označil kot občutljivo.</string>
<string name="avatar_description">Pojdi na profil %s</string>
<string name="more_options">Več možnosti</string>
<string name="new_post">Nova objava</string>
@@ -265,6 +270,7 @@
<string name="file_saved">Datoteka shranjena</string>
<string name="downloading">Prejemanje …</string>
<string name="no_app_to_handle_action">Ni programa za ravnanje s tem dejanjem</string>
<string name="local_timeline">Krajevno</string>
<string name="trending_posts_info_banner">To so objave, ki plenijo pozornost po Mastodonu.</string>
<!-- %s is the server domain -->
<string name="see_new_posts">Pokaži nove objave</string>
@@ -424,8 +430,13 @@
<string name="mark_all_notifications_read">Označi vse kot prebrano</string>
<string name="settings_filters">Filtri</string>
<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
<string name="about_app">O programu %s</string>
<string name="default_post_language">Privzeti jezik objave</string>
<string name="pause_all_notifications">Premor za vse</string>
<string name="pause_notifications_off">Izklopljeno</string>
<string name="notifications_policy_no_one">Nihče</string>
<string name="notification_type_mentions_and_replies">Omembe in odgovori</string>
<string name="pause_all_notifications_title">Zaustavi vsa obvestila</string>
<!-- %1$s is the date (may be relative, e.g. "today" or "yesterday"), %2$s is the time. You can reorder these placeholders if that works better for your language -->
<string name="today">danes</string>
<string name="yesterday">včeraj</string>
@@ -436,20 +447,28 @@
<string name="about_server">O programu</string>
<string name="server_rules">Pravila</string>
<string name="server_administrator">Skrbnik</string>
<string name="settings_even_more">Še več nastavitev</string>
<string name="settings_show_cws">Pokaži opozorilo o vsebini</string>
<string name="settings_hide_sensitive_media">Skrij medij, ki je označen kot občutljiv</string>
<string name="count_one">Ena</string>
<string name="alt_text_reminder_post_anyway">Objavi</string>
<!-- %s is the username -->
<string name="filter_active">Dejaven</string>
<string name="filter_inactive">Nedejaven</string>
<string name="settings_add_filter">Dodaj filter</string>
<string name="settings_edit_filter">Uredi filter</string>
<string name="settings_filter_duration">Trajanje</string>
<string name="settings_filter_muted_words">Utišane besede</string>
<string name="settings_filter_show_cw">Pokaži z oporozilom o vsebini</string>
<string name="settings_delete_filter">Izbriši filter</string>
<string name="filter_duration_forever">Za vedno</string>
<!-- %s is the timestamp ("tomorrow at 12:34") -->
<string name="filter_context_notifications">Obvestila</string>
<string name="filter_context_public_timelines">Javne časovnice</string>
<string name="filter_context_threads_replies">Niti in odgovori</string>
<string name="filter_context_profiles">Profili</string>
<string name="settings_filter_title">Naslov</string>
<string name="settings_delete_filter_title">Ali želite izbrisati filter »%s«?</string>
<string name="add">Dodaj</string>
<string name="filter_word_or_phrase">Beseda ali besedna zveza</string>
<string name="select_all">Izberi vse</string>
@@ -457,12 +476,18 @@
<string name="filter_duration_custom">Po meri</string>
<string name="required_form_field_blank">Ne sme biti prazno</string>
<string name="filter_word_already_in_list">Že na seznamu</string>
<string name="app_update_ready">Posodobitev aplikacije je pripravljena</string>
<string name="app_update_version">Različica %s</string>
<string name="downloading_update">Prenos %d%%</string>
<!-- Shown like a content warning, %s is the name of the filter -->
<string name="post_matches_filter_x">Se ujema s filtrom »%s«</string>
<string name="search_mastodon">Išči v Mastodonu</string>
<string name="clear_all">Počisti vse</string>
<string name="search_open_url">Odpri URL v Mastodonu</string>
<string name="posts_matching_hashtag">Objave s/z »%s«</string>
<string name="search_go_to_account">Pojdi na %s</string>
<string name="posts_matching_string">Objave s/z »%s«</string>
<string name="accounts_matching_string">Osebe s/z »%s«</string>
<!-- Shown in the post header. Please keep it short -->
<string name="time_seconds_ago_short">pred %d s</string>
<string name="time_minutes_ago_short">pred %d meseci</string>

26
mastodon/src/main/res/values-sl-rSI/strings_sk.xml
View File

@@ -252,7 +252,7 @@
<string name="sk_icon_gauge">Merilnik</string>
<string name="sk_expand">Razširi</string>
<string name="sk_unfinished_attachments_message">Nekatere priloge se niso naložile do konca.</string>
<string name="sk_settings_prefix_reply_cw_with_re">CW predpona odgovora z »re:«</string>
<string name="sk_settings_prefix_reply_cw_with_re">CW predpona odgovora z “re:”</string>
<string name="sk_collapse">Strni</string>
<string name="sk_settings_collapse_long_posts">Strni zelo dolge objave</string>
<string name="sk_filtered">Filtrirano: %s</string>
@@ -312,4 +312,28 @@
<string name="sk_reacted_with">%1$s se je odzval z %2$s</string>
<string name="sk_reacted">%s se je odzval</string>
<string name="sk_bubble_timeline_info_banner">To so najnovejše objave iz omrežja, ki so jih kurirali skrbniki vaše instance.</string>
<string name="sk_settings_auto_reveal_equal_spoilers">Samodejno razkrij enake CW-je v odgovorih</string>
<string name="sk_settings_auto_reveal_nobody">Nikoli</string>
<string name="sk_settings_auto_reveal_author">Odgovori istega avtorja</string>
<string name="sk_settings_auto_reveal_anyone">Odgovori vseh</string>
<string name="sk_settings_prefix_replies_always">V odgovor komurkoli</string>
<string name="sk_settings_prefix_replies_never">Nikoli</string>
<string name="sk_settings_prefix_replies_to_others">Samo v odgovoru drugim</string>
<string name="sk_list_exclusive_switch_explanation">Člani ekskluzivnega seznama ne bodo prikazani na vaši domači časovnici – če to podpira vaša instanca.</string>
<string name="sk_advanced_options_show">Prikaži napredne možnosti</string>
<string name="sk_advanced_options_hide">Skrij napredne možnosti</string>
<string name="sk_exclusive_list">Ekskluzivni seznam</string>
<string name="sk_list_exclusive_switch">Naj bo seznam ekskluziven</string>
<string name="sk_settings_forward_report_default">Privzeto stikalo “Posreduj poročilo”</string>
<string name="sk_followed_as">Spremljan od %s</string>
<string name="sk_settings_default_content_type_explanation">To vam omogoča, da pri ustvarjanju novih objav predhodno izberete vrsto vsebine, s čimer prepišete vrednost, nastavljeno v »Nastavitvah objav«.</string>
<string name="sk_settings_allow_remote_loading_explanation">Poskusite pridobiti natančnejše sezname za sledilce, všečke in spodbude, tako da naložite informacije iz originalne instance.</string>
<string name="sk_spoiler_show">Prikaži vsebino</string>
<string name="sk_pronouns_label">Zaimki</string>
<string name="sk_switch_timeline">Preklopi časovnico</string>
<string name="sk_settings_instance">Instanca</string>
<string name="sk_disable_pill_shaped_active_indicator">Onemogoči indikator aktivnega zavihka v obliki tabletke</string>
<string name="sk_settings_true_black">Čisto črni način</string>
<string name="sk_settings_reply_visibility_self">Odgovori meni</string>
<string name="sk_search_fediverse">Iskanje v Fediverse</string>
</resources>