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

# Conflicts: # README.md # build.gradle # mastodon/build.gradle # mastodon/src/main/AndroidManifest.xml # mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java # mastodon/src/main/java/org/joinmastodon/android/MainActivity.java # mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java # mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java # mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.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/HomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java # mastodon/src/main/java/org/joinmastodon/android/model/Status.java # mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java # mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java # mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml # mastodon/src/main/res/color/button_text_primary_light_on_dark.xml # mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml # mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml # mastodon/src/main/res/drawable/bg_search_field.xml # mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml # mastodon/src/main/res/layout/compose_action.xml # mastodon/src/main/res/layout/compose_media_thumb.xml # mastodon/src/main/res/layout/compose_poll_option.xml # mastodon/src/main/res/layout/display_item_footer.xml # mastodon/src/main/res/layout/display_item_header.xml # mastodon/src/main/res/layout/display_item_text.xml # mastodon/src/main/res/layout/fragment_compose.xml # mastodon/src/main/res/layout/fragment_profile.xml # mastodon/src/main/res/layout/item_instance_category.xml # mastodon/src/main/res/layout/item_report_choice.xml # mastodon/src/main/res/layout/item_settings_footer.xml # mastodon/src/main/res/layout/item_settings_switch.xml # mastodon/src/main/res/layout/item_settings_theme.xml # mastodon/src/main/res/layout/item_settings_theme_subitem.xml # mastodon/src/main/res/layout/item_settings_update.xml # mastodon/src/main/res/layout/tab_bar.xml # mastodon/src/main/res/menu/mute_duration.xml # mastodon/src/main/res/values-de-rDE/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-fa/strings_sk.xml # mastodon/src/main/res/values-night/colors.xml # mastodon/src/main/res/values-nl-rNL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # mastodon/src/main/res/values-zh-rCN/strings_sk.xml # mastodon/src/main/res/values/attrs.xml # mastodon/src/main/res/values/ids.xml # mastodon/src/main/res/values/styles.xml # metadata/es/changelogs/83.txt
2023-08-20 11:36:16 -03:00
parent 8f4363a2d8
commit 93818903c8
753 changed files with 28298 additions and 14085 deletions
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="get_started">Ustvari račun</string>
-	<string name="already_have_account">Račun že imam</string>
 	<string name="log_in">Prijava</string>
 	<string name="next">Naprej</string>
 	<string name="loading_instance">Pridobivanje podatkov o strežniku ...</string>
@@ -13,15 +11,10 @@
 	<string name="user_boosted">%s je izpostavil/a</string>
 	<string name="in_reply_to">Kot odgovor %s</string>
 	<string name="notifications">Obvestila</string>
-	<string name="user_followed_you">vam sledi</string>
-	<string name="user_sent_follow_request">vam je poslal_a zahtevo za sledenje</string>
-	<string name="user_favorited">je vzljubil_a vašo objavo</string>
-	<string name="notification_boosted">je izpostavil/a vašo objavo</string>
-	<string name="poll_ended">anketa je zaključena</string>
-	<string name="time_seconds">%d s</string>
-	<string name="time_minutes">%d m</string>
-	<string name="time_hours">%d ur</string>
-	<string name="time_days">%d d</string>
+	<string name="user_followed_you">%s vam sledi</string>
+	<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="share_toot_title">Deli</string>
 	<string name="settings">Nastavitve</string>
 	<string name="publish">Objavi</string>
@@ -40,12 +33,6 @@
 		<item quantity="few">sledi</item>
 		<item quantity="other">sledi</item>
 	</plurals>
-	<plurals name="posts">
-		<item quantity="one">objava</item>
-		<item quantity="two">objavi</item>
-		<item quantity="few">objave</item>
-		<item quantity="other">objav</item>
-	</plurals>
 	<string name="posts">Objave</string>
 	<string name="posts_and_replies">Objave in odgovori</string>
 	<string name="media">Mediji</string>
@@ -53,8 +40,6 @@
 	<string name="button_follow">Sledi</string>
 	<string name="button_following">Sledi</string>
 	<string name="edit_profile">Uredi profil</string>
-	<string name="mention_user">Omeni %s</string>
-	<string name="share_user">Deli %s</string>
 	<string name="mute_user">Utišaj %s</string>
 	<string name="unmute_user">Odtišaj %s</string>
 	<string name="block_user">Blokiraj %s</string>
@@ -94,7 +79,6 @@
 		<item quantity="few">%d dnevi</item>
 		<item quantity="other">%d dni</item>
 	</plurals>
-	<string name="compose_poll_duration">Trajanje: %s</string>
 	<plurals name="x_seconds_left">
 		<item quantity="one">Preostane še %d s</item>
 		<item quantity="two">Preostane še %d s</item>
@@ -119,12 +103,6 @@
 		<item quantity="few">na voljo še %d dnevi</item>
 		<item quantity="other">na voljo še %d dni</item>
 	</plurals>
-	<plurals name="x_voters">
-		<item quantity="one">%,d glasovalec</item>
-		<item quantity="two">%,d glasovalca</item>
-		<item quantity="few">%,d glasovalci</item>
-		<item quantity="other">%,d glasovalcev</item>
-	</plurals>
 	<string name="poll_closed">Zaprto</string>
 	<string name="confirm_mute_title">Utišaj račun</string>
 	<string name="confirm_mute">Potrdite utišanje %s</string>
@@ -140,10 +118,8 @@
 	<string name="confirm_unblock_domain_title">Odblokiraj domeno</string>
 	<string name="confirm_unblock">Potrdite umik blokade %s</string>
 	<string name="do_unblock">Odblokiraj</string>
-	<string name="button_muted">Utišan</string>
 	<string name="button_blocked">Blokirano</string>
 	<string name="action_vote">Glasuj</string>
-	<string name="tap_to_reveal">Tapnite za razkritje</string>
 	<string name="delete">Izbriši</string>
 	<string name="confirm_delete_title">Izbriši objavo</string>
 	<string name="confirm_delete">Ali ste prepričani, da želite izbrisati to objavo?</string>
@@ -165,12 +141,6 @@
 		<item quantity="few">%d osebe se pogovarjajo</item>
 		<item quantity="other">%d oseb se pogovarja</item>
 	</plurals>
-	<plurals name="discussed_x_times">
-		<item quantity="one">Omenjeno %d-krat</item>
-		<item quantity="two">Omenjeno %d-krat</item>
-		<item quantity="few">Omenjeno %d-krat</item>
-		<item quantity="other">Omenjeno %d-krat</item>
-	</plurals>
 	<string name="report_title">Prijavi %s</string>
 	<string name="report_choose_reason">Kaj je narobe s to objavo?</string>
 	<string name="report_choose_reason_account">Kaj je narobe s/z %s?</string>
@@ -190,22 +160,19 @@
 	<string name="report_comment_title">Je še kaj, za kar menite, da bi morali vedeti?</string>
 	<string name="report_comment_hint">Dodatni komentarji</string>
 	<string name="sending_report">Pošiljanje prijave ...</string>
-	<string name="report_sent_title">Hvala za prijavo, bomo preverili.</string>
-	<string name="report_sent_subtitle">Medtem, ko to pregledujemo, lahko proti %s ukrepate.</string>
+	<string name="report_sent_title">Hvala za poročilo, bomo preverili.</string>
+	<string name="report_sent_subtitle">Medtem, ko to pregledujemo, lahko proti %s ukrepate:</string>
 	<string name="unfollow_user">Prenehaj slediti %s</string>
 	<string name="unfollow">Prenehaj slediti</string>
-	<string name="mute_user_explain">Njihovih objav ali poobjav ne boste videli v svojem domačem viru. Ne bodo vedeli, da so utišani.</string>
-	<string name="block_user_explain">Nič več ne bodo mogli slediti ali videti vaše objave, lahko pa vidijo, če so blokirani.</string>
-	<string name="report_personal_title">Ali ne želite tega videti?</string>
-	<string name="report_personal_subtitle">Če vidite nekaj, česar na Masodonu ne želite, lahko odstranite osebo iz svoje izkušnje.</string>
+	<string name="mute_user_explain">Njihovih objav ne boste videli. Še vedno vam lahko sledijo in vidijo vaše objave, ne bodo pa vedeli, da so utišani.</string>
+	<string name="block_user_explain">Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.</string>
+	<string name="report_personal_title">Ne želite videti tega?</string>
+	<string name="report_personal_subtitle">Tukaj so vaše možnosti za nadzor tistega, kar vidite na Mastodonu:</string>
 	<string name="back">Nazaj</string>
-	<string name="instance_catalog_title">Mastodon tvorijo uporabniki z različnih strežnikov.</string>
-	<string name="instance_catalog_subtitle">Strežnik izberite glede na svoje zanimanje, regijo ali pa kar splošno. Še vedno se lahko povežete s komer koli, ne glede na strežnik.</string>
 	<string name="search_communities">Ime strežnika ali URL</string>
 	<string name="instance_rules_title">Pravila strežnika</string>
 	<string name="instance_rules_subtitle">Če nadaljujete, to pomeni, da se strinjate in da boste sledili naslednjim pravilom, ki so jih določili in jih uveljavljajo moderatorji %s.</string>
 	<string name="signup_title">Ustvari račun</string>
-	<string name="edit_photo">uredi</string>
 	<string name="display_name">Ime</string>
 	<string name="username">Uporabniško ime</string>
 	<string name="email">E-naslov</string>
@@ -228,26 +195,17 @@
 	<string name="confirm_email_title">Preverite svojo dohodno e-pošto</string>
 	<!-- %s is the email address -->
 	<string name="confirm_email_subtitle">Tapnite povezavo, ki smo vam jo poslali, da overite %s. Počakali bomo.</string>
-	<string name="confirm_email_didnt_get">Ali ste prejeli povezavo?</string>
+	<string name="confirm_email_didnt_get">Niste prejeli povezave?</string>
 	<string name="resend">Ponovno pošlji</string>
 	<string name="open_email_app">Odpri program za e-pošto</string>
 	<string name="resent_email">Potrditveno e-sporočilo poslano</string>
 	<string name="compose_hint">Vnesite ali prilepite, kar vam leži na duši</string>
 	<string name="content_warning">Opozorilo o vsebini</string>
-	<string name="add_image_description">Dodaj opis slike ...</string>
-	<string name="retry_upload">Ponovno poizkusi poslati</string>
-	<string name="edit_image">Uredi sliko</string>
 	<string name="save">Shrani</string>
 	<string name="add_alt_text">Dodaj nadomestno besedilo</string>
-	<string name="alt_text_subtitle">Nadomestno besedilo (alt) opisuje vaše fotografije ali slike osebam, ki imajo težave z vidom. Poskusite vključiti ravno prav podrobnosti, da bo kontekst jasen.</string>
-	<string name="alt_text_hint">npr. Pes gleda sumljivo naokoli z priškrnjenimi očmi proti kameri.</string>
 	<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="search_all">Vsi</string>
-	<string name="search_people">Ljudje</string>
-	<string name="recent_searches">Nedavna iskanja</string>
-	<string name="step_x_of_n">Korak %1$d od %2$d</string>
 	<string name="skip">Preskoči</string>
 	<string name="notification_type_follow">Novi sledilci</string>
 	<string name="notification_type_favorite">Priljubljeni</string>
@@ -256,49 +214,24 @@
 	<string name="notification_type_poll">Ankete</string>
 	<string name="choose_account">Izberite račun</string>
 	<string name="err_not_logged_in">Najprej se prijavite v Mastodon</string>
-	<plurals name="cant_add_more_than_x_attachments">
-		<item quantity="one">Ne morete dodati več kot %d medijsko priponko</item>
-		<item quantity="two">Ne morete dodati več kot %d medijski priponki</item>
-		<item quantity="few">Ne morete dodati več kot %d medijske priponke</item>
-		<item quantity="other">Ne morete dodati več kot %d medijskih priponk</item>
-	</plurals>
 	<string name="media_attachment_unsupported_type">Vrsta datoteke %s ni podprta</string>
 	<string name="media_attachment_too_big">Datoteka %1$s presega omejitev velikosti %2$s MB</string>
 	<string name="settings_theme">Videz</string>
-	<string name="theme_auto">Samodejno</string>
+	<string name="theme_auto">Uporabi videz naprave</string>
 	<string name="theme_light">Svetlo</string>
 	<string name="theme_dark">Temno</string>
-	<string name="theme_true_black">Resnično črni način</string>
 	<string name="settings_behavior">Vedenje</string>
 	<string name="settings_gif">Predvajaj animirane avatarje in emotikone</string>
 	<string name="settings_custom_tabs">Uporabi vgrajeni brskalnik</string>
 	<string name="settings_notifications">Obvestila</string>
-	<string name="notify_me_when">Obvesti me, ko</string>
-	<string name="notify_anyone">kdor koli</string>
-	<string name="notify_follower">sledilec/ka</string>
-	<string name="notify_followed">nekdo, ki mu sledim,</string>
-	<string name="notify_none">nihče</string>
-	<string name="notify_favorites">mojo objavo da med priljubljene</string>
-	<string name="notify_follow">me sledi</string>
-	<string name="notify_reblog">Izpostavi mojo objavo </string>
-	<string name="notify_mention">me omeni</string>
-	<string name="settings_boring">Cona dolgočasja</string>
-	<string name="settings_account">Nastavitve računa</string>
 	<string name="settings_contribute">Prispevajte Mastodonu</string>
 	<string name="settings_tos">Pogoji uporabe</string>
 	<string name="settings_privacy_policy">Pravilnik o zasebnosti</string>
-	<string name="settings_spicy">Pikantna cona</string>
 	<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 ste prepričani, da se želite odjaviti?</string>
-	<string name="sensitive_content">Občutljiva vsebina</string>
-	<string name="sensitive_content_explain">Avtor je ta medij označil kot občutljiv. Tapnite za njegovo razkritje.</string>
-	<string name="media_hidden">Tapnite za razkritje</string>
 	<string name="avatar_description">Pojdi na profil %s</string>
 	<string name="more_options">Več možnosti</string>
-	<string name="reveal_content">Razkrij vsebino</string>
-	<string name="hide_content">Skrij vsebino</string>
 	<string name="new_post">Nova objava</string>
 	<string name="button_reply">Odgovori</string>
 	<string name="button_reblog">Izpostavi</string>
@@ -308,7 +241,6 @@
 	<string name="add_media">Dodaj večpredstavnostno datoteko</string>
 	<string name="add_poll">Dodaj anketo</string>
 	<string name="emoji">Emotikon</string>
-	<string name="post_visibility">Vidnost objave</string>
 	<string name="home_timeline">Domača časovnica</string>
 	<string name="my_profile">Moj profil</string>
 	<string name="media_viewer">Ogledovalnik medijev</string>
@@ -333,20 +265,14 @@
 	<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">Skupnost</string>
-	<string name="trending_posts_info_banner">To so objave, ki plenijo pozornost na vašem koncu Mastodona.</string>
-	<string name="trending_hashtags_info_banner">To so kjjučniki, ki plenijo pozornost na vašem koncu Mastodona.</string>
-	<string name="trending_links_info_banner">To so novice, ki plenijo največ pozornosti v vašem koncu Mastodona.</string>
-	<string name="local_timeline_info_banner">To so najnovejše objave oseb, ki uporabljajo isti strežnik Mastodon kot vi.</string>
-	<string name="dismiss">Opusti</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>
 	<string name="load_missing_posts">Naloži manjkajoče objave</string>
 	<string name="follow_back">Sledijo nazaj</string>
 	<string name="button_follow_pending">Na čakanju</string>
 	<string name="follows_you">Vam sledi</string>
 	<string name="manually_approves_followers">Ročno odobri sledilce</string>
-	<string name="current_account">Trenutni račun</string>
-	<string name="log_out_account">Odjavi (%s)</string>
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<plurals name="x_followers">
 		<item quantity="one">%,d sledilec</item>
@@ -368,8 +294,6 @@
 	</plurals>
 	<string name="timestamp_via_app">%1$s prek %2$s</string>
 	<string name="time_now">zdaj</string>
-	<string name="post_info_reblogs">Izpostavitve</string>
-	<string name="post_info_favorites">Priljubljeni</string>
 	<string name="edit_history">Uredi zgodovino</string>
 	<string name="last_edit_at_x">Zadnjič urejano %s</string>
 	<string name="time_just_now">pravkar</string>
@@ -407,14 +331,9 @@
 	<string name="file_size_kb">%.2f KB</string>
 	<string name="file_size_mb">%.2f MB</string>
 	<string name="file_size_gb">%.2f GB</string>
-	<string name="file_upload_progress">%1$s od %2$s</string>
-	<string name="file_upload_time_remaining">Preostalo %s</string>
-	<string name="upload_error_connection_lost">Vaša naprava je izgubila povezavo v internet</string>
 	<string name="upload_processing">Obdelovanje …</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_available">Mastodon za Android %s je že pripravljen za prenos.</string>
 	<!-- %s is version like 1.2.3 -->
-	<string name="update_ready">Mastodon za Android %s je prenesen in pripravljen za namestitev.</string>
 	<!-- %s is file size -->
 	<string name="download_update">Prenesi (%s)</string>
 	<string name="install_update">Namesti</string>
@@ -460,8 +379,6 @@
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">Sledenje uporabnikom ...</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
-	<string name="signup_email_domain_blocked">%1$s ne dovoljuje prijav s/z %2$s. Poskusite drugega ali &lt;a&gt;izberite drug strežnik&lt;/a&gt;.</string>
-	<string name="signup_username_taken">To ime je že zasedeno.</string>
 	<string name="spoiler_show">Vseeno pokaži</string>
 	<string name="spoiler_hide">Ponovno skrij</string>
 	<string name="poll_multiple_choice">Izberi eno ali več izbir</string>
@@ -481,4 +398,74 @@
 	<string name="welcome_paragraph1">Mastodon je decentralizirano družbeno omrežje, kar pomeni, da ga ne upravlja nobeno posamezno podjetje. Sestavljajo ga številni neodvisni strežniki, ki so medsebojno povezani.</string>
 	<string name="what_are_servers">Kaj so strežniki?</string>
 	<string name="welcome_paragraph2"><![CDATA[Vsak račun Mastodon gostuje na strežniku — vsak strežnik ima svoje vrednote, pravila in skbrnike. Vseeno je, katerega izberete - sledite in komunicirate lahko z osebbami na poljubnem strežniku.]]></string>
+	<string name="opening_link">Odpiranje povezav ...</string>
+	<string name="log_out_all_accounts">Odjava iz vseh računov</string>
+	<string name="confirm_log_out_all_accounts">Ali se želite odjaviti iz vseh računov?</string>
+	<string name="retry">Poskusi znova</string>
+	<!-- %s is formatted file size ("467 KB image") -->
+	<string name="attachment_type_image">Slika</string>
+	<string name="attachment_type_video">Video</string>
+	<string name="attachment_type_audio">Zvok</string>
+	<string name="attachment_type_gif">GIF</string>
+	<string name="attachment_type_unknown">Datoteka</string>
+	<string name="poll_style">Slog</string>
+	<string name="poll_style_title">Slog ankete</string>
+	<string name="help">Pomoč</string>
+	<string name="edit_post">Uredi objavo</string>
+	<string name="no_verified_link">Ni preverjenih povezav</string>
+	<string name="language">Jezik</string>
+	<string name="language_default">Privzeto</string>
+	<string name="language_system">sistemski</string>
+	<string name="language_detecting">Zaznavanje jezika</string>
+	<string name="language_cant_detect">Jezika ni moč zaznati</string>
+	<string name="language_detected">Zaznano</string>
+	<!-- %s is the server domain -->
+	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->
+	<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="default_post_language">Privzeti jezik objave</string>
+	<string name="notifications_policy_no_one">Nihče</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>
+	<string name="tomorrow">jutri</string>
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<!-- %s is the timestamp ("tomorrow at 12:34") -->
+	<string name="resume_notifications_now">Nadaljuj zdaj</string>
+	<string name="about_server">O programu</string>
+	<string name="server_rules">Pravila</string>
+	<string name="server_administrator">Skrbnik</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>
+	<!-- %s is the username -->
+	<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_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_profiles">Profili</string>
+	<string name="settings_filter_title">Naslov</string>
+	<string name="add">Dodaj</string>
+	<string name="filter_word_or_phrase">Beseda ali besedna zveza</string>
+	<string name="select_all">Izberi vse</string>
+	<string name="settings_filter_duration_title">Filtriraj po trajanju</string>
+	<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_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="clear_all">Počisti vse</string>
+	<string name="search_open_url">Odpri URL v Mastodonu</string>
+	<string name="search_go_to_account">Pojdi na %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>
+	<string name="time_hours_ago_short">pred %dh urami</string>
+	<string name="time_days_ago_short">pred %d dnemi</string>
 </resources>
--- a/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
@@ -33,7 +33,7 @@
    <string name="sk_list_timelines">Seznami</string>
    <string name="sk_follow_requests">Prošnje za sledenje</string>
    <string name="sk_accept_follow_request">Sprejmi prošnjo za sledenje</string>
-    <string name="sk_disable_marquee">Onemogoči drseče besedilo v naslovnih vrsticah</string>
+    <string name="sk_settings_enable_marquee">Onemogoči drseče besedilo v naslovnih vrsticah</string>
    <string name="sk_color_palette_material3">Sistem</string>
    <string name="sk_color_palette_pink">roza</string>
    <string name="sk_color_palette_purple">vijolična</string>
@@ -65,12 +65,12 @@
    <string name="sk_settings_about">O aplikaciji</string>
    <string name="sk_settings_donate">Doniraj</string>
    <string name="sk_delete_notification_confirm_action">Izbriši obvestilo</string>
-    <string name="sk_enable_delete_notifications">Omogoči brisanje obvestil</string>
+    <string name="sk_settings_enable_delete_notifications">Omogoči brisanje obvestil</string>
    <string name="sk_clear_all_notifications_confirm_action">Izbriši vse</string>
    <string name="sk_quote_post">Objavite o tem</string>
    <string name="sk_open_with_account">Odpri z drugim računom</string>
    <string name="sk_welcome_text">Pozdravlja vas morski pes! Za začetek spodaj vnesite ime domene vaše domače instance.</string>
-    <string name="sk_tabs_disable_swipe">Onemogoči drsenje med zavihki</string>
+    <string name="sk_settings_tabs_disable_swipe">Onemogoči drsenje med zavihki</string>
    <string name="sk_delete_notification">Izbriši obvestilo</string>
    <string name="sk_delete_notification_confirm">Ali ste prepričani, da želite izbrisati to obvestilo\?</string>
    <string name="sk_clear_all_notifications">Počisti vsa obvestila</string>
@@ -80,7 +80,7 @@
    <string name="sk_settings_translation_availability_note_unavailable">%s se zdi, da ne podpira prevoda.</string>
    <string name="sk_loading_fediverse_resource_title">Iskanje po Fediverzu</string>
    <string name="sk_loading_resource_on_instance_title">Iskanje na %s</string>
-    <string name="sk_notify_posts">Obvestila o objavi</string>
+    <string name="sk_notification_type_posts">Obvestila o objavi</string>
    <string name="sk_timeline_local">Lokalno</string>
    <string name="sk_timeline_federated">Federacija</string>
    <string name="sk_settings_show_interaction_counts">Pokaži števec interakcij</string>
@@ -190,7 +190,7 @@
    <string name="sk_already_favorited">Že dodano med priljubljene</string>
    <string name="sk_favorite_as">Dodaj med priljubljene z drugim računom</string>
    <string name="sk_reblog_as">Spodbudi z drugim računom</string>
-    <string name="sk_reblogged_as">Spodbudi kot %s</string>
+    <string name="sk_reblogged_as">Spodbudil kot %s</string>
    <string name="sk_already_reblogged">Že spodbujeno</string>
    <string name="sk_bookmarked_as">Označil kot %s</string>
    <string name="sk_settings_publish_button_text_title">Prilagodi besedilo gumba \"Objavi\"</string>
@@ -198,7 +198,7 @@
    <string name="sk_schedule">Časovni razpored</string>
    <string name="sk_draft_or_schedule">Izdelaj osnutek ali časovni razpored</string>
    <string name="sk_undo_reblog">Odstrani spodbudo</string>
-    <string name="sk_reblog_with_visibility">Spodbudi z vidnostjo</string>
+    <string name="sk_reblog_with_visibility">Spodbudi vidno</string>
    <string name="sk_icon_gavel">Kladivo</string>
    <string name="sk_scheduled_too_soon">Objava mora biti časovno načrtovana vsaj 10 minut v naprej.</string>
    <string name="sk_compose_no_draft">Ne pripravljajte osnutka</string>
@@ -258,4 +258,58 @@
    <string name="sk_filtered">Filtrirano: %s</string>
    <string name="sk_unfinished_attachments">Popravki prilog\?</string>
    <string name="sk_spectator_mode">Gledalski način</string>
+    <string name="sk_open_in_app_failed">Ni bilo mogoče odpreti v aplikaciji</string>
+    <string name="sk_settings_allow_remote_loading">Nalaganje informacij iz oddaljenih instanc</string>
+    <string name="sk_no_remote_info_hint">informacije na daljavo niso na voljo</string>
+    <string name="sk_error_loading_profile">Nalaganje profila prek %s ni uspelo</string>
+    <string name="sk_settings_content_types">Omogoči oblikovanje objave</string>
+    <string name="sk_settings_content_types_explanation">Omogoča nastavitev vrste vsebine, kot je npr. Markdown, ko ustvarjate objavo. Upoštevajte, da tega ne podpirajo vse instance.</string>
+    <string name="sk_content_type">Tip vsebine</string>
+    <string name="sk_content_type_unspecified">Ni določeno</string>
+    <string name="sk_content_type_plain">Navadno besedilo</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_icon_beaker">Čaša</string>
+    <string name="sk_icon_bed">Postelja</string>
+    <string name="sk_icon_recycle_bin">Koš za smeti</string>
+    <string name="sk_icon_verified">Preverjeno</string>
+    <string name="sk_icon_doctor">Zdravnik</string>
+    <string name="sk_icon_diamond">Diamant</string>
+    <string name="sk_icon_umbrella">Dežnik</string>
+    <string name="sk_add_timeline">Dodaj časovnico</string>
+    <string name="sk_edit_timeline_tag_main">Objave, ki vsebujejo ključnike…</string>
+    <string name="sk_edit_timeline_tag_any">… ali kar koli od tega</string>
+    <string name="sk_edit_timeline_tag_all">…in vsak od teh</string>
+    <string name="sk_edit_timeline_tag_none">…vendar nič od tega</string>
+    <string name="sk_edit_timeline_tag_hint">Vnesite ključnik…</string>
+    <string name="sk_edit_timeline_tags_hint">Vnesite ključnike…</string>
+    <string name="sk_edit_timeline_tags_explanation">Upoštevajte, da te operacije izvaja strežnik. Njihovo združevanje morda ni podprto.</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Prikaži samo lokalne objave\?</string>
+    <string name="sk_add_timeline_tag_error_empty">Ključnik ne sme biti prazen</string>
+    <string name="sk_open_in_app">Odpri v aplikaciji</string>
+    <string name="sk_timeline_bubble">Mehurček</string>
+    <string name="sk_in_reply">Odgovor</string>
+    <string name="sk_icon_feed">Obvestilo</string>
+    <string name="sk_settings_hide_interaction">Skrij gumbe za interakcijo</string>
+    <string name="sk_settings_hide_fab">Samodejno skrij gumb za novo objavo</string>
+    <string name="sk_follow_as">Sledite iz drugega računa</string>
+    <string name="sk_reply_line_above_avatar">Vrstica \"Odgovor na\" nad avatarjem</string>
+    <string name="sk_show_thread">Prikaži temo</string>
+    <string name="sk_settings_default_content_type">Privzeta vrsta vsebine</string>
+    <string name="sk_external_share_title">Delite z računom</string>
+    <string name="sk_external_share_or_open_title">Delite ali odprite z računom</string>
+    <string name="sk_instance_info_unavailable">Informacije o instanci začasno niso na voljo</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_notification_action_replied">Pošlji odgovor %s</string>
+    <string name="sk_quoting_user">Citiranje %s</string>
+    <string name="sk_settings_reply_visibility">Vidnost odgovorov</string>
+    <string name="sk_settings_reply_visibility_all">Vsi odgovori</string>
+    <string name="sk_settings_reply_visibility_following">Odgovori mojim sledilcem</string>
+    <string name="sk_settings_confirm_before_reblog">Potrdite preden spodbudite</string>
+    <string name="sk_compact_reblog_reply_line">Kompaktna vrstica za spodbudo/odgovor</string>
+    <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>
 </resources>